game: 해산시 군주외 장수는 즉시 임관 가능

- 무한루프일 수 있으므로 그냥 SQL에 NOT IN을 넣자..

hwe/func.php

@@ -408,14 +408,14 @@ function checkSecretPermission(array $me, $checkSecretLimit = true)
     }
 
     $secretMin = 0;
-    $secretMax = checkSecretMaxPermission($me, $penalty);
+    $secretMax = checkSecretMaxPermission($penalty);
 
 
     if ($me['officer_level'] == 12) {
         $secretMin = 4;
-    } else if ($me['permission'] == 'ambassador') {
+    } else if ($permission == 'ambassador') {
         $secretMin = 4;
-    } else if ($me['permission'] == 'auditor') {
+    } else if ($permission == 'auditor') {
         $secretMin = 3;
     } else if ($me['officer_level'] >= 5) {
         $secretMin = 2;
@@ -1054,10 +1054,10 @@ function increaseRefresh($type = "", $cnt = 1)
         'ip' => $ip,
         'date' => $date,
         'path' => "refresh",
-        'arg' => JSON::encode([
+        'arg' => Json::encode([
             'type' => $type,
         ]),
-        'aux' => JSON::encode([
+        'aux' => Json::encode([
             'generalID' => $generalID,
             'generalName' => $session->generalName,
             'userName' => $session->userName,

hwe/func_command.php

@@ -213,7 +213,7 @@ function _setGeneralCommand(GeneralCommand $command, array $turnList):void {
 
     $db->update('general_turn', [
         'action'=>$commandName,
-        'arg'=>Json::encode($arg, JSON::EMPTY_ARRAY_IS_DICT),
+        'arg'=>Json::encode($arg, Json::EMPTY_ARRAY_IS_DICT),
         'brief'=>$brief
     ], 'general_id = %i AND turn_idx IN %li', $generalID, $turnList);
 }
@@ -233,7 +233,7 @@ function _setNationCommand(NationCommand $command, array $turnList):void  {
 
     $db->update('nation_turn', [
         'action'=>$commandName,
-        'arg'=>Json::encode($arg, JSON::EMPTY_ARRAY_IS_DICT),
+        'arg'=>Json::encode($arg, Json::EMPTY_ARRAY_IS_DICT),
         'brief'=>$brief
     ], 'nation_id = %i AND officer_level = %i AND turn_idx IN %li', $nationID, $officerLevel, $turnList);
 }

hwe/func_gamerule.php

@@ -899,7 +899,7 @@ function checkEmperior()
         'tiger' => $tigerstr,
         'eagle' => $eaglestr,
         'gen' => $gen,
-        'history' => JSON::encode($nationHistory),
+        'history' => Json::encode($nationHistory),
         'aux' => $statGeneral['aux']
     ]);
 
@@ -951,8 +951,19 @@ function updateMaxDomesticCritical(General $general, $score)
     }
 }
 
-function genGenericUniqueRNG(int $year, int $month, int $generalID): RandUtil
+function genGenericUniqueRNG(int $year, int $month, int $generalID, ?string $reason = null): RandUtil
 {
+    if($reason){
+        return new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+            UniqueConst::$hiddenSeed,
+            'unique',
+            $year,
+            $month,
+            $generalID,
+            $reason
+        )));
+    }
+
     return new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
         UniqueConst::$hiddenSeed,
         'unique',
@@ -962,7 +973,7 @@ function genGenericUniqueRNG(int $year, int $month, int $generalID): RandUtil
     )));
 }
 
