【가상모드14-b】 걸그룹대전(비급) 시나리오 추가

- 국고 병령이 2000 밑이더라도, 유저장은 출병

hwe/process_war.php

@@ -37,12 +37,12 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
 
     $city = new WarUnitCity($rng, $rawDefenderCity, $rawDefenderNation, $year, $month, $startYear);
 
-    $defenderIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0 and crew > 0 and rice>(crew/100) and train>=defence_train and atmos>=defence_train', $city->getVar('nation'), $city->getVar('city'));
-    $defenderGeneralList = General::createObjListFromDB($defenderIDList, null);
+    $defenderCityGeneralIDList = $db->queryFirstColumn('SELECT no FROM general WHERE nation=%i AND city=%i AND nation!=0', $city->getVar('nation'), $city->getVar('city'));
+    $defenderCityGeneralList = General::createObjListFromDB($defenderCityGeneralIDList, null);
 
     /** @var WarUnit[] */
     $defenderList = [];
-    foreach($defenderGeneralList as $defenderGeneral){
+    foreach($defenderCityGeneralList as $defenderGeneral){
         $defenderGeneral->setRawCity($rawDefenderCity);
         $defenderCandidate = new WarUnitGeneral($rng, $defenderGeneral, $rawDefenderNation, false);
         if(extractBattleOrder($defenderCandidate, $attacker) <= 0){
@@ -186,7 +186,7 @@ function processWar(string $warSeed, General $attackerGeneral, array $rawAttacke
         'year' => $year,
         'month' => $month,
         'join_mode' => $joinMode,
-    ], $attacker->getGeneral(), $city->getRaw());
+    ], $attacker->getGeneral(), $city->getRaw(), $defenderCityGeneralList);
 }
 
 function extractBattleOrder(WarUnit $defender, WarUnit $attacker)
@@ -529,8 +529,9 @@ function getConquerNation($city): int
     return Util::array_first_key($conflict);
 }
 
-function ConquerCity(array $admin, General $general, array $city)
+function ConquerCity(array $admin, General $general, array $city, array $defenderCityGeneralList)
 {
+    /** @var General[] $defenderCityGeneralList */
     $db = DB::db();
 
     $year = $admin['year'];
@@ -585,6 +586,21 @@ function ConquerCity(array $admin, General $general, array $city)
     if(TurnExecutionHelper::runEventHandler($db, $gameStor, EventTarget::OccupyCity)){
         $gameStor->cacheAll();
     }
+    $rng = new RandUtil(new LiteHashDRBG(Util::simpleSerialize(
+        UniqueConst::$hiddenSeed,
+        'ConquerCity',
+        $year,
+        $month,
+        $attackerNationID,
+        $attackerID,
+        $cityID
+    )));
+    foreach($defenderCityGeneralList as $defenderCityGeneral){
+        $defenderCityGeneral->onArbitraryAction($defenderCityGeneral, $rng, 'ConquerCity', null, [
+            'attacker' => $general
+        ]);
+        $defenderCityGeneral->applyDB($db);
+    }
 
 
     // 국가 멸망시

hwe/sammo/API/InheritAction/CalcResetTurnTimeRange.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace sammo\API\InheritAction;
+
+use DateTimeImmutable;
+use sammo\Session;
+use DateTimeInterface;
+use sammo\DB;
+use sammo\Enums\APIRecoveryType;
+use sammo\Enums\RankColumn;
+use sammo\GameConst;
+use sammo\General;
+use sammo\KVStorage;
+use sammo\LiteHashDRBG;
+use sammo\RandUtil;
+use sammo\TimeUtil;
+use sammo\UniqueConst;
+use sammo\UserLogger;
+use sammo\Util;
+
+class CalcResetTurnTimeRange extends \sammo\BaseAPI
+{
+    public function validateArgs(): ?string
+    {
+        return null;
+    }
+
+    public function getRequiredSessionMode(): int
+    {
+        return static::REQ_GAME_LOGIN | static::REQ_READ_ONLY;
+    }
+
+    public function launch(Session $session, ?DateTimeInterface $modifiedSince, ?string $reqEtag): null | string | array | APIRecoveryType
+    {
+        $userID = $session->userID;
+        $generalID = $session->generalID;
+
+        $general = General::createObjFromDB($generalID);
+        if ($userID != $general->getVar('owner')) {
+            return '로그인 상태가 이상합니다. 다시 로그인해 주세요.';
+        }
+
+        $db = DB::db();
+
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        [$turnTerm, $serverTurnTime] = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
+
+        $currTurnTime = new DateTimeImmutable($general->getTurnTime());
+        $serverTurnTimeObj = new DateTimeImmutable($serverTurnTime);
+
+        $minTurnTime = $currTurnTime->add(TimeUtil::secondsToDateInterval($turnTerm * -30));
+        $maxTurnTime = $currTurnTime->add(TimeUtil::secondsToDateInterval($turnTerm * 30));
+
+        $timeDiff = $serverTurnTimeObj->diff($minTurnTime);
+        $timeDiffSec = TimeUtil::DateIntervalToSeconds($timeDiff);
+        if($timeDiffSec > 0){
+            $minTurnTime = $minTurnTime->add(TimeUtil::secondsToDateInterval($timeDiffSec));
+            $maxTurnTime = $maxTurnTime->add(TimeUtil::secondsToDateInterval($timeDiffSec));
+        }
+
+        return [
+            'result' => true,
+            'timeDiffSec' => $timeDiffSec,
+            'minTurnTime' => TimeUtil::format($minTurnTime, false),
+            'maxTurnTime' => TimeUtil::format($maxTurnTime, false),
+        ];
+    }
+}

hwe/sammo/ActionItem/che_무기_02_단궁.php

@@ -21,7 +21,7 @@ class che_무기_02_단궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 102, 0.01, 10, 30),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 102)
         );
     }
 }

hwe/sammo/ActionItem/che_무기_07_맥궁.php

@@ -20,7 +20,7 @@ class che_무기_07_맥궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 107, 0.2, 20, 40),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 107)
         );
     }
 }

hwe/sammo/ActionItem/che_무기_09_동호비궁.php

@@ -20,7 +20,7 @@ class che_무기_09_동호비궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 109, 0.2, 20, 40, 20),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 109)
         );
     }
 }

hwe/sammo/ActionItem/che_무기_11_이광궁.php

@@ -20,7 +20,7 @@ class che_무기_11_이광궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 111, 0.10, 20, 40, 10),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 111)
         );
     }
 }

hwe/sammo/ActionItem/che_무기_13_양유기궁.php

@@ -20,7 +20,7 @@ class che_무기_13_양유기궁 extends \sammo\BaseStatItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 113, 0.1, 20, 40, 10),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM + che_저격시도::TYPE_DEDUP_TYPE_BASE * 113)
         );
     }
 }

hwe/sammo/ActionItem/che_저격_매화수전.php

@@ -21,7 +21,7 @@ class che_저격_매화수전 extends \sammo\BaseItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*304, 0.5, 20, 40),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*304)
         );
     }
 }

hwe/sammo/ActionItem/che_저격_비도.php

@@ -21,7 +21,7 @@ class che_저격_비도 extends \sammo\BaseItem{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*305, 0.5, 20, 40),
-            new che_저격발동($unit, che_저격발동::TYPE_ITEM)
+            new che_저격발동($unit, che_저격시도::TYPE_ITEM+BaseWarUnitTrigger::TYPE_DEDUP_TYPE_BASE*305)
         );
     }
 }

hwe/sammo/ActionSpecialDomestic/che_event_저격.php

@@ -25,7 +25,7 @@ class che_event_저격 extends \sammo\BaseSpecial{
     public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
         return new WarUnitTriggerCaller(
             new che_저격시도($unit, che_저격시도::TYPE_NONE, 0.5, 20, 40),
-            new che_저격발동($unit)
+            new che_저격발동($unit, che_저격시도::TYPE_NONE)
         );
     }
 }

hwe/sammo/Auction.php

@@ -267,7 +267,7 @@ abstract class Auction
     if ($isRollback) {
       $highestBid = $this->getHighestBid();
       if ($highestBid !== null) {
-        $this->refundBid($highestBid, "{$this->info->id}번 {$this->info->detail->title} 경매가 취소되었습니다.");
+        $this->refundBid($highestBid, "{$this->info->id}번 {$this->info->detail->title}가 취소되었습니다.");
       }
       $this->rollbackAuction();
     }

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

@@ -169,7 +169,7 @@ class che_등용수락 extends Command\GeneralCommand{
         $logger->pushGeneralActionLog("<D>{$destNationName}</>{$josaRo} 망명하여 수도로 이동합니다.");
         $destLogger->pushGeneralActionLog("<Y>{$generalName}</> 등용에 성공했습니다.");
 
-        $logger->pushGeneralHistoryLog("<D>{$destNationName}</>{$josaRo} 망명");
+        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>{$josaRo} 망명");
         $destLogger->pushGeneralHistoryLog("<Y>{$generalName}</> 등용에 성공");
 
         $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <D><b>{$destNationName}</b></>{$josaRo} <S>망명</>하였습니다.");
@@ -212,4 +212,4 @@ class che_등용수락 extends Command\GeneralCommand{
 
         return true;
     }
-}
+}