-function genGenericUniqueRNGFromGeneral(General $general): RandUtil
+function genGenericUniqueRNGFromGeneral(General $general, string $reason): RandUtil
 {
     $logger = $general->getLogger();
     if (!$logger) {
@@ -971,5 +982,5 @@ function genGenericUniqueRNGFromGeneral(General $general): RandUtil
     $year = $logger->getYear();
     $month = $logger->getMonth();
     $generalID = $general->getID();
-    return genGenericUniqueRNG($year, $month, $generalID);
+    return genGenericUniqueRNG($year, $month, $generalID, $reason);
 }

hwe/j_select_npc.php

@@ -27,14 +27,25 @@ $rootDB = RootDB::db();
 $oNow = new \DateTimeImmutable();
 $now = $oNow->format('Y-m-d H:i:s');
 
-$userNick = RootDB::db()->queryFirstField('SELECT `NAME` FROM member WHERE `NO`=%i',$userID);
-if(!$userNick){
+$member = $rootDB->queryFirstRow('SELECT `name`, `penalty` FROM member WHERE `NO`=%i', $userID);
+if(!$member){
     Json::die([
         'result'=>false,
         'reason'=>'멤버 정보를 가져오지 못했습니다.'
     ]);
 }
 
+$userNick = $member['name'];
+$memberPenalty = Json::decode($member['penalty'] ?? '{}');
+$penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefix()] ?? []);
+
+$penalty = [];
+foreach($penaltyInfo as $penaltyKey => $penaltyValue){
+    if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
+        $penalty[$penaltyKey] = $penaltyValue['value'];
+    }
+}
+
 $pickResult = $db->queryFirstField('SELECT pick_result FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%s', $userID, $now);
 if(!$pickResult){
     Json::die([
@@ -86,7 +97,8 @@ $db->update('general', [
     'defence_train'=>80,
     'permission'=>'normal',
     'owner'=>$userID,
-    'aux'=>Json::encode($genAux)
+    'aux'=>Json::encode($genAux),
+    'penalty'=>Json::encode($penalty),
 ], 'owner <= 0 AND npc = 2 AND no = %i', $pick);
 $db->insertIgnore('general_access_log', [
     GeneralAccessLogColumn::generalID->value => $pick,

hwe/sammo/API/Command/GetReservedCommand.php

@@ -6,6 +6,7 @@ use sammo\Session;
 use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
+use sammo\GameConst;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\TimeUtil;
@@ -32,8 +33,18 @@ class GetReservedCommand extends \sammo\BaseAPI
         $gameStor = KVStorage::getStorage($db, 'game_env');
         $generalID = $session->generalID;
 
+        $invalidTurnList = 0;
+
         $rawTurn = $db->queryAllLists('SELECT turn_idx, action, arg, brief FROM general_turn WHERE general_id = %i ORDER BY turn_idx ASC', $generalID);
         foreach ($rawTurn as [$turn_idx, $action, $arg, $brief]) {
+            if($turn_idx < 0) {
+                $invalidTurnList = -1;
+                $turn_idx += GameConst::$maxTurn;
+            }
+            else if($turn_idx >= GameConst::$maxTurn) {
+                $invalidTurnList = 1;
+                $turn_idx -= GameConst::$maxTurn;
+            }
             $commandList[$turn_idx] = [
                 'action' => $action,
                 'brief' => $brief,
@@ -41,6 +52,19 @@ class GetReservedCommand extends \sammo\BaseAPI
             ];
         }
 
+        if($invalidTurnList != 0){
+            if($invalidTurnList > 0){
+                $db->update('general_turn', [
+                    'turn_idx' => $db->sqleval('turn_idx - %i', GameConst::$maxTurn)
+                ], 'general_id=%i AND turn_idx >= %i', $generalID, GameConst::$maxTurn);
+            }
+            else{
+                $db->update('general_turn', [
+                    'turn_idx' => $db->sqleval('turn_idx + %i', GameConst::$maxTurn)
+                ], 'general_id=%i AND turn_idx < 0', $generalID);
+            }
+        }
+
 
         [$turnTerm, $year, $month, $lastExecute] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month', 'turntime']);
 

hwe/sammo/API/General/BuildNationCandidate.php

@@ -90,8 +90,8 @@ class BuildNationCandidate extends \sammo\BaseAPI
       return '거병을 실패했습니다.';
     }
 
-    $general->setVar('killturn', $env['killturn']);
-    $general->applyDB($db);
+    $generalObj->setVar('killturn', $env['killturn']);
+    $generalObj->applyDB($db);
 
     return null;
   }

hwe/sammo/API/General/Join.php

@@ -54,7 +54,7 @@ class Join extends \sammo\BaseAPI
                 'leadership',
                 'strength',
                 'intel',
-                'inheritTurntime',
+                'inheritTurntimeZone',
             ])
             ->rule('boolean', [
                 'pic'
@@ -72,7 +72,8 @@ class Join extends \sammo\BaseAPI
             ], GameConst::$defaultStatMax)
             ->rule('in', 'character', array_merge(GameConst::$availablePersonality, ['Random']))
             ->rule('in', 'inheritSpecial', GameConst::$availableSpecialWar)
-            ->rule('min', 'inheritTurntime', 0)
+            ->rule('min', 'inheritTurntimeZone', 0)
+            ->rule('max', 'inheritTurntimeZone', 59)
             ->rule('in', 'inheritCity', array_keys(CityConst::all()))
             ->rule('integerArray', 'inheritBonusStat');
 
@@ -139,22 +140,28 @@ class Join extends \sammo\BaseAPI
         $intel = $this->args['intel'];
 
         $inheritSpecial = $this->args['inheritSpecial'] ?? null;
-        $inheritTurntime = $this->args['inheritTurntime'] ?? null;
+        $inheritTurntimeZone = $this->args['inheritTurntimeZone'] ?? null;
         $inheritCity = $this->args['inheritCity'] ?? null;
         $inheritBonusStat = $this->args['inheritBonusStat'] ?? null;
 
-        if ($inheritTurntime !== null && $inheritCity !== null) {
-            return '턴과 도시를 동시에 지정할 수 없습니다.';
-        }
-
         $rootDB = RootDB::db();
         //회원 테이블에서 정보확인
-        $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr FROM member WHERE no=%i', $userID);
+        $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr, `penalty` FROM member WHERE no=%i', $userID);
 
         if (!$member) {
             return "잘못된 접근입니다!!!";
         }
 
+        $memberPenalty = Json::decode($member['penalty'] ?? "{}");
+        $penaltyInfo = array_merge($memberPenalty['any'] ?? [], $memberPenalty[DB::prefix()] ?? []);
+
+        $penalty = [];
+        foreach($penaltyInfo as $penaltyKey => $penaltyValue){
+            if($penaltyValue['expire'] ?? 0 > TimeUtil::now()){
+                $penalty[$penaltyKey] = $penaltyValue['value'];
+            }
+        }
+
         $db = DB::db();
         $gameStor = KVStorage::getStorage($db, 'game_env');
         $gameStor->cacheValues(['year', 'month', 'maxgeneral', 'scenario', 'show_img_level', 'block_general_create', 'turnterm', 'turntime', 'genius', 'npcmode']);
@@ -232,7 +239,7 @@ class Join extends \sammo\BaseAPI
         if ($inheritSpecial !== null) {
             $inheritRequiredPoint += GameConst::$inheritBornSpecialPoint;
         }
-        if ($inheritTurntime !== null) {
+        if ($inheritTurntimeZone !== null) {
             $inheritRequiredPoint += GameConst::$inheritBornTurntimePoint;
         }
 
@@ -347,12 +354,14 @@ class Join extends \sammo\BaseAPI
             $experience *= 0.8;
         }
 
-        if ($inheritTurntime !== null) {
-            $inheritTurntime = $inheritTurntime % ($admin['turnterm'] * 60);
+        if ($inheritTurntimeZone !== null) {
+            $inheritTurntime = $inheritTurntimeZone * $admin['turnterm'];
+            $inheritTurntime += $rng->nextRangeInt(0, Util::clamp($admin['turnterm'] - 1, 0));
 
             $userLogger->push(sprintf("턴 시간 %02d:%02d 로 지정", intdiv($inheritTurntime, 60), $inheritTurntime % 60), "inheritPoint");
 
             $inheritTurntime += $rng->nextRangeInt(0, 999999) / 1000000;
+
             $turntime = new \DateTimeImmutable(cutTurn($admin['turntime'], $admin['turnterm']));
             $turntime = $turntime->add(TimeUtil::secondsToDateInterval($inheritTurntime));
             $turntime = TimeUtil::format($turntime, true);
@@ -424,7 +433,8 @@ class Join extends \sammo\BaseAPI
             'specage' => $specage,
             'special' => $special,
             'specage2' => $specage2,
-            'special2' => $special2
+            'special2' => $special2,
+            'penalty' => Json::encode($penalty),
         ]);
         $generalID = $db->insertId();
         $db->insert('general_access_log', [

hwe/sammo/API/Message/SendMessage.php

@@ -7,9 +7,11 @@ use DateTimeInterface;
 use sammo\DB;
 use sammo\Enums\APIRecoveryType;
 use sammo\Enums\MessageType;
+use sammo\Json;
 use sammo\Message;
 use sammo\MessageTarget;
 use sammo\Validator;
+use sammo\Util;
 
 use function sammo\checkLimit;
 use function sammo\checkSecretPermission;
@@ -170,6 +172,8 @@ class SendMessage extends \sammo\BaseAPI
       return '장수가 없습니다.';
     }
 
+    $penalty = Json::decode($me['penalty'] ?? '{}');
+
     $limitState = checkLimit($me['refresh_score']);
     if ($limitState >= 2) {
       return '접속 제한입니다.';
@@ -226,8 +230,10 @@ class SendMessage extends \sammo\BaseAPI
       $now = new \DateTime();
       $lastMsg = new \DateTime($session->lastMsg ?? '0000-00-00');
       $msg_interval = $now->getTimestamp() - $lastMsg->getTimestamp();
-      if ($msg_interval < 2) {
-        return '개인메세지는 2초당 1건만 보낼 수 있습니다!';
+
+      $msg_min_interval = $penalty['sendPrivateMsgDelay'] ?? 2;
+      if ($msg_interval < $msg_min_interval) {
+        return "개인메세지는 {$msg_min_interval}초당 1건만 보낼 수 있습니다!";
       }
       $session->lastMsg = $now->format('Y-m-d H:i:s');
 

hwe/sammo/API/Nation/GeneralList.php

@@ -313,7 +313,7 @@ class GeneralList extends \sammo\BaseAPI
         foreach ($rawGeneralList as $rawGeneral) {
             //General 생성?
             if (key_exists('aux', $rawGeneral)) {
-                $rawGeneral['aux'] = \sammo\JSON::decode($rawGeneral['aux']);
+                $rawGeneral['aux'] = \sammo\Json::decode($rawGeneral['aux']);
             }
 
             $item = [];

hwe/sammo/API/NationCommand/GetReservedCommand.php

@@ -73,6 +73,11 @@ class GetReservedCommand extends \sammo\BaseAPI
         }
 
         $nationTurnList = [];
+
+        //혹시 정규 턴을 벗어난 턴이 있는지 체크
+        $invalidUnderTurnList = [];
+        $invalidOverTurnList = [];
+
         foreach ($db->queryAllLists(
             'SELECT officer_level, turn_idx, action, arg, brief FROM nation_turn WHERE nation_id = %i ORDER BY officer_level DESC, turn_idx ASC',
             $me['nation']
@@ -80,6 +85,14 @@ class GetReservedCommand extends \sammo\BaseAPI
             if (!key_exists($officer_level, $nationTurnList)) {
                 $nationTurnList[$officer_level] = [];
             }
+            if($turn_idx < 0){
+                $invalidUnderTurnList[$officer_level] = $turn_idx;
+                $turn_idx += GameConst::$maxChiefTurn;
+            }
+            else if($turn_idx >= GameConst::$maxChiefTurn){
+                $invalidOverTurnList[$officer_level] = $turn_idx;
+                $turn_idx -= GameConst::$maxChiefTurn;
+            }
             $nationTurnList[$officer_level][$turn_idx] = [
                 'action' => $action,
                 'brief' => $brief,
@@ -87,6 +100,21 @@ class GetReservedCommand extends \sammo\BaseAPI
             ];
         }
 
+        if($invalidUnderTurnList){
+            $db->update(
+                'nation_turn', [
+                    'turn_idx' => $db->sqleval('`turn_idx` + %i', GameConst::$maxChiefTurn)
+                ], 'nation_id = %i AND officer_level IN %li AND turn_idx < 0', $me['nation'], array_keys($invalidUnderTurnList)
+            );
+        }
+        if($invalidOverTurnList){
+            $db->update(
+                'nation_turn', [
+                    'turn_idx' => $db->sqleval('`turn_idx` - %i', GameConst::$maxChiefTurn)
+                ], 'nation_id = %i AND officer_level IN %li AND turn_idx >= %i', $me['nation'], array_keys($invalidOverTurnList), GameConst::$maxChiefTurn
+            );
+        }
+
         $troopList = [];
         foreach ($db->queryAllLists(
             'SELECT troop_leader, `name` FROM troop WHERE `nation` = %i',

hwe/sammo/ActionNationType/che_오두미도.php

@@ -9,7 +9,7 @@ class che_오두미도 extends \sammo\BaseNation{
     protected $name = '오두미도';
     protected $info = '';
     static $pros = '쌀수입↑ 인구↑';
-    static $cons = '기술↓ 수성↓ 내정↓';
+    static $cons = '기술↓ 수성↓ 농상↓';
 
 
     public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
@@ -40,4 +40,4 @@ class che_오두미도 extends \sammo\BaseNation{
         return $amount;
     }
 
-}
+}

hwe/sammo/ActionNationType/che_유가.php

@@ -8,7 +8,7 @@ class che_유가 extends \sammo\BaseNation{
 
     protected $name = '유가';
     protected $info = '';
-    static $pros = '내정↑ 민심↑';
+    static $pros = '농상↑ 민심↑';
     static $cons = '쌀수입↓';
 
     public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
@@ -31,4 +31,4 @@ class che_유가 extends \sammo\BaseNation{
         
         return $amount;
     }
-}
+}

hwe/sammo/ActionNationType/che_음양가.php

@@ -8,7 +8,7 @@ class che_음양가 extends \sammo\BaseNation{
 
     protected $name = '음양가';
     protected $info = '';
-    static $pros = '내정↑ 인구↑';
+    static $pros = '농상↑ 인구↑';
     static $cons = '기술↓ 전략↓';
 
     public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
@@ -29,14 +29,14 @@ class che_음양가 extends \sammo\BaseNation{
         if($type == 'pop' && $amount > 0){
             return $amount * 1.2;
         }
-        
+
         return $amount;
     }
 
     public function onCalcStrategic(string $turnType, string $varType, $value){
         if($varType == 'delay'){
-            return $value * 2;
+            return Util::round($value * 4 / 3);
         }
         return $value;
     }
-}
+}

hwe/sammo/ActionNationType/che_종횡가.php

@@ -9,7 +9,7 @@ class che_종횡가 extends \sammo\BaseNation{
     protected $name = '종횡가';
     protected $info = '';
     static $pros = '전략↑ 수성↑';
-    static $cons = '금수입↓ 내정↓';
+    static $cons = '금수입↓ 농상↓';
 
     public function onCalcDomestic(string $turnType, string $varType, float $value, $aux=null):float{
         if($turnType == '수비' || $turnType == '성벽'){
@@ -42,4 +42,4 @@ class che_종횡가 extends \sammo\BaseNation{
         }
         return $value;
     }
-}
+}

hwe/sammo/Command/General/che_강행.php

@@ -158,7 +158,7 @@ class che_강행 extends Command\GeneralCommand
         $general->increaseVar('leadership_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);
 

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

@@ -174,7 +174,7 @@ class che_거병 extends Command\GeneralCommand{
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_건국.php

@@ -201,7 +201,7 @@ class che_건국 extends Command\GeneralCommand
         $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '건국');
+        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국');
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_견문.php

@@ -112,7 +112,7 @@ class che_견문 extends Command\GeneralCommand{
         $general->addExperience($exp);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_군량매매.php

@@ -178,7 +178,7 @@ class che_군량매매 extends Command\GeneralCommand{
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_귀환.php

@@ -95,7 +95,7 @@ class che_귀환 extends Command\GeneralCommand{
         $general->increaseVar('leadership_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_기술연구.php

@@ -134,7 +134,7 @@ class che_기술연구 extends che_상업투자{
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_단련.php

@@ -126,7 +126,7 @@ class che_단련 extends Command\GeneralCommand{
         $general->increaseVar($incStat, 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_등용.php

@@ -169,7 +169,7 @@ class che_등용 extends Command\GeneralCommand
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);
 

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

@@ -281,7 +281,7 @@ class che_랜덤임관 extends Command\GeneralCommand
         $general->addExperience($exp);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '랜덤 임관');
+        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '랜덤 임관');
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_무작위건국.php

@@ -216,7 +216,7 @@ class che_무작위건국 extends Command\GeneralCommand
         $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '건국');
+        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국');
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_물자조달.php

@@ -148,7 +148,7 @@ class che_물자조달 extends Command\GeneralCommand{
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_사기진작.php

@@ -106,7 +106,7 @@ class che_사기진작 extends Command\GeneralCommand{
         $general->increaseVar('leadership_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_상업투자.php

@@ -218,7 +218,7 @@ class che_상업투자 extends Command\GeneralCommand{
         $general->increaseVar(static::$statKey.'_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_숙련전환.php

@@ -179,7 +179,7 @@ class che_숙련전환 extends Command\GeneralCommand
         $general->increaseVar('leadership_exp', 2);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_은퇴.php

@@ -75,7 +75,7 @@ class che_은퇴 extends Command\GeneralCommand{
         $logger->pushGeneralActionLog("은퇴하였습니다. <1>$date</>");
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_이동.php

@@ -164,7 +164,7 @@ class che_이동 extends Command\GeneralCommand
         $general->increaseVar('leadership_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);
 

hwe/sammo/Command/General/che_인재탐색.php

@@ -152,7 +152,7 @@ class che_인재탐색 extends Command\GeneralCommand
             $general->increaseVar($incStat, 1);
             $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
             $general->checkStatChange();
-            tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+            tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
             $general->applyDB($db);
             return true;
         }
@@ -218,7 +218,7 @@ class che_인재탐색 extends Command\GeneralCommand
         $general->increaseVar($incStat, 3);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
         return true;
     }

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

@@ -172,7 +172,7 @@ class che_임관 extends Command\GeneralCommand
         $general->addExperience($exp);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_장비매매.php

@@ -196,7 +196,7 @@ class che_장비매매 extends Command\GeneralCommand
         $general->addExperience($exp);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_장수대상임관.php

@@ -170,7 +170,7 @@ class che_장수대상임관 extends Command\GeneralCommand{
         $general->addExperience($exp);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_전투태세.php

@@ -121,7 +121,7 @@ class che_전투태세 extends Command\GeneralCommand{
         $general->increaseVar('leadership_exp', 3);
         $this->setResultTurn($turnResult);
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_전투특기초기화.php

@@ -103,7 +103,7 @@ class che_전투특기초기화 extends Command\GeneralCommand{
         $logger->pushGeneralActionLog("새로운 {$specialName}를 가질 준비가 되었습니다. <1>$date</>");
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_정착장려.php

@@ -188,7 +188,7 @@ class che_정착장려 extends Command\GeneralCommand{
         $general->increaseVar(static::$statKey.'_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_주민선정.php

@@ -188,7 +188,7 @@ class che_주민선정 extends Command\GeneralCommand{
         $general->increaseVar(static::$statKey.'_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

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

@@ -170,7 +170,7 @@ class che_증여 extends Command\GeneralCommand
 
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
 
         $general->applyDB($db);
         $destGeneral->applyDB($db);

hwe/sammo/Command/General/che_집합.php

@@ -103,7 +103,7 @@ class che_집합 extends Command\GeneralCommand{
         $general->increaseVar('leadership_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

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

@@ -227,7 +227,7 @@ class che_징병 extends Command\GeneralCommand
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
         $general->setAuxVar('armType', $reqCrewType->armType);
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

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

@@ -253,7 +253,7 @@ class che_출병 extends Command\GeneralCommand
 
         processWar($warRngSeed, $general, $this->nation, $this->destCity);
 
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_해산.php

@@ -105,8 +105,8 @@ class che_해산 extends Command\GeneralCommand{
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
 
         $nationGenerals = deleteNation($general, false);
+        $general->setVar('makelimit', 12);
         foreach($nationGenerals as $oldGeneral){
-            $oldGeneral->setVar('makelimit', 12);
             $oldGeneral->applyDB($db);
         }
         $general->applyDB($db);

hwe/sammo/Command/General/che_헌납.php

@@ -146,7 +146,7 @@ class che_헌납 extends Command\GeneralCommand
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
 
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/che_훈련.php

@@ -107,7 +107,7 @@ class che_훈련 extends Command\GeneralCommand{
         $general->increaseVar('leadership_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/cr_건국.php

@@ -201,7 +201,7 @@ class cr_건국 extends Command\GeneralCommand
         $general->increaseInheritancePoint(InheritanceKey::active_action, 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general), $general, '건국');
+        tryUniqueItemLottery(genGenericUniqueRNGFromGeneral($general, static::$actionName), $general, '건국');
         $general->applyDB($db);
 
         return true;

hwe/sammo/Command/General/cr_맹훈련.php

@@ -105,7 +105,7 @@ class cr_맹훈련 extends Command\GeneralCommand{
         $general->increaseVar('leadership_exp', 1);
         $this->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
-        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general), $general);
+        tryUniqueItemLottery(\sammo\genGenericUniqueRNGFromGeneral($general, static::$actionName), $general);
         $general->applyDB($db);
 
         return true;

hwe/sammo/Event/Action/RaiseInvader.php

@@ -67,12 +67,14 @@ class RaiseInvader extends \sammo\Event\Action
 
         foreach ($db->queryAllLists('SELECT capital, nation from nation WHERE capital in %li', $cities) as $row) {
             [$oldCapital, $nation] = $row;
-            $capitalCandidates = $db->queryFirstColumn('SELECT from city WHERE nation = %i AND city != %i', $nation);
+            $capitalCandidates = $db->queryFirstColumn('SELECT city from city WHERE nation = %i AND city != %i AND city NOT IN %li', $nation, $oldCapital, $cities);
             if (!$capitalCandidates) {
                 $disabledInvaderCity->add($oldCapital);
                 continue;
             }
+
             $newCapital = $rng->choice($capitalCandidates);
+
             $db->update('nation', ['capital' => $newCapital], 'nation=%i', $nation);
             $db->update('general', ['city' => $newCapital], 'nation=%i and city=%i', $nation, $oldCapital);
         }
@@ -89,6 +91,10 @@ class RaiseInvader extends \sammo\Event\Action
             'supply' => 1,
         ], 'city in %li', $cities);
 
+        if(!$disabledInvaderCity->isEmpty()){
+            refreshNationStaticInfo();
+        }
+
         return $disabledInvaderCity;
     }
 

hwe/sammo/GameConstBase.php

@@ -216,7 +216,7 @@ class GameConstBase
 
     public static $minMonthToAllowInheritItem = 4;
     public static $inheritBornSpecialPoint = 6000;
-    public static $inheritBornTurntimePoint = 3000;
+    public static $inheritBornTurntimePoint = 2500;
     public static $inheritBornCityPoint = 1000;
     public static $inheritBornStatPoint = 1000;
     public static $inheritItemUniqueMinPoint = 5000;
@@ -318,7 +318,6 @@ class GameConstBase
             'che_치안강화',
             'che_정착장려',
             'che_주민선정',
-            'che_물자조달',
         ],
         '군사' => [
             'che_징병',
@@ -349,6 +348,7 @@ class GameConstBase
         '국가' => [
             'che_증여',
             'che_헌납',
+            'che_물자조달',
             'che_하야',
             'che_거병',
             'che_건국',

hwe/sammo/GeneralAI.php

@@ -82,8 +82,9 @@ class GeneralAI
     const d직전 = 3;
     const d전쟁 = 4;
 
-    protected function updateInstance(): void{
-        if(!$this->reqUpdateInstance){
+    protected function updateInstance(): void
+    {
+        if (!$this->reqUpdateInstance) {
             return;
         }
 
@@ -215,11 +216,10 @@ class GeneralAI
         );
 
         if ($yearMonth <= Util::joinYearMonth($env['startyear'] + 2, 5)) {
-            if(!$warTarget){
+            if (!$warTarget) {
                 $this->dipState = self::d평화;
                 $this->attackable = false;
-            }
-            else{
+            } else {
                 $this->dipState = self::d선포;
                 $this->attackable = false;
             }
@@ -2992,7 +2992,7 @@ class GeneralAI
         }
 
         foreach ($this->frontCities as $frontCity) {
-            if(!$frontCity['supply']){
+            if (!$frontCity['supply']) {
                 continue;
             }
             $candidateCities[$frontCity['city']] = $frontCity['important'];
@@ -3120,6 +3120,11 @@ class GeneralAI
     {
         $db = DB::db();
 
+        $dupLord = $db->queryFirstField('SELECT COUNT(*) FROM general WHERE officer_level = 12 AND city = %i', $this->general->getCityID());
+        if($dupLord <= 1 && !in_array($this->general->getRawCity()['level'], [5, 6])) {
+            return null;
+        }
+
         $general = $this->general;
         $lordCities = $db->queryFirstColumn('SELECT city.city as city FROM general LEFT JOIN city ON general.city = city.city WHERE general.officer_level = 12 AND city.nation = 0');
         $nationCities = $db->queryFirstColumn('SELECT city FROM city WHERE nation != 0');
@@ -3352,10 +3357,9 @@ class GeneralAI
                 if ($this->rng->nextBool(pow(1 / ($nationCnt + 1) / pow($notFullNationCnt, 3), 1 / 4))) {
                     return null;
                 }
-            }
-            else{
+            } else {
                 //임관 기간이 끝나면 고정 확률로 낮춤 0.3 * 0.5 = 0.15
-                if ($this->rng->nextBool()){
+                if ($this->rng->nextBool()) {
                     return null;
                 }
             }
@@ -3481,7 +3485,7 @@ class GeneralAI
             }
             if ($nationCity['front']) {
                 $frontCities[$cityID] = $nationCity;
-            } else if($nationCity['supply']) {
+            } else if ($nationCity['supply']) {
                 $backupCities[$cityID] = $nationCity;
             }
 
@@ -3783,21 +3787,28 @@ class GeneralAI
 
         if ($npcType >= 2 && $general->getVar('officer_level') == 12 && !$this->nation['capital']) {
             //방랑군 건국
-            $result = $this->do건국();
-            if ($result !== null) {
-                $result->reason = 'do건국';
-                return $result;
+            $relYearMonth = Util::joinYearMonth($this->env['year'], $this->env['month']) - Util::joinYearMonth($this->env['init_year'], $this->env['init_month']);
+
+            if ($relYearMonth > 1) {
+                $result = $this->do건국();
+                if ($result !== null) {
+                    $result->reason = 'do건국';
+                    return $result;
+                }
             }
+
             $result = $this->do방랑군이동();
             if ($result !== null) {
                 $result->reason = 'do방랑군이동';
                 return $result;
             }
 
-            $result = $this->do해산();
-            if ($result !== null) {
-                $result->reason = 'do해산';
-                return $result;
+            if ($relYearMonth > 1) {
+                $result = $this->do해산();
+                if ($result !== null) {
+                    $result->reason = 'do해산';
+                    return $result;
+                }
             }
         }
 
@@ -4039,7 +4050,7 @@ class GeneralAI
             if (!key_exists($chiefLevel, $this->chiefGenerals) && !key_exists($chiefLevel, $nextChiefs)) {
                 $newChiefProb = 1;
             } else {
-                $newChiefProb = $this->rng->nextBool(0.1)?1:0;
+                $newChiefProb = $this->rng->nextBool(0.1) ? 1 : 0;
             }
 
             if ($newChiefProb < 1 && !$this->rng->nextBool($newChiefProb)) {

hwe/scenario/scenario_2800.json

@@ -0,0 +1,467 @@
+{
+    "title": "【가상모드28】 강서유서 소설 월드",
+    "startYear": 180,
+    "history": [
+        "<C>●</>180년 1월:<L><b>【가상모드28】</b>강서유서 소설 월드</>",
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>강서유서의 소설 캐릭터들이 날뛰는곳"
+    ],
+    "stat": {
+        "total": 210,
+        "min": 40,
+        "max": 90
+    },
+    "iconPath": ".",
+    "fiction": 1,
+    "nation":[
+        ["TOG", "#FFD700", 13000, 60000, "반정부주의 단체", 0, "병가", 2, ["대", "유구"]],
+        ["초대 선받아", "#00FFFF", 8000, 25000, "초대 선택받은 아이들의 세력, 원작과는 다르다 달라", 0, "명가", 2, ["천수", "저"]],
+        ["견휘", "#008000", 20000, 40000, "연휘아님 소설 출현 캐릭터(허락받음 오래전에)", 0, "법가", 3, ["장안", "함곡"]],
+        ["강인", "#00FF00", 15000, 40000, "블로거분 소설 캐릭터(소설 여전히 진짜 적게 연재", 0, "법가", 3, ["한중", "양평"]],
+        ["테란 자치령", "#000080", 40000, 60000, "스타크래프트 테란 자치령 소속", 0, "법가", 7, ["성도"]]
+    ],
+    "diplomacy":[],
+    "general":[
+        [1, "키타노 유키코", null, 1, "대", 86, 31, 95, 1, 160, 300, "대의", "저격", "모든것은 우리들의 꿈을 이루기 위해…"],
+        [1, "키타노 시오리", null, 1, "대", 94, 96, 89, 1, 160, 300, "대의", "무쌍", "언니를 지켜보일거야"],
+        [1, "이치가와 아이리", null, 1, "대", 78, 88, 94, 11, 160, 300, "대의", null, "유키코를 지킬거야. 내 속죄를 위해"],
+        [1, "이즈카에 에리카", null, 1, "유구", 77, 93, 72, 1, 160, 300, "의협", "저격"],
+        [1, "타에구치 유카리", null, 1, "유구", 71, 66, 80, 1, 160, 300, "할거", null, "아버지와 어머니를 지키기 위해 미래에서 왓어 난"],
+        [1, "오모타 아미유", null, 1, "대", 64, 51, 44, 1, 160, 300, "대의", null],
+        [1, "소카이 요시나", null, 1, "유구", 79, 62, 80, 1, 160, 300, "의협", null],
+        [1, "소미타키 코토키", null, 1, "유구", 86, 79, 55, 1, 160, 300, "재간", null],
+        [1, "타카이시 유키", null, 1, "유구", 83, 64, 72, 1, 160, 300, "재간", null],
+        [1, "스즈카 아야로", null, 1, "대", 62, 88, 47, 1, 160, 300, "의협", null],
+        [1, "요리시마 사치코", null, 1, "유구", 51, 81, 70, 1, 160, 300, "대의", "저격"],
+        [0, "큐어 스플릿", null, 0, null, 80, 90, 56, 0, 160, 300, null, "무쌍"],
+        [0, "큐어 솔크", null, 0, null, 93, 97, 67, 0, 160, 300, null, null, "아버지를 이겨보일거야."],
+        [0, "큐어 샤인", null, 0, null, 99, 75, 99, 0, 160, 300, "패권", "신산", "디지털 월드와 인간세계 모두를 위해"],
+        [0, "큐어 러브", null, 0, null, 77, 86, 54, 0, 160, 300, null, null, "사랑을 추구하는 전사 큐어 러브"],
+        [0, "큐어 프로즌", null, 0, null, 64, 88, 72, 0, 160, 300, null, null],
+        [0, "큐어 바이올렛", null, 0, null, 49, 89, 77, 0, 160, 300, null, "상재"],
+        [0, "큐어 드림", null, 0, null, 97, 99, 71, 0, 160, 300, null, "무쌍"],
+        [0, "큐어 뮤즈", null, 0, null, 71, 95, 64, 0, 160, 300, null, null],
+        [0, "큐어 플리오네", null, 0, null, 89, 102, 86, 0, 148, 300, null, null],
+        [0, "큐어 리큐브", null, 0, null, 67, 88, 82, 0, 152, 300, null, null],
+        [0, "큐어 퓨리", null, 0, null, 83, 84, 42, 0, 160, 300, null, null],
+        [0, "큐어 뮤직", null, 0, null, 79, 84, 60, 0, 160, 300, null, null],
+        [0, "큐어 포르테", null, 0, null, 72, 77, 55, 0, 160, 300, null, null],
+        [0, "큐어 리스", null, 0, null, 89, 80, 67, 0, 160, 300, null, null],
+        [0, "분비", null, 0, null, 85, 94, 90, 0, 148, 300, null, null],
+        [0, "시비렛타", null, 0, null, 82, 73, 90, 0, 127, 300, null, null],
+        [0, "히토", null, 0, null, 64, 88, 80, 0, 115, 300, null, null],
+        [2, "모요코모 미에카", null, 2, "천수", 91, 60, 97, 12, 141, 300, "할거", null, "모든것은 분비님이 부활시키려는 그자를 막기 위해서야! 그자는 우리가 죽을뻔한 초대 선택받은 아이들의 적이니까!"],
+        [2, "노자미 미노코", null, 2, "천수", 80, 77, 80, 11, 143, 300, null, null, "도대체 요시미츠님(분비님)은 뭔 생각이신거야…"],
+        [2, "노자미 미에키", null, 0, null, 73, 70, 55, 0, 160, 300, null, null],
+        [999, "리아", null, 0, null, 99, 34, 100, 0, 132, 300, null, "집중", "이 세계를 부디 안정시켜줄 사람이 필요해…."],
+        [0, "코구라 아치모토", null, 0, null, 51, 44, 114, 0, 160, 300, null, "발명", "크흐흐…다크 프리큐어여 모습을 드러내라…!"],
+        [0, "다크 프리큐어즈", null, 0, null, 84, 97, 92, 0, 160, 300, null, null, "모든건… 그분의 부활을 위해."],
+        [0, "레톨프", null, 0, null, 87, 88, 64, 0, 160, 300, null, null],
+        [2, "사사토케 라이라", null, 2, "천수", 71, 80, 74, 1, 151, 300, null, null, "다시한번 주어진 기회. 이번엔 그녀를 지킬거야."],
+        [2, "하루사키 츠보미", null, 2, "천수", 88, 51, 97, 1, 153, 300, "할거", null, "똑같은 악당짓을 다시는 하지않게, 나자신을 바꿀거야, 사랑하는 라이라 오빠와 함께."],
+        [2, "아야토케 나이미", null, 2, "천수", 76, 44, 88, 1, 151, 300, null, null],
+        [2, "히마즈라 유게키", null, 2, "천수", 54, 80, 12, 1, 149, 300, null, null],
+        [2, "하루사키 유나", null, 2, "저", 77, 44, 91, 1, 150, 300, null, null],
+        [0, "야가미 타이치", null, 0, null, 89, 88, 67, 0, 153, 300, null, null],
+        [0, "야가미 소라", null, 0, null, 62, 37, 75, 0, 153, 300, null, null],
+        [0, "야가미 유메", null, 0, null, 80, 55, 78, 0, 160, 300, null, null],
+        [0, "이시다 야마토", null, 0, null, 72, 77, 60, 0, 153, 300, null, null],
+        [0, "이시다 나데히코", null, 0, null, 80, 50, 79, 0, 160, 300, null, null],
+        [0, "이즈미 코시로", null, 0, null, 34, 17, 99, 0, 154, 300, null, "발명"],
+        [0, "이즈미 미미", null, 0, null, 51, 23, 66, 0, 154, 300, null, null],
+        [0, "이즈미 토모", null, 0, null, 37, 30, 89, 0, 160, 300, null, null],
+        [0, "이즈미 쥰", null, 0, null, 77, 77, 31, 0, 160, 300, null, null],
+        [0, "아마노 유우", null, 0, null, 77, 70, 85, 0, 160, 300, null, null, "모든건 그분을 위하여"],
+        [2, "사사토케 키아라", null, 0, null, 85, 83, 60, 0, 160, 300, null, null, "감히 엄마를 그렇게 만들었겟다… 그 디지몬 절대로 용서하지 않을거야!"],
+        [2, "야카기 츠에루", null, 0, null, 83, 80, 51, 0, 160, 300, null, null, "할머니의 업보… 제가 대신 갚아나갈 거에요"],
+        [0, "사이온지 카나타", null, 0, null, 81, 79, 85, 0, 160, 300, null, null, "내가 먼저 말할게 좋아해 미유,"],
+        [0, "사이온지 미유", null, 0, null, 78, 64, 82, 0, 160, 300, null, null, "미우… 방금 뭐라고?.....루? 루란 말이야?"],
+        [0, "사이온지 미우", null, 0, null, 85, 91, 33, 0, 160, 300, null, "견고", "크하하… 모두 박살나 버려라, 이딴 세상!"],
+        [0, "오카자키 나기사", null, 0, null, 77, 17, 91, 0, 160, 300, null, null, "경단~ 경단~ 경단~경단 경단 대가족~"],
+        [0, "오카자키 토모야", null, 0, null, 79, 82, 51, 0, 160, 300, null, null],
+        [0, "오카자키 우시오", null, 0, null, 67, 77, 68, 0, 160, 300, null, null, "미우를 구하기 위해..! 난 싸울거야 친구니까!"],
+        [0, "최산해", null, 0, null, 82, 88, 33, 0, 160, 300, null, null],
+        [0, "유에", null, 0, null, 56, 14, 80, 0, 160, 300, null, null, "백성을 우선시하는게 통치의 근본."],
+        [0, "에이", null, 0, null, 64, 33, 97, 0, 160, 300, null, null, "유에는 소중한 친구이자 주군,"],
+        [0, "견휘", null, 3, "장안", 85, 44, 92, 12, 160, 300, null, "집중"],
+        [0, "고현", null, 3, "장안", 52, 37, 81, 1, 160, 300, null, null],
+        [5, "고순", null, 3, "함곡", 88, 86, 66, 1, 160, 300, null, "기병"],
+        [5, "장료", null, 3, "장안", 85, 92, 78, 1, 160, 300, null, "무쌍"],
+        [5, "가후", null, 3, "장안", 80, 46, 98, 11, 160, 300, null, null],
+        [5, "견린", null, 3, "장안", 70, 42, 88, 1, 160, 300, null, null],
+        [5, "견정", null, 3, "장안", 66, 40, 55, 1, 160, 300, null, null],
+        [5, "헌제", null, 3, "장안", 47, 44, 83, 1, 160, 300, null, null],
+        [5, "곽가", null, 3, "함곡", 61, 33, 91, 1, 160, 300, null, "귀모"],
+        [5, "강인", null, 4, "한중", 90, 53, 91, 12, 160, 300, null, null, "나는 강인 백약, 사마사의 아내야"],
+        [5, "사마예은", null, 4, "한중", 53, 37, 82, 1, 160, 300, null, null],
+        [3, "유혜은", null, 4, "한중", 69, 57, 72, 1, 160, 300, null, null],
+        [3, "유현아", null, 4, "한중", 65, 68, 51, 1, 160, 300, null, null],
+        [3, "장연지", null, 4, "한중", 31, 15, 66, 1, 160, 300, null, null],
+        [3, "장서연", null, 4, "한중", 74, 73, 44, 1, 160, 300, null, null],
+        [3, "유하연", null, 4, "한중", 68, 61, 65, 1, 160, 300, null, null],
+        [3, "유희", null, 4, "한중", 64, 75, 62, 1, 160, 300, null, null],
+        [3, "나지현", null, 4, "한중", 64, 33, 71, 1, 160, 300, null, null],
+        [3, "아사쿠라 나오", null, 0, null, 81, 63, 83, 0, 160, 300, null, "저격", "모든건 우리를 싸우게 만들고 서로 죽이게 한 어른들에 대한 복수,"],
+        [3, "아오이 타쿠마", null, 0, null, 77, 89, 55, 0, 160, 300, null, null],
+        [0, "우라베 슈고", null, 0, null, 53, 68, 61, 0, 160, 300, null, null],
+        [0, "카사이 오사무", null, 0, null, 66, 54, 39, 0, 160, 300, null, null],
+        [0, "카케이 쿄코", null, 0, null, 77, 55, 81, 0, 160, 300, null, null],
+        [0, "사쿠라이 하루야", null, 0, null, 63, 79, 51, 0, 160, 300, null, null],
+        [0, "히카사 쇼타", null, 0, null, 55, 31, 44, 0, 160, 300, null, null],
+        [0, "토츠카 호나미", null, 0, null, 81, 77, 53, 0, 160, 300, null, null],
+        [0, "니이미 레나", null, 0, null, 66, 78, 55, 0, 160, 300, null, null],
+        [0, "큐어 트윙클", null, 0, null, 81, 88, 55, 0, 160, 300, null, null],
+        [0, "모토무라 아스카", null, 0, null, 64, 77, 81, 0, 160, 300, null, null],
+        [0, "야기 아야네", null, 0, null, 78, 83, 55, 0, 160, 300, null, "저격"],
+        [0, "야자와 아이", null, 0, null, 67, 89, 57, 0, 160, 300, null, "무쌍"],
+        [0, "유키 카나", null, 0, null, 79, 24, 88, 0, 160, 300, null, "통찰"],
+        [0, "노다 샤토미", null, 0, null, 61, 55, 69, 0, 160, 300, null, null],
+        [0, "사사가와 류헤이", null, 0, null, 66, 58, 66, 0, 160, 300, null, null],
+        [0, "키리야마 카즈오", null, 0, null, 91, 92, 99, 0, 160, 300, "패권", "위압", "뒷면이 나오면…이 게임을 받아들이기로…!"],
+        [0, "이치가와 쥬리", null, 0, null, 34, 32, 91, 0, 160, 300, null, "발명"],
+        [0, "모토무라 아야네", null, 0, null, 77, 67, 55, 0, 163, 300, null, null],
+        [0, "코토히키 카요코", null, 0, null, 78, 33, 78, 0, 160, 300, null, null],
+        [0, "스기무라 히로키", null, 0, null, 67, 90, 45, 0, 160, 300, "유지", null],
+        [0, "민유희", null, 0, null, 89, 55, 81, 0, 163, 300, null, null],
+        [0, "사카키 유코", null, 0, null, 45, 34, 60, 0, 160, 300, null, null],
+        [0, "사쿠라이 사키", null, 0, null, 78, 77, 66, 0, 160, 300, null, "저격"],
+        [0, "마키", null, 0, null, 72, 74, 56, 0, 160, 300, null, null],
+        [0, "마이", null, 0, null, 70, 70, 60, 0, 160, 300, null, null],
+        [0, "소마 미츠코", null, 0, null, 93, 66, 90, 0, 160, 300, null, null, "나는 뺏는쪽에 서서 살아가는 거잖아…?"],
+        [0, "타카구치유이치로", null, 0, null, 77, 54, 79, 0, 160, 300, null, null],
+        [0, "스즈키 아야로", null, 1, "유구", 55, 44, 77, 1, 160, 300, null, null],
+        [0, "아사기 유미", null, 0, null, 84, 56, 66, 0, 160, 300, null, null],
+        [1, "아오조야 하나코", null, 0, null, 89, 66, 94, 0, 160, 300, null, null],
+        [1, "아유카 시로미", null, 0, null, 3, 15, 64, 0, 160, 300, null, null],
+        [0, "아유카 시코", null, 0, null, 7, 9, 66, 0, 160, 300, null, null],
+        [0, "아카타 마야코", null, 0, null, 35, 40, 55, 0, 160, 300, null, null],
+        [0, "아타키 류야", null, 0, null, 64, 12, 80, 0, 160, 300, null, null],
+        [0, "우츠미 유키에", null, 0, null, 71, 44, 82, 0, 160, 300, null, null, "바보야…모두 바보야! 모두 살아돌아갈수도 있엇는데…."],
+        [0, "아제라크", null, 0, null, 81, 89, 68, 0, 160, 300, null, null, "프리큐어…! 모조리 거미밥으로 만들어주마!"],
+        [0, "악튜러스 멩스크", null, 5, "성도", 95, 71, 99, 12, 151, 300, "패권", "집중", "누구도 날 막을 수 없어. 네놈이건, 연합이건, 프로토스건, 그 누구도! 코프룰루를 가질 수 없다면 차라리 잿더미로 만들어 버릴테다!"],
+        [0, "발레리안 멩스크", null, 5, "성도", 85, 63, 88, 1, 160, 300, null, null, "난 국민의 편이오. 아버지의 죄는 용서받을 수 없다는 걸 알고 있소. 권좌에서… 내려오셔야 한다는 것도."],
+        [10, "호러스 워필드", null, 5, "성도", 95, 83, 82, 1, 160, 300, "대의", "인덕", "캐리건... 잘 들어라. 지금 왕복선 3대엔 부상병들만 타고 있다. 다들 누군가의... 남편이자, 아버지야. 저들은 그냥 보내다오. 알겠나? 독한 것. 넌 인간도 아니야. 넌 우릴 배신했어. 뭣 때문에? 그깟 복수 때문에?\n무고한 사람들을 얼마나 죽인 거야? 또 얼마나 더 죽일 셈이야?\n레이너가 널 보면 뭐라고 할까?"],
+        [10, "캐롤라이나", null, 5, "성도", 80, 51, 75, 1, 160, 300, null, null],
+        [10, "노바 테라", null, 5, "성도", 71, 92, 55, 1, 160, 300, null, "저격", "노바, 작전준비"],
+        [10, "헥터 산티아고", null, 5, "성도", 85, 55, 84, 1, 160, 300, null, null],
+        [10, "클레리아 듀크", null, 0, null, 89, 64, 88, 0, 146, 300, null, null, "가족들과 같이 마지막 까지 살아남아 돌아가겟어."],
+        [10, "에밀리아 듀크", null, 0, null, 82, 84, 66, 0, 160, 300, null, "저격", "어머니랑 다시 만나서 기뻐"],
+        [0, "에르지나 듀크", null, 0, null, 75, 87, 62, 0, 160, 300, null, "저격"],
+        [0, "헤일리 듀크", null, 0, null, 70, 64, 84, 0, 160, 300, null, null],
+        [0, "존 레이너", null, 0, null, 77, 89, 62, 0, 160, 300, null, "저격"],
+        [0, "베르카 나바렌", null, 0, null, 81, 51, 93, 0, 160, 300, null, null],
+        [0, "마리에 베넷", null, 0, null, 66, 33, 66, 0, 160, 300, null, null],
+        [0, "유리아 베넷", null, 0, null, 76, 41, 55, 0, 160, 300, null, null],
+        [0, "루미 베레스", null, 0, null, 77, 33, 89, 0, 160, 300, null, null],
+        [0, "타이커스", null, 0, null, 61, 85, 40, 0, 160, 300, null, null],
+        [0, "제임스 레이너", null, 0, null, 99, 88, 72, 0, 160, 300, "대의", "돌격", "피닉스! 안돼!!"],
+        [0, "맷 호너", null, 0, null, 87, 64, 95, 0, 160, 300, null, null],
+        [0, "로리 스완", null, 0, null, 32, 55, 93, 0, 160, 300, null, "발명"],
+        [0, "이곤 스텟먼", null, 0, null, 11, 7, 91, 0, 160, 300, null, "발명"],
+        [0, "가브리엘 토시", null, 0, null, 85, 96, 55, 0, 160, 300, null, "저격"],
+        [0, "로사 모랄레스", null, 0, null, 51, 44, 67, 0, 160, 300, null, null],
+        [0, "레베카 레이너", null, 0, null, 81, 93, 44, 0, 160, 300, null, null],
+        [0, "케이트 록웰", null, 0, null, 43, 10, 78, 0, 160, 300, null, null],
+        [0, "아리엘 헨슨", null, 0, null, 17, 1, 89, 0, 160, 300, null, "발명"],
+        [0, "미라 호너", null, 0, null, 89, 66, 94, 0, 160, 300, null, null],
+        [0, "알렌 세자르", null, 0, null, 85, 61, 82, 0, 160, 300, null, null],
+        [0, "마이클 리버티", null, 0, null, 64, 33, 71, 0, 160, 300, null, null],
+        [0, "시온 크루스", null, 5, "성도", 51, 14, 85, 1, 160, 300, null, null],
+        [0, "사라 케리건", null, 0, null, 95, 95, 81, 0, 160, 300, null, "무쌍"],
+        [10, "드랄리스카", null, 0, null, 82, 93, 78, 0, 160, 300, null, null, "케리건님이 죽다니…근데 왜 내가 그 중임을 이어받아야 하는거야?"],
+        [0, "에레니카", null, 0, null, 78, 38, 91, 0, 160, 300, null, null, "곧있으면 위대하신 아몬님이 완전히 부활할거야 드랄리스카 언니 후후후…."],
+        [0, "세페니아", null, 0, null, 75, 81, 51, 0, 160, 300, null, null, "에레니카 언니 뭔가 이상해"],
+        [0, "이즈샤", null, 0, null, 31, 55, 81, 0, 160, 300, null, null, "여왕님의 명을 받듭니다"],
+        [0, "자가라", null, 0, null, 87, 91, 46, 0, 160, 300, null, null],
+        [0, "데히카", null, 0, null, 75, 91, 55, 0, 160, 300, null, null],
+        [0, "스투코프 부제독", null, 0, null, 87, 71, 93, 0, 160, 300, null, null],
+        [0, "니아드라", null, 0, null, 80, 83, 52, 0, 160, 300, null, null],
+        [0, "아바투르", null, 0, null, 43, 33, 81, 0, 160, 300, null, "발명"],
+        [0, "다고쓰", null, 0, null, 81, 85, 80, 0, 160, 300, null, null, "휴우… 드랄리스카도 환생자라 다행이야, 죽을일은 없겠네… 근데 케리건이 죽을줄이야…"],
+        [0, "초월체", null, 0, null, 95, 55, 99, 0, 160, 300, null, null],
+        [0, "자츠", null, 0, null, 82, 55, 71, 0, 160, 300, null, null],
+        [0, "곤", null, 0, null, 79, 56, 77, 0, 160, 300, null, null],
+        [0, "카그", null, 0, null, 80, 55, 69, 0, 160, 300, null, null],
+        [0, "아우자", null, 0, null, 64, 71, 86, 0, 160, 300, null, null],
+        [0, "제라드 듀갈", null, 0, null, 87, 51, 80, 0, 160, 300, null, null],
+        [0, "맘스틴 대령", null, 0, null, 80, 51, 66, 0, 160, 300, null, null],
+        [0, "스투코프 주니어", null, 0, null, 81, 56, 72, 0, 160, 300, null, null, "ued 2차원정대로 우린 아몬과의 결전에 참가할거야."],
+        [0, "레비나 스투코프", null, 0, null, 66, 31, 90, 0, 160, 300, null, null, "근데 우리 병사로 괜찮을까 오빠"],
+        [0, "제라툴", null, 0, null, 85, 90, 82, 0, 160, 300, null, null, "젤나가 맙소사! 누가 이런 끔찍한 혼종을 만들었단 말인가"],
+        [0, "테사다르", "`", 0, null, 82, 77, 86, 0, 160, 300, null, null, "난 죽음을 경험한 적이 없네"],
+        [0, "피닉스", null, 0, null, 79, 80, 65, 0, 160, 300, null, null],
+        [0, "알다리스", null, 0, null, 80, 51, 77, 0, 160, 300, null, null],
+        [0, "탈란다르", null, 0, null, 84, 66, 80, 0, 160, 300, null, null],
+        [0, "아르타니스", null, 0, null, 80, 71, 84, 0, 160, 300, null, null, "모조리 용기병으로 만들어주마!"],
+        [0, "라자갈", null, 0, null, 90, 75, 89, 0, 160, 300, null, null],
+        [0, "우룬 제독", null, 0, null, 84, 80, 55, 0, 160, 300, null, null],
+        [0, "셀렌디스", null, 0, null, 80, 80, 67, 0, 160, 300, null, null],
+        [0, "보라준", null, 0, null, 87, 51, 91, 0, 160, 300, null, null],
+        [0, "알라리크", null, 0, null, 89, 92, 87, 0, 160, 300, null, null],
+        [0, "말라쉬", null, 0, null, 80, 96, 65, 0, 160, 300, null, null],
+        [0, "니온", null, 0, null, 62, 73, 43, 0, 160, 300, null, null],
+        [0, "지나라", null, 0, null, 75, 90, 55, 0, 160, 300, null, null],
+        [0, "아리샤", null, 0, null, 51, 81, 50, 0, 160, 300, null, null, "난 XX부르드의 울트라 대표 아리샤다!"],
+        [0, "아몬", null, 0, null, 97, 107, 85, 0, 160, 300, null, null, "나는 너희들의 시작이었으니 또한 끝이리라….!"],
+        [0, "에밀 나루드", null, 0, null, 85, 92, 96, 0, 160, 300, null, null, "아몬께서 별빛으로 속삭이셨다. 그분은 돌아오신다고 하셨다. 그분은 파괴한다고 하셨다. 멸종. 모든 것이 종말을 맞이할 것이라고"],
+        [0, "오로스", null, 0, null, 80, 79, 55, 0, 160, 300, null, null],
+        [0, "도로시 멩스크", null, 0, null, 52, 74, 81, 0, 160, 300, null, null],
+        [0, "유다미", null, 0, null, 40, 78, 3, 0, 160, 300, null, null],
+        [0, "유지혜", null, 0, null, 77, 64, 80, 0, 160, 300, null, null, "언니를 이번에야 말로 지킬거야… 그럴려고 마법소녀가 된걸!"],
+        [0, "유하준", null, 0, null, 78, 70, 70, 0, 160, 300, null, null],
+        [0, "유당찬", null, 0, null, 83, 69, 55, 0, 160, 300, null, null],
+        [0, "유시하", "`", 0, null, 67, 55, 81, 0, 160, 300, null, null],
+        [0, "유미하", null, 0, null, 41, 34, 48, 0, 160, 300, null, null],
+        [0, "유지은", null, 0, null, 55, 78, 64, 0, 160, 300, null, null],
+        [0, "유혜선", null, 0, null, 78, 89, 55, 0, 160, 300, null, null],
+        [0, "최정윤", null, 0, null, 85, 71, 66, 0, 160, 300, null, null, "우리는 다미키즈, 다미의 친구들이자 다미에 의해 도움을 받은 아이들"],
+        [0, "이선아", null, 0, null, 83, 88, 56, 0, 160, 300, null, null, "나는 마콧치, 마법나라 감사부문의 부부장이야."],
+        [0, "나서희", null, 0, null, 81, 77, 44, 0, 160, 300, null, null, "다미를 지킬거야"],
+        [0, "스노우 화이트", null, 0, null, 71, 80, 66, 0, 160, 300, null, null, "이번에야 말로 친구들을 지켜 보이겠어. 소타도, 아카리도"],
+        [0, "워터 스플렛", null, 0, null, 65, 80, 52, 0, 160, 300, null, null, "이번생에는 그런 셔플린 따위에게 지지 않을거야,"],
+        [0, "스노우 슬러스", null, 0, null, 69, 75, 53, 0, 160, 300, null, null, "저번생이랑 달라! 나도 강해졋다고!"],
+        [0, "리하나", null, 0, null, 79, 70, 65, 0, 160, 300, null, null, "프흐레 언니…"],
+        [0, "블루베리", null, 0, null, 81, 88, 73, 0, 160, 300, null, null],
+        [0, "스윔스윔", null, 0, null, 54, 90, 71, 0, 163, 300, null, null, "룰러가 그랫어 마법소녀는 본모습을 남에게 보여주면 안된다고"],
+        [0, "이선화", null, 0, null, 66, 55, 79, 0, 160, 300, null, null, "다미는 우리의 소중한 친구"],
+        [0, "정혜림", null, 0, null, 91, 88, 80, 0, 160, 300, null, null, "우리 다미키즈는 다미언니에 의해 많은걸 받은 아이들이야,"],
+        [0, "하나조노 아무", null, 0, null, 67, 53, 81, 0, 160, 300, null, null, "캐릭터 변신! 애뮬릿 다이아!"],
+        [0, "하나조노 카렌", null, 0, null, 66, 51, 80, 0, 160, 300, null, null, "나는 하나조노 카렌, 전 이름은 하나무라 카렌이야."],
+        [0, "하나조노 아리스", null, 0, null, 53, 14, 61, 0, 160, 300, null, null],
+        [0, "린", null, 0, null, 38, 32, 69, 0, 160, 300, null, null, "난 용담꽃의 페어리루 린이야~"],
+        [0, "하나조노 마츠아", null, 0, null, 44, 40, 55, 0, 160, 300, null, null],
+        [0, "롭프", null, 0, null, 55, 47, 50, 0, 160, 300, null, null],
+        [0, "이정선 황제", null, 0, null, 74, 44, 85, 0, 160, 300, null, null, "감히 우리 제국에 반기를 든자들! 용서하지 않는다! Tog!"],
+        [0, "이양선 대공", null, 0, null, 77, 42, 79, 0, 160, 300, null, null, "형님이 저리 화를 내시다니 내심 대단하구나 그들은"],
+        [0, "이을용 황태자", null, 0, null, 51, 33, 69, 0, 160, 300, null, null],
+        [0, "카라시프 장군", null, 0, null, 75, 69, 71, 0, 160, 300, null, null],
+        [0, "카몬 요네미", null, 0, null, 40, 8, 66, 0, 160, 300, null, null],
+        [0, "키타노 타케시", null, 0, null, 43, 14, 75, 0, 160, 300, null, null, "우리가족의 행복과 안전을 우선시해야지"],
+        [0, "키타노 유리아", null, 0, null, 32, 8, 69, 0, 160, 300, null, null],
+        [0, "후타바 안즈", null, 0, null, 67, 44, 90, 0, 160, 300, null, null, "나도 하메르도 행복하길"],
+        [0, "하메르", null, 0, null, 66, 32, 73, 0, 160, 300, null, null, "이번생에는 행복하고 싶어"],
+        [0, "나츠세 유우", null, 0, null, 66, 30, 70, 0, 160, 300, null, null],
+        [0, "크로노스 신", null, 0, null, 50, 15, 90, 0, 160, 300, null, null],
+        [0, "프흐레", null, 0, null, 69, 24, 100, 0, 160, 300, null, null, "마법나라가 바라는 마법소녀란 말이지…"],
+        [999, "나나하라 슈야", null, 0, null, 73, 72, 62, 0, 160, 300, null, null, "전세계의 어른들에게 선전포고 한다!"],
+        [0, "타에구치유이치로", null, 0, null, 51, 63, 44, 0, 160, 300, null, null],
+        [0, "카와다 소교", null, 0, null, 49, 70, 85, 0, 160, 300, null, null],
+        [0, "카에리 유카리", null, 0, null, 41, 31, 53, 0, 160, 300, null, null],
+        [0, "사에구치 미나", null, 0, null, 44, 55, 36, 0, 160, 300, null, null],
+        [0, "큐어 카루티", null, 0, null, 62, 81, 55, 0, 160, 300, null, null],
+        [0, "큐어 리프렛", null, 0, null, 71, 89, 72, 0, 160, 300, null, null],
+        [0, "큐어 실프", null, 0, null, 83, 92, 88, 0, 160, 300, null, null],
+        [0, "큐어 아네모스", null, 0, null, 69, 80, 55, 0, 160, 300, null, null],
+        [0, "카마디야", null, 0, null, 85, 93, 55, 0, 160, 300, null, null, "크흐흐… 감히 인간 따위가!! 나에게 덤비다니 용서못한다!!"],
+        [0, "토토리몬", null, 0, null, 69, 88, 44, 0, 160, 300, null, null, "모든것은 카마디야님의 부활을 위해서…."],
+        [0, "카와리노", null, 0, null, 73, 91, 80, 0, 160, 300, null, null, "나를 그곳에 꺼내주신 카마디야 님을 위해 난 일한다!"],
+        [0, "가마오", null, 0, null, 41, 65, 13, 0, 160, 300, null, null, "이씨 너무 배고파…"],
+        [0, "밀키 로즈", null, 0, null, 64, 82, 52, 0, 160, 300, null, null],
+        [0, "옐로우 미치", null, 0, null, 61, 80, 80, 0, 160, 300, null, null, "난 마법나라 외교부문의 부문장 옐로우 미치야"],
+        [0, "마왕팜", null, 0, null, 50, 90, 70, 0, 160, 300, null, null, "무지개? 어째서…!"],
+        [0, "그림하트", null, 0, null, 74, 63, 41, 0, 160, 300, null, null, "목을 쳐라!!"],
+        [0, "루다", null, 0, null, 62, 66, 62, 0, 160, 300, null, null],
+        [0, "아이카와 준", null, 0, null, 90, 88, 65, 0, 160, 300, null, null],
+        [0, "아이카와 린", null, 0, null, 74, 12, 85, 0, 160, 300, null, null],
+        [0, "타카이시 히야미", null, 0, null, 86, 75, 77, 0, 161, 300, "대의", "인덕", "이나라를 안정시키려는데 힘이 부족해…"],
+        [0, "타카이시 카린", null, 0, null, 41, 14, 79, 0, 160, 300, "재간", null, "우리딸이 행복해야 할텐데…."],
+        [0, "타카이시 에이린", null, 0, null, 75, 51, 92, 0, 160, 300, null, null],
+        [0, "정군호", null, 0, null, 94, 65, 88, 0, 160, 300, null, null, "우리 제국의 대장군으로써, 이나라를 수호한다!"],
+        [0, "슈리", null, 0, null, 81, 34, 100, 0, 160, 300, null, "신산", "하와와"],
+        [0, "미나미", null, 0, null, 85, 56, 98, 0, 160, 300, null, "귀모"],
+        [0, "린린", null, 0, null, 92, 99, 44, 0, 160, 300, null, "무쌍", "~거다"],
+        [0, "아이샤", null, 0, null, 96, 98, 71, 0, 160, 300, null, "위압"],
+        [0, "모토미야 미야코", null, 0, null, 71, 64, 77, 0, 160, 300, null, null],
+        [0, "모토미야 메이", null, 0, null, 81, 55, 80, 0, 160, 300, null, null],
+        [0, "모토미야 유지", null, 0, null, 86, 31, 88, 0, 160, 300, null, "상재", "허허…. 이나라가 어찌되련지…"],
+        [0, "타카이시 나츠히코", null, 0, null, 51, 33, 67, 0, 160, 300, null, null],
+        [0, "유해", null, 0, null, 85, 87, 64, 0, 160, 300, null, null],
+        [0, "유채", null, 0, null, 64, 71, 23, 0, 160, 300, null, null],
+        [0, "유창", null, 0, null, 59, 68, 33, 0, 160, 300, null, null],
+        [0, "타카이시 타케루", null, 0, null, 80, 92, 65, 0, 160, 300, null, "무쌍"],
+        [0, "타카이시 히카리", null, 0, null, 31, 11, 90, 0, 160, 300, null, "인덕"],
+        [0, "타카이시 노조미", null, 0, null, 82, 66, 81, 0, 160, 300, null, null],
+        [0, "타카이시 미츠루", null, 0, null, 85, 51, 71, 0, 160, 300, null, null, "이 나라가 왜이리 망가져 버린걸까"],
+        [0, "유상", null, 0, null, 66, 77, 51, 0, 160, 300, null, null],
+        [0, "유상호", null, 0, null, 39, 56, 44, 0, 160, 300, null, null, "쯧. 저런애가 내 딸이라니 수치야"],
+        [0, "서유현", null, 0, null, 42, 44, 60, 0, 160, 300, null, null, "하… 내가 교육을 잘못했구나"],
+        [0, "오준", null, 0, null, 69, 12, 84, 0, 160, 300, null, null, "이 지역은 이제부터 내것이다!"],
+        [10, "도니 버밀리언", null, 0, null, 48, 14, 66, 0, 160, 300, null, null],
+        [0, "모한다르", null, 0, null, 68, 81, 45, 0, 160, 300, null, null],
+        [0, "월리엄 와이트", null, 0, null, 55, 64, 88, 0, 160, 300, null, null, "아니 나를 별명으로 부르지 말라고!"],
+        [0, "도미니크 헥터", null, 0, null, 57, 69, 41, 0, 160, 300, null, null],
+        [0, "리만 베리오스", null, 0, null, 55, 69, 40, 0, 160, 300, null, null],
+        [1, "고야 나카타", null, 0, null, 73, 55, 77, 0, 160, 300, null, null, "유키코, 난 너를 언제나 사랑할거야"],
+        [1, "니시나 묘토", null, 0, null, 63, 67, 44, 0, 160, 300, null, null, "에휴 유키코를 지키는데 이유는 없지만 말이지"],
+        [0, "오오시 마카코", null, 0, null, 55, 73, 55, 0, 160, 300, null, null, "젠장…! 유키코 놈들 절대로 가만두지 않을거다!"],
+        [0, "스즈이 이로키", null, 0, null, 63, 59, 37, 0, 160, 300, null, null, "우리는 고사모! 유키코와 동료들을 증오하는 클래스 메이트!"],
+        [0, "스즈키 이로이", null, 0, null, 59, 64, 44, 0, 160, 300, null, null, "유키노는 증오의 철퇴를 마주보아라!"],
+        [0, "히라구시 토노", null, 0, null, 51, 58, 59, 0, 160, 300, null, null],
+        [0, "미타키 신고", null, 0, null, 68, 77, 64, 0, 160, 300, null, null],
+        [0, "섀도 게일", null, 0, null, 57, 69, 62, 0, 160, 300, null, null],
+        [0, "사야코", null, 0, null, 69, 75, 60, 0, 160, 300, null, null],
+        [0, "미요가타노 나코", null, 0, null, 77, 55, 79, 0, 160, 300, null, null, "fucking doll!"],
+        [0, "첼너 마우스", null, 0, null, 51, 85, 2, 0, 160, 300, null, null, "체르나는 그런거 싫단 말이야! 내꺼라고!"],
+        [0, "페치카", null, 0, null, 68, 8, 80, 0, 160, 300, null, null]
+    ],
+    "general_ex":[
+
+    ],
+    "initialEvents": [
+        [
+            true,
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ]
+        ]
+    ],
+    "events": [
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                180,
+                1
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                180,
+                7
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                181,
+                1
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                181,
+                7
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                182,
+                1
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "month",
+            1000,
+            [
+                "Date",
+                "==",
+                182,
+                7
+            ],
+            [
+                "ChangeCity",
+                "all",
+                {
+                    "trade": 100
+                }
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ],
+        [
+            "destroy_nation",
+            1000,
+            [
+                "and",
+                [
+                    "Date",
+                    ">=",
+                    183,
+                    1
+                ],
+                [
+                    "RemainNation",
+                    "==",
+                    1
+                ]
+            ],
+            [
+                "BlockScoutAction"
+            ],
+            [
+                "DeleteEvent"
+            ]
+        ]
+    ]
+}

hwe/ts/PageJoin.vue

@@ -186,58 +186,45 @@
         </div>
 
         <div class="col col-lg-6 col-sm-6 col-12 p-2 align-self-center">
-          <div class="a-center">
-            <label> <input v-model="inheritTurnTimeSet" type="checkbox" />턴 시간 고정 </label>
-          </div>
-          <div class="row turn_time_pad">
-            <div class="col col-lg-4 offset-lg-3 col-4 offset-3">
-              <NumberInputWithInfo
-                v-model="inheritTurnTimeMinute"
-                :readonly="!inheritTurnTimeSet"
-                :min="0"
-                :max="turnterm - 1"
-                :right="true"
-                title="분"
-              />
-            </div>
-            <div class="col col-lg-4 col-4">
-              <NumberInputWithInfo
-                v-model="inheritTurnTimeSecond"
-                :readonly="!inheritTurnTimeSet"
-                :min="0"
-                :max="60"
-                :right="true"
-                title="초"
-              />
+          <div class="row">
+            <div class="col col-6 a-right align-self-center">턴 시간 지정</div>
+            <div class="col col-6 align-self-center">
+              <select v-model.number="inheritTurnTimeZone" class="form-select form-inline" style="max-width: 24ch">
+                <option :value="undefined">사용안함</option>
+                <option v-for="(zone, idx) in turnTimeZoneList" :key="idx" :value="idx">
+                    {{ zone }}
+                </option>
+              </select>
             </div>
           </div>
         </div>
 
-        <div class="col col-lg-6 col-12 p-2">
-          <div class="a-center">추가 능력치 고정</div>
+        <div class="col col-lg-6 col-sm-6 col-12 p-2 align-self-center">
           <div class="row">
+            <div class="col col-6 a-right align-self-center">추가 능력치 고정(통/무/지)</div>
+            <div class="col col-6 align-self-center">
+              <div class="row g-1">
             <div class="col">
               <NumberInputWithInfo
                 v-model="(args.inheritBonusStat ?? [0, 0, 0])[0]"
                 :max="stats.bonusMax"
-                title="통솔"
               />
             </div>
             <div class="col">
               <NumberInputWithInfo
                 v-model="(args.inheritBonusStat ?? [0, 0, 0])[1]"
                 :max="stats.bonusMax"
-                title="무력"
               />
             </div>
             <div class="col">
               <NumberInputWithInfo
                 v-model="(args.inheritBonusStat ?? [0, 0, 0])[2]"
                 :max="stats.bonusMax"
-                title="지력"
               />
             </div>
           </div>
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -284,7 +271,7 @@ import TopBackBar from "@/components/TopBackBar.vue";
 import { getIconPath } from "@util/getIconPath";
 import { isBrightColor } from "@util/isBrightColor";
 import { abilityLeadint, abilityLeadpow, abilityPowint, abilityRand } from "@util/generalStats";
-import { shuffle, sum } from "lodash-es";
+import { range, shuffle, sum } from "lodash-es";
 import NumberInputWithInfo from "@/components/NumberInputWithInfo.vue";
 import { SammoAPI } from "./SammoAPI";
 import type { JoinArgs } from "./defs/API/General";
@@ -378,7 +365,7 @@ watch(gameConstStore, (gameConst) => {
     inheritCity: undefined,
     inheritBonusStat: [0, 0, 0],
     inheritSpecial: undefined,
-    inheritTurntime: undefined,
+    inheritTurntimeZone: undefined,
   };
 });
 
@@ -462,7 +449,7 @@ const inheritRequiredPoint = computed(() => {
   if (args.value.inheritSpecial !== undefined) {
     inheritRequiredPoint += gameConst.inheritBornSpecialPoint;
   }
-  if (args.value.inheritTurntime !== undefined) {
+  if (args.value.inheritTurntimeZone !== undefined) {
     inheritRequiredPoint += gameConst.inheritBornTurntimePoint;
   }
   if (args.value.inheritBonusStat !== undefined && sum(args.value.inheritBonusStat) != 0) {
@@ -494,55 +481,37 @@ watch(inheritCity, (newValue: undefined | number) => {
   args.value.inheritCity = inheritCity.value;
 });
 
-const inheritTurnTimeSet = ref(false);
-watch(inheritTurnTimeSet, (newValue: boolean) => {
-  if (!args.value) throw "nyc";
 
-  if (!newValue) {
-    args.value.inheritTurntime = undefined;
-    return;
+const inheritTurnTimeZone = ref<number>();
+const turnTimeZoneList: string[] = (()=>{
+  const result: string[] = [];
+  const zoneSec = turnterm; // * 60 / 60
+  let zoneCur = 0;
+  for(const idx of range(60)){
+    const zoneNext = zoneCur + zoneSec;
+
+    const zoneCurMin = Math.floor(zoneCur / 60);
+    const zoneCurSec = zoneCur % 60;
+    const zoneCurText = `${zoneCurMin.toString().padStart(2, "0")}:${zoneCurSec.toString().padStart(2, "0")}.000`;
+
+    const zoneCurEnd = zoneCur + zoneSec - 1;
+    const zoneCurEndMin = Math.floor(zoneCurEnd / 60);
+    const zoneCurEndSec = zoneCurEnd % 60;
+    const zoneCurEndText = `${zoneCurEndMin.toString().padStart(2, "0")}:${zoneCurEndSec.toString().padStart(2, "0")}.999`;
+
+    // aa:bb.000 ~ cc:dd.999
+    const zoneStr = `${zoneCurText} ~ ${zoneCurEndText}`;
+    result.push(zoneStr);
+    zoneCur = zoneNext;
   }
-  args.value.inheritTurntime = inheritTurnTimeMinute.value * 60 + inheritTurnTimeSecond.value;
+  return result;
+})();
+
+watch(inheritTurnTimeZone, (newValue: undefined | number) => {
+  if (!args.value) throw "nyc";
+  args.value.inheritTurntimeZone = inheritTurnTimeZone.value;
 });
 
-watch(
-  [inheritCity, inheritTurnTimeSet],
-  ([newInheritCity, newInheritTurnTimeSet], [oldInheritCity, oldInheritTurnTimeSet]) => {
-    if (newInheritCity === undefined || newInheritTurnTimeSet === false) {
-      return;
-    }
-    alert("도시와 턴 시간을 동시에 설정할 수 없습니다.");
-
-    if (newInheritCity !== oldInheritCity) {
-      inheritCity.value = undefined;
-    }
-    if (newInheritTurnTimeSet !== oldInheritTurnTimeSet) {
-      inheritTurnTimeSet.value = false;
-    }
-  },
-  { immediate: true }
-);
-
-const inheritTurnTimeMinute = ref(0);
-watch(inheritTurnTimeMinute, (newValue: number) => {
-  if (!args.value) throw "nyc";
-  if (!inheritTurnTimeSet.value) {
-    args.value.inheritTurntime = undefined;
-    return;
-  }
-  args.value.inheritTurntime = newValue * 60 + inheritTurnTimeSecond.value;
-});
-
-const inheritTurnTimeSecond = ref(0);
-watch(inheritTurnTimeSecond, (newValue: number) => {
-  if (!args.value) throw "nyc";
-
-  if (!inheritTurnTimeSet.value) {
-    args.value.inheritTurntime = undefined;
-    return;
-  }
-  args.value.inheritTurntime = inheritTurnTimeMinute.value * 60 + newValue;
-});
 </script>
 <style lang="scss">
 @import "@scss/common/base.scss";
@@ -569,10 +538,6 @@ watch(inheritTurnTimeSecond, (newValue: number) => {
 .col-form-label {
   text-align: right;
 }
-
-.turn_time_pad .col-form-label {
-  text-align: left;
-}
 </style>
 
 <style lang="scss" scoped>

hwe/ts/components/AuctionUniqueItem.vue

@@ -152,7 +152,7 @@ async function refreshDetail() {
     currentAuction.value = await SammoAPI.Auction.GetUniqueItemAuctionDetail({ auctionID });
     const bidList = currentAuction.value.bidList;
     const highestBidAmount = Math.max(bidList[0].amount, bidList[bidList.length-1].amount);
-    bidAmount.value = Math.max(bidAmount.value, Math.ceil(highestBidAmount * 1.01));
+    bidAmount.value = Math.ceil(highestBidAmount * 1.01);
   } catch (e) {
     console.error(e);
     if (isString(e)) {

hwe/ts/defs/API/General.ts

@@ -6,7 +6,7 @@ export type JoinArgs = {
   pic: boolean;
   character: string;
   inheritSpecial?: string;
-  inheritTurntime?: number;
+  inheritTurntimeZone?: number;
   inheritCity?: number;
   inheritBonusStat?: [number, number, number];
 };

src/sammo/APIHelper.php

@@ -93,8 +93,8 @@ class APIHelper
                     'ip' => $ip,
                     'date' => $date,
                     'path' => $actionPath,
-                    'arg' => JSON::encode($filteredArgs),
-                    'aux' => JSON::encode([
+                    'arg' => Json::encode($filteredArgs),
+                    'aux' => Json::encode([
                         'result' => false,
                         'state' => 'validate',
                         'reason' => $validateResult
@@ -123,8 +123,8 @@ class APIHelper
                     'ip' => $ip,
                     'date' => $date,
                     'path' => $actionPath,
-                    'arg' => JSON::encode($filteredArgs),
-                    'aux' => JSON::encode([
+                    'arg' => Json::encode($filteredArgs),
+                    'aux' => Json::encode([
                         'result' => false,
                         'state' => 'launch',
                         'reason' => $result
@@ -139,8 +139,8 @@ class APIHelper
                     'ip' => $ip,
                     'date' => $date,
                     'path' => $actionPath,
-                    'arg' => JSON::encode($filteredArgs),
-                    'aux' => JSON::encode([
+                    'arg' => Json::encode($filteredArgs),
+                    'aux' => Json::encode([
                         'result' => false,
                         'state' => 'launch',
                         'reason' => $recoveryType->info(),
@@ -168,8 +168,8 @@ class APIHelper
                             'ip' => $ip,
                             'date' => $date,
                             'path' => $actionPath,
-                            'arg' => JSON::encode($filteredArgs),
-                            'aux' => JSON::encode([
+                            'arg' => Json::encode($filteredArgs),
+                            'aux' => Json::encode([
                                 'result' => true,
                                 'state' => 'cache_not_modified',
                             ]),
@@ -183,8 +183,8 @@ class APIHelper
                         'ip' => $ip,
                         'date' => $date,
                         'path' => $actionPath,
-                        'arg' => JSON::encode($filteredArgs),
-                        'aux' => JSON::encode([
+                        'arg' => Json::encode($filteredArgs),
+                        'aux' => Json::encode([
                             'result' => true,
                             'state' => 'cache_not_modified',
                         ]),
@@ -199,8 +199,8 @@ class APIHelper
                     'ip' => $ip,
                     'date' => $date,
                     'path' => $actionPath,
-                    'arg' => JSON::encode($filteredArgs),
-                    'aux' => JSON::encode([
+                    'arg' => Json::encode($filteredArgs),
+                    'aux' => Json::encode([
                         'result' => true,
                         'state' => 'success_simple',
                         'set_cache' => $setCache,
@@ -216,8 +216,8 @@ class APIHelper
                 'ip' => $ip,
                 'date' => $date,
                 'path' => $actionPath,
-                'arg' => JSON::encode($filteredArgs),
-                'aux' => JSON::encode([
+                'arg' => Json::encode($filteredArgs),
+                'aux' => Json::encode([
                     'result' => true,
                     'state' => 'success_complex',
                     'set_cache' => $setCache,
@@ -226,6 +226,7 @@ class APIHelper
             $result['result'] = $result['result'] ?? true;
             Json::die($result, $setCache ? 0 : Json::NO_CACHE);
         } catch (\Exception $e) {
+            $session = Session::getInstance();
             $errMsg = $e->getMessage();
             $errTrace = $e->getTraceAsString();
             $logDB->insert('api_log', [
@@ -233,8 +234,8 @@ class APIHelper
                 'ip' => $ip,
                 'date' => $date,
                 'path' => $actionPath,
-                'arg' => JSON::encode($filteredArgs),
-                'aux' => JSON::encode([
+                'arg' => Json::encode($filteredArgs),
+                'aux' => Json::encode([
                     'result' => false,
                     'state' => 'error_exception',
                     'errMsg' => $errMsg,
@@ -244,6 +245,7 @@ class APIHelper
             Json::dieWithReason("{$errMsg}\n{$errTrace}");
         } catch (\Throwable $e) {
             logExceptionByCustomHandler($e, false);
+            $session = Session::getInstance();
             $errMsg = $e->getMessage();
             $errTrace = $e->getTraceAsString();
             $logDB->insert('api_log', [
@@ -251,8 +253,8 @@ class APIHelper
                 'ip' => $ip,
                 'date' => $date,
                 'path' => $actionPath,
-                'arg' => JSON::encode($filteredArgs),
-                'aux' => JSON::encode([
+                'arg' => Json::encode($filteredArgs),
+                'aux' => Json::encode([
                     'result' => false,
                     'state' => 'error_throwable',
                     'errMsg' => $errMsg,
@@ -261,14 +263,15 @@ class APIHelper
             ]);
             Json::dieWithReason("{$errMsg}\n{$errTrace}");
         } catch (mixed $e) {
+            $session = Session::getInstance();
             $errStr = strval($e);
             $logDB->insert('api_log', [
                 'user_id' => $session->userID ?? 0,
                 'ip' => $ip,
                 'date' => $date,
                 'path' => $actionPath,
-                'arg' => JSON::encode($filteredArgs),
-                'aux' => JSON::encode([
+                'arg' => Json::encode($filteredArgs),
+                'aux' => Json::encode([
                     'result' => false,
                     'state' => 'error_mixed',
                     'errMsg' => $errStr,