hwe/sammo/Command/Nation/che_급습.php

@@ -182,6 +182,7 @@ class che_급습 extends Command\NationCommand
         $destNationLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>의 <Y>{$generalName}</>{$josaYi} 아국에 <M>{$commandName}</>{$josaUl} 발동");
         $destNationLogger->flush();
 
+        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>에 <M>{$commandName}</>{$josaUl} 발동");
         $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <D><b>{$destNationName}</b></>에 <M>{$commandName}</>{$josaUl} 발동");
 
         $db->update('nation', [

hwe/sammo/Command/Nation/che_백성동원.php

@@ -156,7 +156,7 @@ class che_백성동원 extends Command\NationCommand
             'wall' => $db->sqleval('GREATEST(wall_max * 0.8, wall)'),
         ], 'city=%i', $destCityID);
 
-        $logger->pushGeneralHistoryLog('<M>백성동원</>을 발동');
+        $logger->pushGeneralHistoryLog("<G><b>{$destCityName}</b></>에 <M>백성동원</>을 발동");
         $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <G><b>{$destCityName}</b></>에 <M>백성동원</>을 발동");
 
         $db->update('nation', [

hwe/sammo/Command/Nation/che_불가침제의.php

@@ -117,6 +117,7 @@ class che_불가침제의 extends Command\NationCommand
             ConstraintHelper::BeChief(),
             ConstraintHelper::NotBeNeutral(),
             ConstraintHelper::ExistsDestNation(),
+            ConstraintHelper::DifferentDestNation(),
             ConstraintHelper::DisallowDiplomacyBetweenStatus([
                 0 => '아국과 이미 교전중입니다.',
                 1 => '아국과 이미 선포중입니다.',

hwe/sammo/Command/Nation/che_선전포고.php

@@ -146,6 +146,7 @@ class che_선전포고 extends Command\NationCommand
         $destLogger = new ActionLogger(0, $destNationID, $env['year'], $env['month']);
 
         $logger->pushGeneralActionLog("<D><b>{$destNationName}</b></>에 선전 포고 했습니다.<1>$date</>");
+        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>에 선전 포고");
         $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <D><b>{$destNationName}</b></>에 선전 포고");
         $destLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>의 <Y>{$generalName}</>{$josaYi} 아국에 선전 포고");
 

hwe/sammo/Command/Nation/che_이호경식.php

@@ -179,6 +179,7 @@ class che_이호경식 extends Command\NationCommand
         $destNationLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>의 <Y>{$generalName}</>{$josaYi} 아국에 <M>{$commandName}</>{$josaUl} 발동");
         $destNationLogger->flush();
 
+        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>에 <M>{$commandName}</>{$josaUl} 발동");
         $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <D><b>{$destNationName}</b></>에 <M>{$commandName}</>{$josaUl} 발동");
 
         $db->update('nation', [

hwe/sammo/Command/Nation/che_피장파장.php

@@ -228,6 +228,7 @@ class che_피장파장 extends Command\NationCommand
         $destNationLogger->pushNationalHistoryLog("<D><b>{$nationName}</b></>의 <Y>{$generalName}</>{$josaYi} 아국에 <G><b>{$cmd->getName()}</b></> <M>{$commandName}</>{$josaUl} 발동");
         $destNationLogger->flush();
 
+        $logger->pushGeneralHistoryLog("<D><b>{$destNationName}</b></>에 <G><b>{$cmd->getName()}</b></> <M>{$commandName}</>{$josaUl} 발동");
         $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <D><b>{$destNationName}</b></>에 <G><b>{$cmd->getName()}</b></> <M>{$commandName}</>{$josaUl} 발동");
 
         $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');

hwe/sammo/GeneralAI.php

@@ -2709,7 +2709,7 @@ class GeneralAI
         $city = $this->city;
         $nation = $this->nation;
 
-        if (($nation['rice'] < GameConst::$baserice) && $this->rng->nextBool(0.7)) {
+        if (($nation['rice'] < GameConst::$baserice) && $general->getNPCType() >= 2 && $this->rng->nextBool(0.7)) {
             return null;
         }
 

hwe/scenario/scenario_2141.json

@@ -0,0 +1,773 @@
+{
+    "title":"【가상모드14-b】 걸그룹대전(비급)",
+    "startYear": 180,
+    "life":1,
+    "fiction":1,
+    "nation":[
+    ],
+    "diplomacy":[
+    ],
+    "const": {
+        "availableSpecialWar": [
+            "che_귀병",
+            "che_신산",
+            "che_환술",
+            "che_집중",
+            "che_신중",
+            "che_반계",
+            "che_보병",
+            "che_궁병",
+            "che_기병",
+            "che_공성",
+            "che_돌격",
+            "che_무쌍",
+            "che_견고",
+            "che_위압",
+            "che_저격",
+            "che_필살",
+            "che_징병",
+            "che_의술",
+            "che_격노",
+            "che_척사"
+        ],
+        "allItems": {
+            "horse": {
+                "che_명마_01_노기": 0,
+                "che_명마_02_조랑": 0,
+                "che_명마_03_노새": 0,
+                "che_명마_04_나귀": 0,
+                "che_명마_05_갈색마": 0,
+                "che_명마_06_흑색마": 0,
+                "che_명마_07_백마": 2,
+                "che_명마_07_기주마": 2,
+                "che_명마_07_오환마": 2,
+                "che_명마_07_백상": 2,
+                "che_명마_08_양주마": 2,
+                "che_명마_08_흉노마": 2,
+                "che_명마_09_과하마": 2,
+                "che_명마_09_의남백마": 2,
+                "che_명마_10_대완마": 2,
+                "che_명마_10_옥추마": 2,
+                "che_명마_11_서량마": 2,
+                "che_명마_11_화종마": 2,
+                "che_명마_12_사륜거": 2,
+                "che_명마_12_옥란백용구": 2,
+                "che_명마_13_절영": 2,
+                "che_명마_13_적로": 2,
+                "che_명마_14_적란마": 2,
+                "che_명마_14_조황비전": 2,
+                "che_명마_15_한혈마": 2,
+                "che_명마_15_적토마": 2
+            },
+            "weapon": {
+                "che_무기_01_단도": 0,
+                "che_무기_02_단궁": 0,
+                "che_무기_03_단극": 0,
+                "che_무기_04_목검": 0,
+                "che_무기_05_죽창": 0,
+                "che_무기_06_소부": 0,
+                "che_무기_07_동추": 2,
+                "che_무기_07_철편": 2,
+                "che_무기_07_철쇄": 2,
+                "che_무기_07_맥궁": 2,
+                "che_무기_08_유성추": 2,
+                "che_무기_08_철질여골": 2,
+                "che_무기_09_쌍철극": 2,
+                "che_무기_09_동호비궁": 2,
+                "che_무기_10_삼첨도": 2,
+                "che_무기_10_대부": 2,
+                "che_무기_11_고정도": 2,
+                "che_무기_11_이광궁": 2,
+                "che_무기_12_철척사모": 2,
+                "che_무기_12_칠성검": 2,
+                "che_무기_13_사모": 2,
+                "che_무기_13_양유기궁": 2,
+                "che_무기_14_언월도": 2,
+                "che_무기_14_방천화극": 2,
+                "che_무기_15_청홍검": 2,
+                "che_무기_15_의천검": 2
+            },
+            "book": {
+                "che_서적_01_효경전": 0,
+                "che_서적_02_회남자": 0,
+                "che_서적_03_변도론": 0,
+                "che_서적_04_건상역주": 0,
+                "che_서적_05_여씨춘추": 0,
+                "che_서적_06_사민월령": 0,
+                "che_서적_07_위료자": 2,
+                "che_서적_07_사마법": 2,
+                "che_서적_07_한서": 2,
+                "che_서적_07_논어": 2,
+                "che_서적_08_전론": 2,
+                "che_서적_08_사기": 2,
+                "che_서적_09_장자": 2,
+                "che_서적_09_역경": 2,
+                "che_서적_10_시경": 2,
+                "che_서적_10_구국론": 2,
+                "che_서적_11_상군서": 2,
+                "che_서적_11_춘추전": 2,
+                "che_서적_12_산해경": 2,
+                "che_서적_12_맹덕신서": 2,
+                "che_서적_13_관자": 2,
+                "che_서적_13_병법24편": 2,
+                "che_서적_14_한비자": 2,
+                "che_서적_14_오자병법": 2,
+                "che_서적_15_노자": 2,
+                "che_서적_15_손자병법": 2
+            },
+            "item": {
+                "che_치료_환약": 0,
+                "che_저격_수극": 0,
+                "che_사기_탁주": 0,
+                "che_훈련_청주": 0,
+                "che_계략_이추": 0,
+                "che_계략_향낭": 0,
+                "event_전투특기_격노": 0,
+                "event_전투특기_견고": 0,
+                "event_전투특기_공성": 0,
+                "event_전투특기_궁병": 0,
+                "event_전투특기_귀병": 0,
+                "event_전투특기_기병": 0,
+                "event_전투특기_돌격": 0,
+                "event_전투특기_무쌍": 0,
+                "event_전투특기_반계": 0,
+                "event_전투특기_보병": 0,
+                "event_전투특기_신산": 0,
+                "event_전투특기_신중": 0,
+                "event_전투특기_위압": 0,
+                "event_전투특기_의술": 0,
+                "event_전투특기_저격": 0,
+                "event_전투특기_집중": 0,
+                "event_전투특기_징병": 0,
+                "event_전투특기_척사": 0,
+                "event_전투특기_필살": 0,
+                "event_전투특기_환술": 0
+            }
+        }
+    },
+    "iconPath": "걸그룹",
+    "stat":{
+        "total": 310,
+        "min": 40,
+        "max": 140,
+        "npcTotal":210,
+        "npcMax":95,
+        "npcMin":40
+    },
+    "general":[
+        [0, "아이유", null, 0, null, 90, 56, 100, 0, 160, 250, "의협", "집중"],
+        [0, "걸스데이 민아", null, 0, null, 96, 58, 95, 0, 160, 250, "대의", "환술"],
+        [0, "손나은", null, 0, null, 92, 55, 92, 0, 160, 250, "안전", "귀병"],
+        [0, "윤아", null, 0, null, 94, 94, 59, 0, 160, 250, "출세", "위압"],
+        [0, "걸스데이 소진", null, 0, null, 86, 94, 60, 0, 160, 250, "할거", "무쌍"],
+        [0, "수지", null, 0, null, 100, 58, 91, 0, 160, 250, "정복", "신중"],
+        [0, "정예인", null, 0, null, 90, 90, 59, 0, 160, 250, "패권", "위압"],
+        [0, "혜리", null, 0, null, 90, 58, 90, 0, 160, 250, "유지", "환술"],
+        [0, "은하", null, 0, null, 91, 60, 90, 0, 160, 250, "안전", "환술"],
+        [0, "슈", null, 0, null, 92, 54, 80, 0, 160, 250, "패권", "신중"],
+        [0, "소원", null, 0, null, 90, 88, 55, 0, 160, 250, "왕좌", "필살"],
+        [0, "보아", null, 0, null, 95, 99, 96, 0, 160, 250, "왕좌", "위압"],
+        [0, "김세정", null, 0, null, 100, 70, 100, 0, 160, 250, "의협", "집중"],
+        [0, "권나라", null, 0, null, 98, 97, 65, 0, 160, 250, "대의", "무쌍"],
+        [0, "서지수", null, 0, null, 90, 89, 63, 0, 160, 250, "할거", "필살"],
+        [0, "양파", null, 0, null, 85, 54, 92, 0, 160, 250, "대의", "환술"],
+        [0, "앨리스", null, 0, null, 90, 90, 61, 0, 160, 250, "유지", "위압"],
+        [0, "장원영", null, 0, null, 97, 94, 53, 0, 160, 250, "출세", "무쌍"],
+        [0, "안유진", null, 0, null, 91, 92, 61, 0, 160, 250, "출세", "위압"],
+        [0, "조유리", null, 0, null, 91, 54, 93, 0, 160, 250, "정복", "집중"],
+        [0, "경리", null, 0, null, 90, 92, 54, 0, 160, 250, null, null],
+        [0, "유아", null, 0, null, 93, 58, 92, 0, 160, 250, "출세", "집중"],
+        [0, "이나경", null, 0, null, 94, 63, 91, 0, 160, 250, null, null],
+        [0, "효린", null, 0, null, 40, 51, 93, 0, 160, 250, null, null],
+        [0, "씨스타 보라", null, 0, null, 82, 81, 58, 0, 160, 250, null, null],
+        [0, "소유", null, 0, null, 70, 87, 61, 0, 160, 250, null, null],
+        [0, "다솜", null, 0, null, 82, 42, 63, 0, 160, 250, null, null],
+        [0, "지연", null, 0, null, 90, 61, 83, 0, 160, 250, null, null],
+        [0, "효민", null, 0, null, 83, 58, 77, 0, 160, 250, null, null],
+        [0, "은정", null, 0, null, 70, 50, 72, 0, 160, 250, null, null],
+        [0, "큐리", null, 0, null, 70, 51, 73, 0, 160, 250, null, null],
+        [0, "보람", null, 0, null, 72, 48, 68, 0, 160, 250, null, null],
+        [0, "티아라 소연", null, 0, null, 71, 50, 80, 0, 160, 250, null, null],
+        [0, "라임", null, 0, null, 81, 54, 86, 0, 160, 250, null, null],
+        [0, "유영", null, 0, null, 70, 43, 64, 0, 160, 250, null, null],
+        [0, "서영", null, 0, null, 65, 57, 82, 0, 160, 250, null, null],
+        [0, "헬로비너스 여름", null, 0, null, 63, 52, 79, 0, 160, 250, null, null],
+        [0, "남지현", null, 0, null, 80, 53, 74, 0, 160, 250, null, null],
+        [0, "허가윤", null, 0, null, 70, 52, 82, 0, 160, 250, null, null],
+        [0, "전지윤", null, 0, null, 69, 74, 53, 0, 160, 250, null, null],
+        [0, "김현아", null, 0, null, 92, 92, 72, 0, 160, 250, null, null],
+        [0, "권소현", null, 0, null, 75, 55, 76, 0, 160, 250, null, null],
+        [0, "이해리", null, 0, null, 61, 40, 96, 0, 160, 250, null, null],
+        [0, "강민경", null, 0, null, 88, 48, 89, 0, 160, 250, null, null],
+        [0, "비키", null, 0, null, 73, 64, 23, 0, 160, 250, null, null],
+        [0, "김진", null, 0, null, 51, 73, 46, 0, 160, 250, null, null],
+        [0, "이민경", null, 0, null, 56, 53, 70, 0, 160, 250, null, null],
+        [0, "한나", null, 0, null, 40, 43, 41, 0, 160, 250, null, null],
+        [0, "김한별", null, 0, null, 60, 37, 60, 0, 160, 250, null, null],
+        [0, "김한샘", null, 0, null, 31, 41, 40, 0, 160, 250, null, null],
+        [0, "블랙핑크 지수", null, 0, null, 90, 61, 90, 0, 160, 250, null, null],
+        [0, "블랙핑크 제니", null, 0, null, 92, 68, 91, 0, 160, 250, null, null],
+        [0, "로제", null, 0, null, 88, 60, 93, 0, 160, 250, null, null],
+        [0, "리사", null, 0, null, 89, 91, 63, 0, 160, 250, null, null],
+        [0, "소나무 수민", null, 0, null, 66, 42, 72, 0, 160, 250, null, null],
+        [0, "소나무 민재", null, 0, null, 60, 33, 80, 0, 160, 250, null, null],
+        [0, "디애나", null, 0, null, 68, 73, 41, 0, 160, 250, null, null],
+        [0, "나현", null, 0, null, 71, 79, 47, 0, 160, 250, null, null],
+        [0, "의진", null, 0, null, 76, 80, 51, 0, 160, 250, null, null],
+        [0, "하이디", null, 0, null, 71, 50, 80, 0, 160, 250, null, null],
+        [0, "뉴썬", null, 0, null, 60, 61, 39, 0, 160, 250, null, null],
+        [0, "유라", null, 0, null, 80, 41, 70, 0, 160, 250, null, null],
+        [0, "지민", null, 0, null, 18, 18, 18, 0, 160, 250, null, null],
+        [0, "AOA 유나", null, 0, null, 74, 44, 68, 0, 160, 250, null, null],
+        [0, "혜정", null, 0, null, 74, 47, 65, 0, 160, 250, null, null],
+        [0, "AOA 민아", null, 0, null, 75, 41, 60, 0, 160, 250, null, null],
+        [0, "설현", null, 0, null, 85, 79, 53, 0, 160, 250, null, null],
+        [0, "찬미", null, 0, null, 68, 42, 60, 0, 160, 250, null, null],
+        [0, "AOA 초아", null, 0, null, 87, 54, 88, 0, 160, 250, null, null],
+        [0, "솔빈", null, 0, null, 80, 56, 82, 0, 160, 250, null, null],
+        [0, "해인", null, 0, null, 67, 43, 60, 0, 160, 250, null, null],
+        [0, "라붐 유정", null, 0, null, 66, 51, 71, 0, 160, 250, null, null],
+        [0, "라붐 소연", null, 0, null, 80, 58, 70, 0, 160, 250, null, null],
+        [0, "지엔", null, 0, null, 61, 60, 42, 0, 160, 250, null, null],
+        [0, "율희", null, 0, null, 60, 54, 33, 0, 160, 250, null, null],
+        [0, "효정", null, 0, null, 81, 81, 56, 0, 160, 250, null, null],
+        [0, "오마이걸 미미", null, 0, null, 59, 83, 58, 0, 160, 250, null, null],
+        [0, "승희", null, 0, null, 73, 60, 84, 0, 160, 250, null, null],
+        [0, "지호", null, 0, null, 69, 67, 42, 0, 160, 250, null, null],
+        [0, "비니", null, 0, null, 89, 93, 51, 0, 160, 250, null, null],
+        [0, "아린", null, 0, null, 76, 81, 53, 0, 160, 250, null, null],
+        [0, "박초롱", null, 0, null, 75, 52, 31, 0, 160, 250, null, null],
+        [0, "윤보미", null, 0, null, 80, 61, 42, 0, 160, 250, null, null],
+        [0, "정은지", null, 0, null, 78, 52, 89, 0, 160, 250, null, null],
+        [0, "김남주", null, 0, null, 69, 51, 68, 0, 160, 250, null, null],
+        [0, "오하영", null, 0, null, 78, 50, 66, 0, 160, 250, null, null],
+        [0, "김재경", null, 0, null, 82, 71, 48, 0, 160, 250, null, null],
+        [0, "고나은", null, 0, null, 75, 62, 40, 0, 160, 250, null, null],
+        [0, "지숙", null, 0, null, 77, 47, 70, 0, 160, 250, null, null],
+        [0, "노을", null, 0, null, 73, 50, 33, 0, 160, 250, null, null],
+        [0, "오승아", null, 0, null, 78, 46, 66, 0, 160, 250, null, null],
+        [0, "정윤혜", null, 0, null, 75, 49, 60, 0, 160, 250, null, null],
+        [0, "조현영", null, 0, null, 79, 62, 43, 0, 160, 250, null, null],
+        [0, "나인뮤지스 혜미", null, 0, null, 72, 67, 40, 0, 160, 250, null, null],
+        [0, "나인뮤지스 소진", null, 0, null, 73, 64, 49, 0, 160, 250, null, null],
+        [0, "금조", null, 0, null, 70, 60, 34, 0, 160, 250, null, null],
+        [0, "손성아", null, 0, null, 69, 63, 40, 0, 160, 250, null, null],
+        [0, "박민하", null, 0, null, 97, 83, 43, 0, 160, 250, null, null],
+        [0, "웬디", null, 0, null, 84, 60, 95, 0, 160, 250, null, null],
+        [0, "아이린", null, 0, null, 90, 65, 40, 0, 160, 250, null, null],
+        [0, "슬기", null, 0, null, 93, 94, 63, 0, 160, 250, null, null],
+        [0, "조이", null, 0, null, 90, 84, 54, 0, 160, 250, null, null],
+        [0, "예리", null, 0, null, 86, 77, 57, 0, 160, 250, null, null],
+        [0, "솔라", null, 0, null, 83, 52, 90, 0, 160, 250, null, null],
+        [0, "문별", null, 0, null, 70, 53, 83, 0, 160, 250, null, null],
+        [0, "휘인", null, 0, null, 68, 51, 84, 0, 160, 250, null, null],
+        [0, "화사", null, 0, null, 51, 58, 83, 0, 160, 250, null, null],
+        [0, "나연", null, 0, null, 84, 53, 81, 0, 160, 250, null, null],
+        [0, "정연", null, 0, null, 83, 66, 48, 0, 160, 250, null, null],
+        [0, "모모", null, 0, null, 85, 91, 51, 0, 160, 250, null, null],
+        [0, "사나", null, 0, null, 94, 88, 54, 0, 160, 250, null, null],
+        [0, "지효", null, 0, null, 78, 53, 88, 0, 160, 250, null, null],
+        [0, "트와이스 미나", null, 0, null, 83, 96, 56, 0, 160, 250, null, null],
+        [0, "다현", null, 0, null, 82, 46, 78, 0, 160, 250, null, null],
+        [0, "채영", null, 0, null, 73, 79, 47, 0, 160, 250, null, null],
+        [0, "쯔위", null, 0, null, 99, 72, 41, 0, 160, 250, null, null],
+        [0, "제아", null, 0, null, 68, 47, 92, 0, 160, 250, null, null],
+        [0, "나르샤", null, 0, null, 63, 51, 84, 0, 160, 250, null, null],
+        [0, "미료", null, 0, null, 57, 47, 88, 0, 160, 250, null, null],
+        [0, "가인", null, 0, null, 80, 81, 80, 0, 160, 250, null, null],
+        [0, "하나", null, 0, null, 66, 62, 34, 0, 160, 250, null, null],
+        [0, "구구단 미미", null, 0, null, 69, 60, 33, 0, 160, 250, null, null],
+        [0, "김나영", null, 0, null, 90, 52, 88, 0, 160, 250, null, null],
+        [0, "해빈", null, 0, null, 70, 40, 86, 0, 160, 250, null, null],
+        [0, "소이", null, 0, null, 66, 63, 44, 0, 160, 250, null, null],
+        [0, "샐리", null, 0, null, 68, 66, 47, 0, 160, 250, null, null],
+        [0, "구구단 미나", null, 0, null, 83, 76, 43, 0, 160, 250, null, null],
+        [0, "구구단 혜연", null, 0, null, 63, 44, 66, 0, 160, 250, null, null],
+        [0, "최유정", null, 0, null, 70, 83, 47, 0, 160, 250, null, null],
+        [0, "김도연", null, 0, null, 81, 81, 48, 0, 160, 250, null, null],
+        [0, "지수연", null, 0, null, 64, 42, 74, 0, 160, 250, null, null],
+        [0, "엘리", null, 0, null, 64, 60, 43, 0, 160, 250, null, null],
+        [0, "세이", null, 0, null, 61, 61, 36, 0, 160, 250, null, null],
+        [0, "루아", null, 0, null, 53, 48, 64, 0, 160, 250, null, null],
+        [0, "리나", null, 0, null, 57, 40, 61, 0, 160, 250, null, null],
+        [0, "루시", null, 0, null, 83, 48, 64, 0, 160, 250, null, null],
+        [0, "이효리", null, 0, null, 94, 93, 63, 0, 160, 250, null, null],
+        [0, "성유리", null, 0, null, 92, 53, 23, 0, 160, 250, null, null],
+        [0, "이진", null, 0, null, 64, 54, 32, 0, 160, 250, null, null],
+        [0, "옥주현", null, 0, null, 62, 51, 96, 0, 160, 250, null, null],
+        [0, "유진", null, 0, null, 98, 53, 76, 0, 160, 250, null, null],
+        [0, "바다", null, 0, null, 58, 56, 98, 0, 160, 250, null, null],
+        [0, "설아", null, 0, null, 70, 41, 64, 0, 160, 250, null, null],
+        [0, "엑시", null, 0, null, 73, 81, 40, 0, 160, 250, null, null],
+        [0, "보나", null, 0, null, 76, 68, 40, 0, 160, 250, null, null],
+        [0, "성소", null, 0, null, 60, 34, 13, 0, 160, 250, null, null],
+        [0, "은서", null, 0, null, 68, 43, 60, 0, 160, 250, null, null],
+        [0, "다영", null, 0, null, 71, 60, 32, 0, 160, 250, null, null],
+        [0, "다원", null, 0, null, 65, 60, 30, 0, 160, 250, null, null],
+        [0, "우주소녀 수빈", null, 0, null, 66, 61, 31, 0, 160, 250, null, null],
+        [0, "선의", null, 0, null, 70, 62, 39, 0, 160, 250, null, null],
+        [0, "우주소녀 여름", null, 0, null, 58, 60, 40, 0, 160, 250, null, null],
+        [0, "미기", null, 0, null, 63, 63, 41, 0, 160, 250, null, null],
+        [0, "루다", null, 0, null, 81, 67, 44, 0, 160, 250, null, null],
+        [0, "연정", null, 0, null, 68, 42, 83, 0, 160, 250, null, null],
+        [0, "윤채경", null, 0, null, 80, 64, 40, 0, 160, 250, null, null],
+        [0, "에이프릴 김채원", null, 0, null, 67, 60, 43, 0, 160, 250, null, null],
+        [0, "양예나", null, 0, null, 70, 41, 68, 0, 160, 250, null, null],
+        [0, "레이첼", null, 0, null, 88, 92, 52, 0, 160, 250, null, null],
+        [0, "이진솔", null, 0, null, 69, 46, 70, 0, 160, 250, null, null],
+        [0, "박규리", null, 0, null, 80, 56, 83, 0, 160, 250, null, null],
+        [0, "한승연", null, 0, null, 77, 73, 49, 0, 160, 250, null, null],
+        [0, "허영지", null, 0, null, 70, 66, 46, 0, 160, 250, null, null],
+        [0, "니콜", null, 0, null, 69, 74, 43, 0, 160, 250, null, null],
+        [0, "강지영", null, 0, null, 63, 63, 32, 0, 160, 250, null, null],
+        [0, "레이나", null, 0, null, 76, 46, 84, 0, 160, 250, null, null],
+        [0, "나나", null, 0, null, 90, 82, 44, 0, 160, 250, null, null],
+        [0, "이영", null, 0, null, 69, 61, 47, 0, 160, 250, null, null],
+        [0, "리지", null, 0, null, 68, 62, 43, 0, 160, 250, null, null],
+        [0, "가은", null, 0, null, 60, 59, 33, 0, 160, 250, null, null],
+        [0, "가희", null, 0, null, 67, 98, 52, 0, 160, 250, null, null],
+        [0, "전효성", null, 0, null, 78, 77, 44, 0, 160, 250, null, null],
+        [0, "송지은", null, 0, null, 80, 48, 77, 0, 160, 250, null, null],
+        [0, "정하나", null, 0, null, 68, 53, 70, 0, 160, 250, null, null],
+        [0, "한선화", null, 0, null, 79, 52, 71, 0, 160, 250, null, null],
+        [0, "베이비소울", null, 0, null, 71, 50, 70, 0, 160, 250, null, null],
+        [0, "유지애", null, 0, null, 70, 52, 71, 0, 160, 250, null, null],
+        [0, "이미주", null, 0, null, 86, 77, 46, 0, 160, 250, null, null],
+        [0, "KEI", null, 0, null, 87, 50, 79, 0, 160, 250, null, null],
+        [0, "JIN", null, 0, null, 68, 53, 82, 0, 160, 250, null, null],
+        [0, "류수정", null, 0, null, 69, 52, 72, 0, 160, 250, null, null],
+        [0, "태연", null, 0, null, 87, 54, 94, 0, 160, 250, null, null],
+        [0, "써니", null, 0, null, 79, 58, 78, 0, 160, 250, null, null],
+        [0, "티파니", null, 0, null, 84, 56, 81, 0, 160, 250, null, null],
+        [0, "효연", null, 0, null, 40, 99, 42, 0, 160, 250, null, null],
+        [0, "유리", null, 0, null, 82, 84, 57, 0, 160, 250, null, null],
+        [0, "수영", null, 0, null, 69, 68, 73, 0, 160, 250, null, null],
+        [0, "서현", null, 0, null, 77, 54, 81, 0, 160, 250, null, null],
+        [0, "제시카", null, 0, null, 71, 47, 76, 0, 160, 250, null, null],
+        [0, "LE", null, 0, null, 63, 53, 80, 0, 160, 250, null, null],
+        [0, "정화", null, 0, null, 80, 71, 41, 0, 160, 250, null, null],
+        [0, "하니", null, 0, null, 87, 83, 59, 0, 160, 250, null, null],
+        [0, "솔지", null, 0, null, 76, 53, 93, 0, 160, 250, null, null],
+        [0, "혜린", null, 0, null, 86, 50, 86, 0, 160, 250, null, null],
+        [0, "유니스", null, 0, null, 75, 58, 73, 0, 160, 250, null, null],
+        [0, "기희현", null, 0, null, 86, 46, 70, 0, 160, 250, null, null],
+        [0, "다이아 제니", null, 0, null, 71, 66, 48, 0, 160, 250, null, null],
+        [0, "정채연", null, 0, null, 79, 63, 46, 0, 160, 250, null, null],
+        [0, "은진", null, 0, null, 66, 67, 43, 0, 160, 250, null, null],
+        [0, "예빈", null, 0, null, 68, 65, 47, 0, 160, 250, null, null],
+        [0, "은채", null, 0, null, 61, 48, 60, 0, 160, 250, null, null],
+        [0, "주은", null, 0, null, 70, 49, 65, 0, 160, 250, null, null],
+        [0, "솜이", null, 0, null, 70, 46, 61, 0, 160, 250, null, null],
+        [0, "예린", null, 0, null, 74, 83, 60, 0, 160, 250, null, null],
+        [0, "유주", null, 0, null, 65, 51, 85, 0, 160, 250, null, null],
+        [0, "신비", null, 0, null, 77, 80, 54, 0, 160, 250, null, null],
+        [0, "엄지", null, 0, null, 59, 69, 47, 0, 160, 250, null, null],
+        [0, "세리", null, 0, null, 74, 73, 50, 0, 160, 250, null, null],
+        [0, "아영", null, 0, null, 78, 76, 44, 0, 160, 250, null, null],
+        [0, "우희", null, 0, null, 77, 77, 43, 0, 160, 250, null, null],
+        [0, "달샤벳 수빈", null, 0, null, 79, 74, 47, 0, 160, 250, null, null],
+        [0, "효은", null, 0, null, 72, 71, 49, 0, 160, 250, null, null],
+        [0, "민희", null, 0, null, 69, 73, 46, 0, 160, 250, null, null],
+        [0, "소영", null, 0, null, 64, 70, 45, 0, 160, 250, null, null],
+        [0, "혜빈", null, 0, null, 62, 49, 66, 0, 160, 250, null, null],
+        [0, "연우", null, 0, null, 88, 81, 43, 0, 160, 250, null, null],
+        [0, "제인", null, 0, null, 72, 47, 61, 0, 160, 250, null, null],
+        [0, "모모랜드 태하", null, 0, null, 60, 64, 42, 0, 160, 250, null, null],
+        [0, "나윤", null, 0, null, 62, 61, 33, 0, 160, 250, null, null],
+        [0, "데이지", null, 0, null, 68, 63, 38, 0, 160, 250, null, null],
+        [0, "아인", null, 0, null, 72, 57, 39, 0, 160, 250, null, null],
+        [0, "주이", null, 0, null, 40, 80, 46, 0, 160, 250, null, null],
+        [0, "낸시", null, 0, null, 91, 84, 47, 0, 160, 250, null, null],
+        [0, "선예", null, 0, null, 83, 51, 82, 0, 160, 250, null, null],
+        [0, "선미", null, 0, null, 85, 86, 50, 0, 160, 250, null, null],
+        [0, "유빈", null, 0, null, 78, 86, 80, 0, 160, 250, null, null],
+        [0, "혜림", null, 0, null, 69, 63, 47, 0, 160, 250, null, null],
+        [0, "예은", null, 0, null, 60, 41, 70, 0, 160, 250, null, null],
+        [0, "빅토리아", null, 0, null, 89, 88, 60, 0, 160, 250, null, null],
+        [0, "크리스탈", null, 0, null, 93, 78, 51, 0, 160, 250, null, null],
+        [0, "엠버", null, 0, null, 65, 59, 74, 0, 160, 250, null, null],
+        [0, "루나", null, 0, null, 76, 52, 94, 0, 160, 250, null, null],
+        [0, "재이", null, 0, null, 80, 70, 50, 0, 160, 250, null, null],
+        [0, "린지", null, 0, null, 69, 48, 71, 0, 160, 250, null, null],
+        [0, "피에스타 예지", null, 0, null, 58, 43, 78, 0, 160, 250, null, null],
+        [0, "피에스타 혜미", null, 0, null, 66, 54, 39, 0, 160, 250, null, null],
+        [0, "차오루", null, 0, null, 78, 73, 47, 0, 160, 250, null, null],
+        [0, "민영", null, 0, null, 80, 62, 88, 0, 160, 250, null, null],
+        [0, "브레이브걸스 유정", null, 0, null, 87, 86, 57, 0, 160, 250, null, null],
+        [0, "브레이브걸스 은지", null, 0, null, 83, 86, 58, 0, 160, 250, null, null],
+        [0, "브레이브걸스 유나", null, 0, null, 84, 84, 56, 0, 160, 250, null, null],
+        [0, "하윤", null, 0, null, 71, 78, 49, 0, 160, 250, null, null],
+        [0, "베리굿 태하", null, 0, null, 78, 75, 48, 0, 160, 250, null, null],
+        [0, "조현", null, 0, null, 79, 78, 42, 0, 160, 250, null, null],
+        [0, "서율", null, 0, null, 68, 63, 32, 0, 160, 250, null, null],
+        [0, "다예", null, 0, null, 70, 62, 34, 0, 160, 250, null, null],
+        [0, "세형", null, 0, null, 72, 70, 39, 0, 160, 250, null, null],
+        [0, "고운", null, 0, null, 77, 71, 38, 0, 160, 250, null, null],
+        [0, "간미연", null, 0, null, 77, 46, 73, 0, 160, 250, null, null],
+        [0, "김이지", null, 0, null, 70, 73, 41, 0, 160, 250, null, null],
+        [0, "윤은혜", null, 0, null, 72, 71, 41, 0, 160, 250, null, null],
+        [0, "심은진", null, 0, null, 75, 78, 40, 0, 160, 250, null, null],
+        [0, "이희진", null, 0, null, 63, 44, 81, 0, 160, 250, null, null],
+        [0, "유지", null, 0, null, 72, 49, 73, 0, 160, 250, null, null],
+        [0, "다혜", null, 0, null, 70, 67, 43, 0, 160, 250, null, null],
+        [0, "베스티 혜연", null, 0, null, 64, 43, 70, 0, 160, 250, null, null],
+        [0, "해령", null, 0, null, 81, 40, 76, 0, 160, 250, null, null],
+        [0, "김보아", null, 0, null, 69, 43, 86, 0, 160, 250, null, null],
+        [0, "박시현", null, 0, null, 73, 42, 66, 0, 160, 250, null, null],
+        [0, "양지원", null, 0, null, 84, 40, 69, 0, 160, 250, null, null],
+        [0, "나래", null, 0, null, 69, 45, 79, 0, 160, 250, null, null],
+        [0, "김보형", null, 0, null, 67, 41, 83, 0, 160, 250, null, null],
+        [0, "주비", null, 0, null, 72, 43, 82, 0, 160, 250, null, null],
+        [0, "미성", null, 0, null, 78, 51, 84, 0, 160, 250, null, null],
+        [0, "코타", null, 0, null, 67, 53, 87, 0, 160, 250, null, null],
+        [0, "금비라", null, 0, null, 63, 45, 87, 0, 160, 250, null, null],
+        [0, "김연지", null, 0, null, 40, 44, 96, 0, 160, 250, null, null],
+        [0, "이보람", null, 0, null, 61, 46, 87, 0, 160, 250, null, null],
+        [0, "남규리", null, 0, null, 87, 45, 72, 0, 160, 250, null, null],
+        [0, "다나", null, 0, null, 70, 50, 76, 0, 160, 250, null, null],
+        [0, "린아", null, 0, null, 86, 78, 42, 0, 160, 250, null, null],
+        [0, "선데이", null, 0, null, 72, 77, 46, 0, 160, 250, null, null],
+        [0, "스테파니", null, 0, null, 76, 94, 42, 0, 160, 250, null, null],
+        [0, "박정아", null, 0, null, 70, 53, 88, 0, 160, 250, null, null],
+        [0, "하주연", null, 0, null, 52, 42, 43, 0, 160, 250, null, null],
+        [0, "박세미", null, 0, null, 60, 39, 57, 0, 160, 250, null, null],
+        [0, "김예원", null, 0, null, 51, 37, 28, 0, 160, 250, null, null],
+        [0, "서인영", null, 0, null, 63, 68, 38, 0, 160, 250, null, null],
+        [0, "차희", null, 0, null, 71, 49, 80, 0, 160, 250, null, null],
+        [0, "멜로디 유민", null, 0, null, 79, 45, 78, 0, 160, 250, null, null],
+        [0, "예인", null, 0, null, 78, 53, 78, 0, 160, 250, null, null],
+        [0, "여은", null, 0, null, 70, 47, 80, 0, 160, 250, null, null],
+        [0, "오승희", null, 0, null, 73, 50, 69, 0, 160, 250, null, null],
+        [0, "최유진", null, 0, null, 76, 43, 67, 0, 160, 250, null, null],
+        [0, "장승연", null, 0, null, 68, 72, 51, 0, 160, 250, null, null],
+        [0, "SORN", null, 0, null, 64, 73, 52, 0, 160, 250, null, null],
+        [0, "장예은", null, 0, null, 70, 76, 46, 0, 160, 250, null, null],
+        [0, "엘키", null, 0, null, 78, 71, 50, 0, 160, 250, null, null],
+        [0, "권은빈", null, 0, null, 76, 73, 48, 0, 160, 250, null, null],
+        [0, "프리스틴 나영", null, 0, null, 73, 75, 50, 0, 160, 250, null, null],
+        [0, "로아", null, 0, null, 68, 71, 41, 0, 160, 250, null, null],
+        [0, "유하", null, 0, null, 70, 68, 35, 0, 160, 250, null, null],
+        [0, "은우", null, 0, null, 72, 67, 43, 0, 160, 250, null, null],
+        [0, "레나", null, 0, null, 73, 46, 73, 0, 160, 250, null, null],
+        [0, "결경", null, 0, null, 78, 66, 39, 0, 160, 250, null, null],
+        [0, "예하나", null, 0, null, 63, 65, 45, 0, 160, 250, null, null],
+        [0, "성연", null, 0, null, 69, 71, 40, 0, 160, 250, null, null],
+        [0, "시연", null, 0, null, 66, 42, 66, 0, 160, 250, null, null],
+        [0, "카일라", null, 0, null, 60, 69, 40, 0, 160, 250, null, null],
+        [0, "지유", null, 0, null, 72, 63, 46, 0, 160, 250, null, null],
+        [0, "라니아 혜미", null, 0, null, 66, 63, 41, 0, 160, 250, null, null],
+        [0, "지은", null, 0, null, 61, 40, 56, 0, 160, 250, null, null],
+        [0, "라니아 유민", null, 0, null, 68, 43, 66, 0, 160, 250, null, null],
+        [0, "따보", null, 0, null, 58, 60, 37, 0, 160, 250, null, null],
+        [0, "제니", null, 0, null, 62, 41, 81, 0, 160, 250, null, null],
+        [0, "건지", null, 0, null, 72, 43, 84, 0, 160, 250, null, null],
+        [0, "서린", null, 0, null, 66, 40, 83, 0, 160, 250, null, null],
+        [0, "나리", null, 0, null, 84, 86, 58, 0, 160, 250, null, null],
+        [0, "지애", null, 0, null, 63, 81, 42, 0, 160, 250, null, null],
+        [0, "우주", null, 0, null, 67, 86, 49, 0, 160, 250, null, null],
+        [0, "와썹 수진", null, 0, null, 64, 80, 43, 0, 160, 250, null, null],
+        [0, "타히티 민재", null, 0, null, 62, 63, 46, 0, 160, 250, null, null],
+        [0, "타히티 미소", null, 0, null, 63, 60, 41, 0, 160, 250, null, null],
+        [0, "타히티 지수", null, 0, null, 61, 37, 67, 0, 160, 250, null, null],
+        [0, "아리", null, 0, null, 72, 69, 44, 0, 160, 250, null, null],
+        [0, "제리", null, 0, null, 66, 41, 68, 0, 160, 250, null, null],
+        [0, "아유미", null, 0, null, 80, 68, 48, 0, 160, 250, null, null],
+        [0, "혜승", null, 0, null, 68, 57, 31, 0, 160, 250, null, null],
+        [0, "하린", null, 0, null, 70, 30, 66, 0, 160, 250, null, null],
+        [0, "황정음", null, 0, null, 79, 45, 72, 0, 160, 250, null, null],
+        [0, "슈가 수진", null, 0, null, 83, 44, 63, 0, 160, 250, null, null],
+        [0, "산다라박", null, 0, null, 80, 66, 44, 0, 160, 250, null, null],
+        [0, "씨엘", null, 0, null, 40, 90, 82, 0, 160, 250, null, null],
+        [0, "박봄", null, 0, null, 55, 40, 73, 0, 160, 250, null, null],
+        [0, "공민지", null, 0, null, 40, 89, 61, 0, 160, 250, null, null],
+        [0, "지아", null, 0, null, 68, 83, 50, 0, 160, 250, null, null],
+        [0, "민", null, 0, null, 62, 82, 53, 0, 160, 250, null, null],
+        [0, "페이", null, 0, null, 74, 87, 64, 0, 160, 250, null, null],
+        [0, "앤씨아", null, 0, null, 74, 52, 70, 0, 160, 250, null, null],
+        [0, "윤하", null, 0, null, 83, 53, 89, 0, 160, 250, null, null],
+        [0, "아이비", null, 0, null, 77, 72, 77, 0, 160, 250, null, null],
+        [0, "코코", null, 0, null, 80, 50, 78, 0, 160, 250, null, null],
+        [0, "소리", null, 0, null, 78, 50, 78, 0, 160, 250, null, null],
+        [0, "벤", null, 0, null, 79, 43, 90, 0, 160, 250, null, null],
+        [0, "김청하", null, 0, null, 73, 94, 62, 0, 160, 250, null, null],
+        [0, "장나라", null, 0, null, 90, 52, 85, 0, 160, 250, null, null],
+        [0, "엘린", null, 0, null, 51, 31, 23, 0, 160, 250, null, null],
+        [0, "소율", null, 0, null, 70, 46, 64, 0, 160, 250, null, null],
+        [0, "금미", null, 0, null, 73, 63, 41, 0, 160, 250, null, null],
+        [0, "크레용팝 초아", null, 0, null, 72, 67, 45, 0, 160, 250, null, null],
+        [0, "웨이", null, 0, null, 70, 45, 60, 0, 160, 250, null, null],
+        [0, "쥬니엘", null, 0, null, 80, 46, 81, 0, 160, 250, null, null],
+        [0, "이민", null, 0, null, 64, 40, 83, 0, 160, 250, null, null],
+        [0, "크리스탈채", null, 0, null, 72, 41, 84, 0, 160, 250, null, null],
+        [0, "윤미래", null, 0, null, 57, 80, 102, 0, 160, 250, null, null],
+        [0, "애니", null, 0, null, 58, 92, 68, 0, 160, 250, null, null],
+        [0, "NS윤지", null, 0, null, 86, 88, 58, 0, 160, 250, null, null],
+        [0, "미연", null, 0, null, 89, 59, 88, 0, 160, 250, null, null],
+        [0, "민니", null, 0, null, 73, 49, 66, 0, 160, 250, null, null],
+        [0, "아이들 수진", null, 0, null, 60, 46, 21, 0, 160, 250, null, null],
+        [0, "전소연", null, 0, null, 68, 68, 96, 0, 160, 250, null, null],
+        [0, "우기", null, 0, null, 67, 70, 46, 0, 160, 250, null, null],
+        [0, "슈화", null, 0, null, 71, 49, 78, 0, 160, 250, null, null],
+        [0, "미야와키 사쿠라", null, 0, null, 88, 82, 44, 0, 160, 250, null, null],
+        [0, "최예나", null, 0, null, 76, 74, 58, 0, 160, 250, null, null],
+        [0, "야부키 나코", null, 0, null, 78, 53, 88, 0, 160, 250, null, null],
+        [0, "권은비", null, 0, null, 83, 77, 50, 0, 160, 250, null, null],
+        [0, "강혜원", null, 0, null, 81, 70, 48, 0, 160, 250, null, null],
+        [0, "혼다 히토미", null, 0, null, 77, 51, 80, 0, 160, 250, null, null],
+        [0, "아이즈원 김채원", null, 0, null, 72, 55, 73, 0, 160, 250, null, null],
+        [0, "김민주", null, 0, null, 84, 56, 74, 0, 160, 250, null, null],
+        [0, "이채연", null, 0, null, 69, 87, 55, 0, 160, 250, null, null],
+        [0, "전소미", null, 0, null, 83, 79, 50, 0, 160, 250, null, null],
+        [0, "희진", null, 0, null, 79, 66, 82, 0, 160, 250, null, null],
+        [0, "현진", null, 0, null, 81, 83, 58, 0, 160, 250, null, null],
+        [0, "하슬", null, 0, null, 71, 54, 84, 0, 160, 250, null, null],
+        [0, "여진", null, 0, null, 68, 79, 61, 0, 160, 250, null, null],
+        [0, "비비", null, 0, null, 74, 55, 70, 0, 160, 250, null, null],
+        [0, "김립", null, 0, null, 68, 81, 53, 0, 160, 250, null, null],
+        [0, "진솔", null, 0, null, 69, 54, 78, 0, 160, 250, null, null],
+        [0, "최리", null, 0, null, 68, 54, 71, 0, 160, 250, null, null],
+        [0, "이브", null, 0, null, 72, 77, 56, 0, 160, 250, null, null],
+        [0, "츄", null, 0, null, 84, 83, 57, 0, 160, 250, null, null],
+        [0, "고원", null, 0, null, 70, 77, 51, 0, 160, 250, null, null],
+        [0, "올리비아 혜", null, 0, null, 88, 57, 87, 0, 160, 250, null, null],
+        [0, "ITZY 예지", null, 0, null, 87, 88, 59, 0, 160, 250, null, null],
+        [0, "리아", null, 0, null, 88, 53, 87, 0, 160, 250, null, null],
+        [0, "류진", null, 0, null, 84, 89, 58, 0, 160, 250, null, null],
+        [0, "채령", null, 0, null, 79, 91, 60, 0, 160, 250, null, null],
+        [0, "ITZY 유나", null, 0, null, 86, 59, 88, 0, 160, 250, null, null],
+        [0, "카리나", null, 0, null, 97, 98, 63, 0, 160, 250, null, null],
+        [0, "윈터", null, 0, null, 96, 66, 94, 0, 160, 250, null, null],
+        [0, "지젤", null, 0, null, 88, 58, 86, 0, 160, 250, null, null],
+        [0, "닝닝", null, 0, null, 89, 62, 87, 0, 160, 250, null, null],
+        [0, "가을", null, 0, null, 83, 86, 58, 0, 160, 250, null, null],
+        [0, "레이", null, 0, null, 81, 52, 81, 0, 160, 250, null, null],
+        [0, "리즈", null, 0, null, 78, 53, 84, 0, 160, 250, null, null],
+        [0, "이서", null, 0, null, 80, 86, 51, 0, 160, 250, null, null],
+        [0, "연희", null, 0, null, 79, 54, 78, 0, 160, 250, null, null],
+        [0, "쥬리", null, 0, null, 81, 60, 77, 0, 160, 250, null, null],
+        [0, "수윤", null, 0, null, 75, 83, 61, 0, 160, 250, null, null],
+        [0, "윤경", null, 0, null, 78, 60, 80, 0, 160, 250, null, null],
+        [0, "소희", null, 0, null, 73, 52, 71, 0, 160, 250, null, null],
+        [0, "안소희", null, 0, null, 87, 63, 41, 0, 160, 250, null, null],
+        [0, "로켓펀치 다현", null, 0, null, 79, 51, 70, 0, 160, 250, null, null],
+        [0, "해윤", null, 0, null, 72, 83, 50, 0, 160, 250, null, null],
+        [0, "체리블렛 유주", null, 0, null, 76, 48, 70, 0, 160, 250, null, null],
+        [0, "레미", null, 0, null, 70, 78, 46, 0, 160, 250, null, null],
+        [0, "채린", null, 0, null, 76, 81, 48, 0, 160, 250, null, null],
+        [0, "메이", null, 0, null, 81, 77, 40, 0, 160, 250, null, null],
+        [0, "체리블렛 보라", null, 0, null, 78, 51, 86, 0, 160, 250, null, null],
+        [0, "지원", null, 0, null, 80, 50, 75, 0, 160, 250, null, null],
+        [0, "상아", null, 0, null, 72, 81, 46, 0, 160, 250, null, null],
+        [0, "초원", null, 0, null, 78, 53, 80, 0, 160, 250, null, null],
+        [0, "LIGHTSUM 나영", null, 0, null, 70, 55, 78, 0, 160, 250, null, null],
+        [0, "히나", null, 0, null, 78, 52, 73, 0, 160, 250, null, null],
+        [0, "주현", null, 0, null, 69, 82, 60, 0, 160, 250, null, null],
+        [0, "LIGHTSUM 유정", null, 0, null, 72, 51, 80, 0, 160, 250, null, null],
+        [0, "휘연", null, 0, null, 68, 68, 50, 0, 160, 250, null, null],
+        [0, "지안", null, 0, null, 65, 48, 65, 0, 160, 250, null, null],
+        [0, "서령", null, 0, null, 70, 50, 76, 0, 160, 250, null, null],
+        [0, "서경", null, 0, null, 70, 77, 48, 0, 160, 250, null, null],
+        [0, "미야", null, 0, null, 72, 52, 73, 0, 160, 250, null, null],
+        [0, "공원소녀 레나", null, 0, null, 68, 50, 77, 0, 160, 250, null, null],
+        [0, "앤", null, 0, null, 73, 48, 70, 0, 160, 250, null, null],
+        [0, "공원소녀 민주", null, 0, null, 72, 49, 66, 0, 160, 250, null, null],
+        [0, "소소", null, 0, null, 70, 76, 50, 0, 160, 250, null, null],
+        [0, "유아이", null, 0, null, 68, 60, 40, 0, 160, 250, null, null],
+        [0, "보니", null, 0, null, 73, 51, 72, 0, 160, 250, null, null],
+        [0, "라라", null, 0, null, 78, 48, 78, 0, 160, 250, null, null],
+        [0, "미소", null, 0, null, 74, 50, 61, 0, 160, 250, null, null],
+        [0, "드림노트 수민", null, 0, null, 77, 73, 49, 0, 160, 250, null, null],
+        [0, "은조", null, 0, null, 76, 72, 50, 0, 160, 250, null, null],
+        [0, "드림캐쳐 지유", null, 0, null, 76, 81, 58, 0, 160, 250, null, null],
+        [0, "수아", null, 0, null, 73, 80, 62, 0, 160, 250, null, null],
+        [0, "드림캐쳐 시연", null, 0, null, 68, 59, 80, 0, 160, 250, null, null],
+        [0, "유현", null, 0, null, 70, 71, 71, 0, 160, 250, null, null],
+        [0, "다미", null, 0, null, 71, 56, 77, 0, 160, 250, null, null],
+        [0, "한동", null, 0, null, 69, 48, 76, 0, 160, 250, null, null],
+        [0, "가현", null, 0, null, 70, 56, 61, 0, 160, 250, null, null],
+        [0, "릴리", null, 0, null, 77, 50, 83, 0, 160, 250, null, null],
+        [0, "해원", null, 0, null, 74, 49, 81, 0, 160, 250, null, null],
+        [0, "설윤", null, 0, null, 98, 65, 92, 0, 160, 250, null, null],
+        [0, "지니", null, 0, null, 94, 93, 57, 0, 160, 250, null, null],
+        [0, "배이", null, 0, null, 80, 77, 58, 0, 160, 250, null, null],
+        [0, "지우", null, 0, null, 82, 83, 55, 0, 160, 250, null, null],
+        [0, "규진", null, 0, null, 81, 84, 52, 0, 160, 250, null, null],
+        [0, "이새롬", null, 0, null, 73, 80, 51, 0, 160, 250, null, null],
+        [0, "송하영", null, 0, null, 68, 84, 70, 0, 160, 250, null, null],
+        [0, "장규리", null, 0, null, 78, 56, 78, 0, 160, 250, null, null],
+        [0, "박지원", null, 0, null, 72, 54, 77, 0, 160, 250, null, null],
+        [0, "노지선", null, 0, null, 72, 63, 52, 0, 160, 250, null, null],
+        [0, "이서연", null, 0, null, 70, 62, 59, 0, 160, 250, null, null],
+        [0, "이채영", null, 0, null, 77, 81, 60, 0, 160, 250, null, null],
+        [0, "백지헌", null, 0, null, 78, 47, 78, 0, 160, 250, null, null],
+        [0, "STAYC 수민", null, 0, null, 75, 53, 70, 0, 160, 250, null, null],
+        [0, "시은", null, 0, null, 73, 50, 77, 0, 160, 250, null, null],
+        [0, "아이사", null, 0, null, 76, 56, 78, 0, 160, 250, null, null],
+        [0, "세은", null, 0, null, 80, 53, 77, 0, 160, 250, null, null],
+        [0, "윤", null, 0, null, 77, 52, 63, 0, 160, 250, null, null],
+        [0, "STAYC 재이", null, 0, null, 74, 49, 69, 0, 160, 250, null, null],
+        [0, "네이처 소희", null, 0, null, 78, 56, 83, 0, 160, 250, null, null],
+        [0, "새봄", null, 0, null, 77, 55, 77, 0, 160, 250, null, null],
+        [0, "루", null, 0, null, 75, 53, 80, 0, 160, 250, null, null],
+        [0, "채빈", null, 0, null, 78, 54, 78, 0, 160, 250, null, null],
+        [0, "하루", null, 0, null, 75, 83, 58, 0, 160, 250, null, null],
+        [0, "유채", null, 0, null, 70, 43, 70, 0, 160, 250, null, null],
+        [0, "선샤인", null, 0, null, 71, 42, 76, 0, 160, 250, null, null],
+        [0, "오로라", null, 0, null, 78, 50, 73, 0, 160, 250, null, null],
+        [0, "로하", null, 0, null, 68, 82, 56, 0, 160, 250, null, null]
+    ],
+    "general_ex":[
+    ],
+    "cities":[
+
+    ],
+    "history":[
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>제작자: 세정.",
+        "<C>●</>180년 1월:<L><b>【가상모드13-b】</b>걸그룹대전(비급)</>",
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>최고의 걸그룹을 가린다! (2022. 4. 20.)"
+    ],
+    "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/PageInheritPoint.vue

@@ -107,11 +107,11 @@
         <div class="col col-lg-4 col-sm-6 col-12 py-2">
           <div class="row px-4">
             <div class="a-right col-6 align-self-center">랜덤 턴 초기화</div>
-            <BButton class="col-6" variant="primary" @click="buySimple('ResetTurnTime')"> 구입 </BButton>
+            <BButton class="col-6" variant="primary" @click="tryResestTurnTime()"> 구입 </BButton>
           </div>
           <div class="a-right">
             <small class="form-text text-muted"
-              >다음 턴이 랜덤으로 바뀝니다. (필요 포인트가 피보나치식으로 증가합니다)<br /><span style="color: white"
+              >다음 턴 시간이 앞, 뒤 랜덤하게 바뀝니다. (필요 포인트가 피보나치식으로 증가합니다)<br /><span style="color: white"
                 >필요 포인트: {{ inheritActionCost.resetTurnTime }}</span
               ></small
             >
@@ -234,6 +234,8 @@ declare const staticValues: {
   };
   resetTurnTimeLevel: number;
   resetSpecialWarLevel: number;
+  ternTurm: number;
+  turnTime: string;
 
   availableSpecialWar: Record<
     string,
@@ -263,6 +265,7 @@ import type { inheritBuffType, InheritPointLogItem } from "./defs/API/InheritAct
 import * as JosaUtil from "@/util/JosaUtil";
 import { BButton } from "bootstrap-vue-next";
 import { unwrap } from "./util/unwrap";
+import { add as dateAdd } from 'date-fns';
 
 const inheritanceViewText: Record<InheritanceViewType, { title: string; info: string }> = {
   sum: {
@@ -446,9 +449,42 @@ async function buyInheritBuff(buffKey: inheritBuffType) {
   //TODO: 페이지 새로고침 필요없이 하도록
   location.reload();
 }
-async function buySimple(type: "ResetTurnTime" | "BuyRandomUnique" | "ResetSpecialWar") {
+
+async function tryResestTurnTime(){
+  const cost = inheritActionCost.resetTurnTime;
+
+  if (items.value.previous < cost) {
+    alert("유산 포인트가 부족합니다.");
+    return;
+  }
+
+
+  const { minTurnTime, maxTurnTime } = await SammoAPI.InheritAction.CalcResetTurnTimeRange();
+
+  //YYYY-MM-DD hh:mm:ss 에서 hh:mm:ss 까지만 보여줄 예정
+  const textMinTurnTime = minTurnTime.substring(11, 19);
+  const textMaxTurnTime = maxTurnTime.substring(11, 19);
+
+  const msg = `${cost} 포인트로 턴을 초기화 하시겠습니까?\n${textMinTurnTime} ~ ${textMaxTurnTime} 사이의 시간으로 초기화 됩니다.`;
+  if (!confirm(msg)) {
+    return;
+  }
+
+  try {
+    await SammoAPI.InheritAction.ResetTurnTime();
+  } catch (e) {
+    console.error(e);
+    alert(`실패했습니다: ${e}`);
+    return;
+  }
+
+  alert("성공했습니다.");
+  //TODO: 페이지 새로고침 필요없이 하도록
+  location.reload();
+}
+
+async function buySimple(type: "BuyRandomUnique" | "ResetSpecialWar") {
   const costMap: Record<typeof type, number> = {
-    ResetTurnTime: inheritActionCost.resetTurnTime,
     ResetSpecialWar: inheritActionCost.resetSpecialWar,
     BuyRandomUnique: inheritActionCost.randomUnique,
   };
@@ -459,15 +495,16 @@ async function buySimple(type: "ResetTurnTime" | "BuyRandomUnique" | "ResetSpeci
     return;
   }
 
-  const messageMap: Record<typeof type, string> = {
-    ResetTurnTime: `${cost} 포인트로 턴을 초기화 하시겠습니까?`,
-    ResetSpecialWar: `${cost} 포인트로 전투 특기를 초기화 하시겠습니까?`,
-    BuyRandomUnique: `${cost} 포인트로 랜덤 유니크를 구입하시겠습니까?`,
-  };
   if (items.value.previous < cost) {
     alert("유산 포인트가 부족합니다.");
     return;
   }
+
+  const messageMap: Record<typeof type, string> = {
+    ResetSpecialWar: `${cost} 포인트로 전투 특기를 초기화 하시겠습니까?`,
+    BuyRandomUnique: `${cost} 포인트로 랜덤 유니크를 구입하시겠습니까?`,
+  };
+
   if (!confirm(messageMap[type])) {
     return;
   }

hwe/ts/SammoAPI.ts

@@ -174,6 +174,11 @@ const apiRealPath = {
     BuyRandomUnique: PUT as APICallT<undefined>,
     ResetSpecialWar: PUT as APICallT<undefined>,
     ResetTurnTime: PUT as APICallT<undefined>,
+    CalcResetTurnTimeRange: GET as APICallT<undefined, {
+      result: true,
+      minTurnTime: string,
+      maxTurnTime: string,
+    }>,
     SetNextSpecialWar: PUT as APICallT<{
       type: string;
     }>,

hwe/ts/processing/ProcessCity.vue

@@ -55,7 +55,7 @@
     </div>
     <div v-else-if="commandName == '허보'">
       선택된 도시에 허보를 발동합니다.<br />
-      전쟁중인 상대국 도시만 가능합니다.<br />
+      선포, 전쟁중인 상대국 도시만 가능합니다.<br />
       목록을 선택하거나 도시를 클릭하세요.<br />
     </div>
     <div v-else-if="commandName == '초토화'">