imagePull 기능 추가, 인스톨러 완성

훈사 분리
훈사를 분리
2019-09-23 00:28:15 +09:00 · 2019-09-21 23:27:43 +09:00 · 2019-09-21 21:29:20 +09:00 · 2019-09-21 21:04:17 +09:00 · 2019-09-21 18:09:37 +09:00 · 2019-09-21 17:39:13 +09:00
55 changed files with 1751 additions and 675 deletions
@@ -1,11 +1,4 @@
 .vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-
-

 # 체섭 ignore
 *.log
@@ -48,3 +41,4 @@ test.php
 phpinfo.php
 vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/*
 *.sqlite3
+
@@ -1,6 +1,6 @@
 The MIT License

-Copyright (c) 2018 Hide_D, 62che
+Copyright (c) 2019 Hide_D, 62che

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -11,16 +11,21 @@
  * <code>php-fpm</code> 권장
  * php에서 curl, pdo-sqlite을 실행가능해야 합니다. (기본값: 지원)
  * mysqlnd가 지원되어야합니다. (기본값: 지원)
+  * mysqli
+  * gd
 * MariaDB 10.2.1 이상
-  * MySQL 5.6 이상도 가능하도록 할 예정입니다.
+  * 현재 MySQL은 지원하지 않습니다.
 * <code>git</code>
 * <code>curl</code>

-Linux는 Ubuntu 16.04, Windows는 Windows 10에서 XAMPP를 사용한 환경에서 테스트되었습니다.
+Linux는 Ubuntu 16.04, 18.04, Windows는 Windows 10에서 XAMPP를 사용한 환경에서 테스트되었습니다.

-Docker를 이용한 설치는 계획중입니다.

-## 설치
+## Docker를 이용한 설치
+
+https://storage.hided.net/gogs/devsam/docker 를 참고해 주세요.
+
+## 수동 설치

 본 게임은 <code>git</code>을 이용한 업그레이드 시스템을 구현하였으므로, <code>git</code>이 필요합니다.
 또한 웹 서비스 데몬을 운영중인 사용자(일반적으로 <code>www-data</code>, <code>apache</code>)에게 디렉토리 권한이 주어져야합니다.
@@ -30,8 +35,8 @@ Docker를 이용한 설치는 계획중입니다.
 웹 데몬 user가 <code>www-data</code>인 경우 다음과 같이 입력하여 최신 배포버전과 이미지 파일을 얻을 수 있습니다.

 ```
-sudo -u www-data git clone ssh://git@storage.hided.net:2525/devsam/core.git
-git clone ssh://git@storage.hided.net:2525/devsam/image.git
+sudo -u www-data git clone https://storage.hided.net/gogs/devsam/core.git
+git clone https://storage.hided.net/gogs/devsam/image.git
 ```

 > 이미지는 git hook을 이용한 업데이트 기능을 제공하지만 아직 범용성 있는 설계가 되어있진 않습니다.
@@ -3,7 +3,6 @@ namespace sammo;

 define('ROOT', realpath(__dir__.'/..'));
 setlocale(LC_ALL, 'ko_KR.UTF-8');
-date_default_timezone_set('Asia/Seoul');
 mb_internal_encoding("UTF-8");
 mb_http_output('UTF-8');
 mb_regex_encoding('UTF-8'); 
@@ -98,6 +98,38 @@ require(__dir__.'/../vendor/autoload.php');
                        </div>
                    </div>

+                    <div class="form-group row">
+                        <label for="image_request_key" class="col-sm-4 col-form-label">이미지 갱신 키</label>
+                        <div class="input-group col-sm-8">
+                            <input type="text" class="form-control" name="image_request_key" id="image_request_key" 
+                            placeholder="이미지 서버의 hook/HashKey.php의 값과 동일하게"
+                            value="" />
+                            <div class="input-group-append">
+                                <button id="btn_random_generate_key" class="btn btn-secondary" type="button">랜덤 생성</button>
+                            </div>
+                        </div>
+                    </div>
+
+                    <hr style="width:100%; border-top: 1px solid lightgray;">
+
+                    <div class="form-group row">
+                        <label for="kakao_rest_key" class="col-sm-4 col-form-label">카카오 API Rest Key</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" name="kakao_rest_key" id="kakao_rest_key" 
+                            placeholder="카카오톡 API의 Rest Key"
+                            value="" />
+                        </div>
+                    </div>
+
+                    <div class="form-group row">
+                        <label for="kakao_admin_key" class="col-sm-4 col-form-label">카카오 API Admin Key</label>
+                        <div class="col-sm-8">
+                            <input type="text" class="form-control" name="kakao_admin_key" id="kakao_admin_key" 
+                            placeholder="카카오톡 API의 Admin Key"
+                            value="" />
+                        </div>
+                    </div>
+
                    <div class="form-group row">
                        <div class="col-sm-4"></div>
                        <div class="col-sm-8">
@@ -11,6 +11,11 @@ $dbName = Util::getReq('db_name');
 $servHost = Util::getReq('serv_host');
 $sharedIconPath = Util::getReq('shared_icon_path');
 $gameImagePath = Util::getReq('game_image_path');
+$imageRequestKey = Util::getReq('image_request_key');
+
+$kakaoRESTKey = Util::getReq('kakao_rest_key', 'string', '');
+$kakaoAdminKey = Util::getReq('kakao_admin_key', 'string', '');
+

 if (!$host || !$port || !$username || !$password || !$dbName || !$servHost || !$sharedIconPath || !$gameImagePath) {
    Json::die([
@@ -186,6 +191,8 @@ $globalSalt = bin2hex(random_bytes(16));

 $sharedIconPath = WebUtil::resolveRelativePath($sharedIconPath, $servHost);
 $gameImagePath = WebUtil::resolveRelativePath($gameImagePath, $servHost);
+$imageRequestPath = WebUtil::resolveRelativePath($gameImagePath.'/../hook/git_pull.php', $servHost);
+$imageKeyInstallPath = WebUtil::resolveRelativePath($gameImagePath.'/../hook/InstallKey.php', $servHost);

 $result = Util::generateFileUsingSimpleTemplate(
    __dir__.'/templates/ServConfig.orig.php',
@@ -193,11 +200,17 @@ $result = Util::generateFileUsingSimpleTemplate(
    [
        'serverBasePath'=>$servHost,
        'sharedIconPath'=>$sharedIconPath,
-        'gameImagePath'=>$gameImagePath
+        'gameImagePath'=>$gameImagePath,
+        'imageRequestPath'=>$imageRequestPath,
+        'imageRequestKey'=>$imageRequestKey
    ],
    true
 );

+if($imageRequestKey){
+    @file_get_contents($imageKeyInstallPath.'?key='.$imageRequestKey);
+}
+
 if ($result !== true) {
    Json::die([
        'result'=>false,
@@ -263,10 +276,15 @@ $result = Util::generateFileUsingSimpleTemplate(
    ]
 );

+$kakaoRedirectURI = WebUtil::resolveRelativePath('oauth_kakao/oauth.php', $servHost.'/');
+
 Util::generateFileUsingSimpleTemplate(
    __dir__.'/templates/KakaoKey.orig.php',
    ROOT.'/d_setting/KakaoKey.php',
    [
+        'REST_API_KEY'=>$kakaoRESTKey,
+        'ADMIN_KEY'=>$kakaoAdminKey,
+        'REDIRECT_URI'=>$kakaoRedirectURI
    ],
    true
 );
@@ -280,5 +298,6 @@ if ($result !== true) {

 Json::die([
    'result'=>true,
-    'reason'=>'success'
+    'reason'=>'success',
+    'globalSalt'=>$globalSalt
 ]);
@@ -10,6 +10,8 @@ class ServConfig
    public static $serverWebPath = '_tK_serverBasePath_';
    public static $sharedIconPath = '_tK_sharedIconPath_';
    public static $gameImagePath = "_tK_gameImagePath_";
+    public static $imageRequestPath = "_tK_imageRequestPath_";
+    public static $imageRequestKey = '_tK_imageRequestKey_';

    public static function getSharedIconPath(string $filepath='') : string
    {
@@ -32,6 +34,13 @@ class ServConfig
        return static::$gameImagePath;
    }

+    public static function getImagePullURI() : string
+    {
+        $now = time();
+        $req_hash = Util::hashPassword(sprintf("%016x",$now), static::$imageRequestKey);
+        return static::$imageRequestPath."?req={$req_hash}&time={$now}";
+    }
+

    /**
     * 서버 주소 반환. 서버의 경로가 하부 디렉토리인 경우에 하부 디렉토리까지 포함
@@ -98,11 +98,21 @@ foreach($emperiors as $emperior){
        <td align=center><?=$emperior['l12name']?></td>
        <td id=bg1 align=center>승 상</td>
        <td align=center><?=$emperior['l11name']?></td>
-        <td id=bg1 align=center>위 장 군</td>
+        <td id=bg1 align=center>표 기 장 군</td>
        <td align=center><?=$emperior['l10name']?></td>
        <td id=bg1 align=center>사 공</td>
        <td align=center><?=$emperior['l9name']?></td>
    </tr>
+    <tr>
+        <td id=bg1 align=center>거 기 장 군</td>
+        <td align=center><?=$emperior['l8name']?></td>
+        <td id=bg1 align=center>태 위</td>
+        <td align=center><?=$emperior['l7name']?></td>
+        <td id=bg1 align=center>위 장 군</td>
+        <td align=center><?=$emperior['l6name']?></td>
+        <td id=bg1 align=center>사 도</td>
+        <td align=center><?=$emperior['l5name']?></td>
+    </tr>
 </table>


@@ -5,26 +5,34 @@ include "lib.php";
 include "func.php";

 $session = Session::getInstance()->setReadOnly();
+$seasonIdx = Util::getReq('seasonIdx', 'int', UniqueConst::$seasonIdx);
 $scenarioIdx = Util::getReq('scenarioIdx', 'int', null);

 $db = DB::db();

 increaseRefresh("명예의전당", 1);

-$scenarioList= [];
-foreach($db->query('SELECT scenario_name as name, count(scenario) as cnt, scenario from ng_games group by scenario order by scenario asc') as $scenarioInfo){
-    $scenarioList[$scenarioInfo['scenario']] = $scenarioInfo;
-}
-
-
+$scenarioList = (function(){
+    $db = DB::db();
+    $scenarioList= [];
+    foreach($db->query('SELECT season, scenario_name as name, count(scenario) as cnt, scenario from ng_games group by season, scenario order by season desc, scenario asc') as $scenarioInfo){
+        $seasonIdx = $scenarioInfo['season'];
+        $scenarioIdx = $scenarioInfo['scenario'];
+        if(!key_exists($seasonIdx, $scenarioList)){
+            $scenarioList[$seasonIdx] = [];
+        }
+        $scenarioList[$seasonIdx][$scenarioIdx] = $scenarioInfo;
+    }
+    return $scenarioList;
+})();

 if($scenarioIdx !== null || key_exists($scenarioIdx, $scenarioList)){
-    $searchScenarioName = $scenarioList[$scenarioIdx]['name'];
-    $searchFilter = $db->sqleval('scenario = %i', $scenarioIdx);
+    $searchScenarioName = $scenarioList[$seasonIdx][$scenarioIdx]['name'];
+    $searchFilter = $db->sqleval('season = %i AND scenario = %i', $seasonIdx, $scenarioIdx);
 }
 else{
    $searchScenarioName = '* 모두 *';
-    $searchFilter = $db->sqleval(true);
+    $searchFilter = $db->sqleval('season = %i', $seasonIdx);
 }

 ?>
@@ -53,14 +61,20 @@ else{
    <tr><td>명 예 의 전 당<br><?=closeButton()?></td></tr>
    <tr><td>
 시나리오 검색 : <select id="by_scenario" name="by_scenario">
-    <option value="" <?=$scenarioIdx?"selected='selected'":''?>>* 종합 *</option>
-<?php foreach($scenarioList as $info): ?>
-    <option
-        value="<?=$info['scenario']?>"
-        <?=($info['scenario']===$scenarioIdx)?"selected='selected'":''?>
-    ><?=$info['name']?>(<?=$info['cnt']?>회)</option>
+<?php foreach($scenarioList as $iterSeasonIdx=>$subScenarioList): ?>
+    <option 
+        data-season="<?=$iterSeasonIdx?>" 
+        value="" 
+        <?=($iterSeasonIdx == $seasonIdx && $scenarioIdx === null)?"selected='selected'":''?>
+    >* 시즌 : <?=$iterSeasonIdx?> 종합 *</option>
+    <?php foreach($subScenarioList as $info): ?>
+        <option
+        data-season="<?=$iterSeasonIdx?>" 
+            value="<?=$info['scenario']?>"
+            <?=($iterSeasonIdx == $seasonIdx && $info['scenario']===$scenarioIdx)?"selected='selected'":''?>
+        ><?=$info['name']?>(<?=$info['cnt']?>회)</option>
+    <?php endforeach; ?>
 <?php endforeach; ?>
-?>
 </select>
 </td></tr>
 </table>
@@ -18,21 +18,24 @@ if($tnmt < 0 || $tnmt > 1){
    $tnmt = 1;
 }

+$showDieImmediatelyBtn = false;
+$availableDieImmediately = false;
+
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();

 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
+$gameStor->cacheValues(['turnterm', 'opentime', 'turntime','autorun_user']);
 $connect=$db->get();

 increaseRefresh("내정보", 1);

-$query = "select no,npc,mode,tnmt,myset,train,atmos from general where owner='{$userID}'";
+$query = "select no,npc,mode,tnmt,myset,train,atmos,lastrefresh from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);

-
 if ($me['myset'] > 0) {
    $submit = 'submit';
 } else {
@@ -91,6 +94,16 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
    }
 }

+if($gameStor->turntime <= $gameStor->opentime){
+    //서버 가오픈시 할 수 있는 행동
+
+    if($me['npc'] == 0){
+        $showDieImmediatelyBtn = true;
+        if(addTurn($me['lastrefresh'], $gameStor->turnterm, 2) <= TimeUtil::DatetimeNow()){
+            $availableDieImmediately = true;
+        }
+    }
+}
 ?>
 <!DOCTYPE html>
 <html>
@@ -106,7 +119,21 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
+<script>
+var availableDieImmediately = <?=$availableDieImmediately?'true':'false'?>;
+jQuery(function($){

+$('#die_immediately').click(function(){
+    if(!availableDieImmediately){
+        alert('삭제를 위해서는 생성 후 2턴 가량의 시간이 필요합니다.');
+        location.reload();
+        return false;
+    }
+    return confirm('정말로 삭제하시겠습니까?');
+});
+
+});
+</script>
 </head>

 <body>
@@ -134,10 +161,18 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
                <input type=<?=$submit?> name=btn style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px; value=설정저장><br>
                ∞<font color=orange>설정저장은 이달중 <?=$me['myset']?>회 남았습니다.</font><br><br>
            </form>
+            <?php if(!($gameStor->autorun_user['limit_minutes']??false)): ?>
            휴 가 신 청<br>
            <a href="c_vacation.php"><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>휴가 신청</button></a><br><br>
+            <?php endif; ?>
            <!--빙의 해제용 삭턴 조절<br>
            <a href="b_myPage.php?detachNPC=1"><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>빙의 해체 요청</button></a>-->
+
+<?php if($showDieImmediatelyBtn): ?>
+            가오픈 기간 내 장수 삭제<br>
+            <a href="c_die_immediately.php" id='die_immediately'><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>장수 삭제</button></a><br><br>
+<?php endif; ?>
+
            개인용 CSS<br>
            <textarea id='custom_css' style='color:white;background-color:black;width:420px;height:150px;'></textarea>
        </td>
@@ -81,6 +81,48 @@ uasort($troops, function($lhs, $rhs){
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/troops.css')?>
+<script>
+jQuery(function($){
+
+$('#form1').submit(function(){
+    return false;
+});
+$('#leaveTroop').click(function(e){
+    return confirm("정말 부대를 탈퇴하시겠습니까?");
+})
+$('.submitBtn').click(function(event){
+    if(event.isPropagationStopped()){
+        return false;
+    }
+    console.log('b');
+    var $this=$(this);
+
+    $.post({
+        url:'j_troop.php',
+        dataType:'json',
+        data:{
+            action:$this.val().replace(/\s/g, ''),
+            troop:$('input.troopId:checked').val(),
+            name:$('#troopName').val(),
+            gen:$('#genNo').val()
+        }
+    }).then(function(data){
+        console.log(data);
+        if(!data.result){
+            alert(data.reason);
+            location.reload();
+        }
+
+        location.reload();
+
+    }, function(){
+        alert('알 수 없는 에러가 발생했습니다.');
+    });
+    return false;
+});
+
+});
+</script>
 </head>

 <body>
@@ -88,7 +130,7 @@ uasort($troops, function($lhs, $rhs){
 <table width=1000 class='tb_layout bg0'>
    <tr><td>부 대 편 성<br><?=backButton()?></td></tr>
 </table>
-<form name=form1 method=post action=c_troop.php>
+<form id=form1 name=form1 method=post>
 <table id="troop_list" class='tb_layout bg0'>
    <thead>
    <tr>
@@ -102,9 +144,9 @@ uasort($troops, function($lhs, $rhs){
    <tfoot><tr><td colspan='5'>
    <?php if(!$troops): ?>
    <?php elseif($me['troop'] == 0): ?>
-        <input type=submit name=btn value='부 대 가 입'>
+        <input type=submit class='submitBtn' value='부 대 가 입'>
    <?php else: ?>
-        <input type=submit name=btn value='부 대 탈 퇴' onclick='return confirm("정말 부대를 탈퇴하시겠습니까?")'>
+        <input type=submit id="leaveTroop" class='submitBtn' value='부 대 탈 퇴'>
    <?php endif;?>
    </td></tr></tfoot>
    <tbody>
@@ -133,7 +175,7 @@ foreach ($troops as $troopNo=>$troop) {

 <?php if ($me['troop'] == 0): ?>
    <tr>
-        <td align=center rowspan=2><input type='radio' name='troop' value='<?=$troop['troop']?>'></td>
+        <td align=center rowspan=2><input type='radio' class='troopId' name='troop' value='<?=$troop['troop']?>'></td>
        <td align=center><?=$troop['name']?><br>【 <?=$cityText?> 】</td>
        <td height=64 class='generalIcon' style='background:no-repeat center url("<?=$troopLeader['pictureFullPath']?>");background-size:64px;'>&nbsp;</td>
        <td rowspan=2 width=62><?=$genlistText?></td>
@@ -152,15 +194,15 @@ foreach ($troops as $troopNo=>$troop) {
        <td rowspan=2 width=62><?=$genlistText?></td>
        <td rowspan=2>
        <?php if ($me['no'] == $troopLeader['no']): ?>
-            <select name=gen size=3 style=color:white;background-color:black;font-size:13px;width:128px;>";
+            <select id='genNo' name=gen size=3 style=color:white;background-color:black;font-size:13px;width:128px;>";
                <?php foreach ($troop['users'] as $troopUser): ?>
                    <?php if ($troopUser['no'] == $me['no']) {
        continue;
    } ?>
-                    <option value='<?=$troopUser['no']?>'><?=$troopUser['name']?></option>
+                    <option  value='<?=$troopUser['no']?>'><?=$troopUser['name']?></option>
                <?php endforeach; ?>
            </select><br>
-            <input type=submit name=btn value='부 대 추 방' style=width:130px;height:25px;>
+            <input type=submit class='submitBtn' value='부 대 추 방' style=width:130px;height:25px;>
        <?php else: ?>
            <?=$troopLeader['turnText']?>
        <?php endif; ?>
@@ -181,11 +223,11 @@ foreach ($troops as $troopNo=>$troop) {
 <table width=1000 class='tb_layout bg0'>
    <tr>
        <td width=80 id=bg1>부 대 명</td>
-        <td width=130><input type=text style=color:white;background-color:black; size=18 maxlength=9 name=name></td>
+        <td width=130><input id='troopName' type=text style=color:white;background-color:black; size=18 maxlength=9 name=name></td>
    <?php if($me['troop'] == 0): ?>
-        <td><input type=submit name=btn value='부 대 창 설'></td>
+        <td><input type=submit class='submitBtn' value='부 대 창 설'></td>
    <?php else: ?>
-        <td><input type=submit name=btn value='부 대 변 경'></td>
+        <td><input type=submit class='submitBtn' value='부 대 변 경'></td>
    <?php endif; ?>
    </tr>
 </table>
@@ -0,0 +1,49 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+$availableDieImmediately = false;
+
+//로그인 검사
+$session = Session::requireGameLogin();
+$userID = Session::getUserID();
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$general = $db->queryFirstRow('SELECT no,name,name2,npc,lastrefresh FROM general WHERE owner=%i AND npc = 0', $userID);
+
+if(!$general){
+    header('location:b_myPage.php');
+    die();
+}
+
+increaseRefresh("장수 삭제", 1);
+$gameStor->cacheValues(['turnterm', 'opentime', 'turntime', 'year', 'month']);
+
+if($gameStor->turntime <= $gameStor->opentime){
+    //서버 가오픈시 할 수 있는 행동
+    if(addTurn($general['lastrefresh'], $gameStor->turnterm, 2) <= TimeUtil::DatetimeNow()){
+        $availableDieImmediately = true;
+    }
+}
+
+if(!$availableDieImmediately){
+    header('location:b_myPage.php');
+    die();
+}
+
+
+if(!$db->query('DELETE FROM general WHERE owner=%i AND npc=0', $userID)){
+    trigger_error("올바르지 않은 삭제 프로세스 $userID", E_USER_WARNING);
+}
+$generalName = $general['name'];
+$josaYi = JosaUtil::pick($generalName, '이');
+pushGeneralPublicRecord(["<C>●</>{$gameStor->month}월:<Y>{$generalName}</>{$josaYi} 이 홀연히 모습을 <R>감추었습니다</>"], $gameStor->year, $gameStor->month);
+
+
+
+$session->logoutGame();
+header('location:..');
@@ -1,66 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-// $btn, $name, $troop
-$btn = Util::getReq('btn');
-$name = Util::getReq('name');
-$gen = Util::getReq('gen', 'int');
-$troop = Util::getReq('troop', 'int');
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = $session::getUserID();
-
-$db = DB::db();
-
-$me = $db->queryFirstRow('SELECT `no`, nation, troop FROM general WHERE `owner`=%i', $userID);
-
-$name = trim($name);
-if($btn == "부 대 창 설" && $name != "" && $me['troop'] == 0) {
-    $db->insert('troop',[
-        'name'=>$name,
-        'nation'=>$me['nation'],
-        'no'=>$me['no']
-    ]);
-    $troopID = $db->insertId();
-
-    $db->update('general', [
-        'troop'=>$troopID
-    ], 'no=%i',$me['no']);
-} elseif($btn == "부 대 변 경" && $name != "") {
-    $db->update('troop', [
-        'name'=>$name
-    ], 'no=%i',$me['no']);
-} elseif($btn == "부 대 추 방" && $gen != 0) {
-    $db->update('general', [
-        'troop'=>0
-    ], 'no=%i AND troop=(SELECT troop FROM troop WHERE no = %i)', $gen, $me['no']);
-} elseif($btn == "부 대 가 입" && $troop != 0) {
-    $troopLeader = $db->queryFirstField('SELECT `no` FROM troop WHERE troop=%i', $troop);
-    $troopLeaderNation = $db->queryFirstField('SELECT `nation` FROM `general` WHERE `no`=%i AND `nation`=%i', $troopLeader, $me['nation']);
-    if($troopLeaderNation){
-        $db->update('general', [
-            'troop'=>$troop
-        ], 'no=%i', $me['no']);
-    }
-} elseif($btn == "부 대 탈 퇴") {
-    $troopLeader = $db->queryFirstField('SELECT `no` FROM troop WHERE troop=%i', $me['troop']);
-    
-    //부대장일 경우
-    if($troopLeader == $me['no']) {
-        // 모두 탈퇴
-        $db->update('general', [
-            'troop'=>0
-        ], 'troop=%i',$me['troop']);
-        // 부대 삭제
-        $db->delete('troop', 'troop=%i', $me['troop']);
-    } else {
-        $db->update('general', [
-            'troop'=>0
-        ], 'no=%i', $me['no']);
-    }
-}
-
-header('Location:b_troop.php', true, 303);
@@ -10,6 +10,12 @@ $userID = Session::getUserID();
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');

+$autorun_user = $gameStor->autorun_user;
+if($autorun_user['limit_minutes']??false){
+    //자동 턴인 경우에는 휴가 불가
+    header('location:b_myPage.php', true, 303);
+}
+
 $killturn = $gameStor->killturn;

 $db->update('general', [
@@ -8,66 +8,10 @@ $session = Session::getInstance()->setReadOnly();

 $db = DB::db();

-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>커맨드리스트</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<script type="text/javascript">
-<?php
-if(!$session->isGameLoggedIn()){
-    echo 'window.parent.location.href = "../";';
+if (!$session->isGameLoggedIn()) {
+    die('<script>window.location.href = "../"</script>');
 }
-?>
-function myclock() {
-    lastday = new Array(31,28,31,30,31,30,31,31,30,31,30,31);

-    date = document.clock.clock.value;
-
-    year = parseInt(date.substr(0, 4), 10);
-    month = parseInt(date.substr(5,2), 10);
-    day = parseInt(date.substr(8, 2), 10);
-    hour = parseInt(date.substr(11, 2), 10);
-    min = parseInt(date.substr(14, 2), 10);
-    sec = parseInt(date.substr(17, 2), 10);
-
-    //윤년계산
-    if(((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0)) { lastday[1] = 29; }
-    else { lastday[1] = 28; }
-
-//    if(term > 0) term--;
-
-    sec++;
-    if(sec >= 60) { sec = 0; min++; }
-    if(min >= 60) { min = 0; hour++; }
-    if(hour >= 24) { hour = 0; day++; }
-    if(day > lastday[month-1]) { month++; day = 1; }
-    if(month >= 13) { year++; month = 1; }
-    if(month < 10) { month = '0' + month; }
-    if(day < 10) { day = '0' + day; }
-    if(hour < 10) { hour = '0' + hour; }
-    if(min < 10) { min = '0' + min; }
-    if(sec < 10) { sec = '0' + sec; }
-    date = '' + year + '-' + month + '-' + day + ' ' + hour + ':' + min + ':' + sec;
-
-    document.clock.clock.value = date;
-
-    window.setTimeout("myclock();", 1000);
-}
-</script>
-
-</head>
-<body OnLoad='myclock()'>
-<?php
 myCommandList();

 function myCommandList() {
@@ -76,6 +20,7 @@ function myCommandList() {
    $userID = Session::getUserID();

    $date = date('Y-m-d H:i:s');
+    $date_precise = (new \DateTime())->format("Y-m-d H:i:s.u");

    // 명령 목록
    $admin = $gameStor->getValues(['year','month','turnterm','turntime','opentime']);
@@ -88,9 +33,8 @@ function myCommandList() {
    $turn = getTurn($me, 2);

    echo "<table width=300 height=700 class='tb_layout bg2'>
-<form name=clock>
    <tr>
-        <td colspan=4 align=center id=bg0><b>- 명령 목록 - <input value='$date' type=text name=clock size=19 style=background-color:black;color:white;border-style:none;></b></td>
+        <td colspan=4 align=center id=bg0><b>- 명령 목록 - <input value='$date' type=text id=clock size=19 style=background-color:black;color:white;border-style:none; data-server-time='{$date_precise}'></b></td>
    </tr>";

    $year = $admin['year'];
@@ -120,11 +64,6 @@ function myCommandList() {
    }

    echo "
-</form>
 </table>
 ";
-}
-?>
-
-</body>
-</html>
+}
@@ -4,6 +4,7 @@ namespace sammo;
 class UniqueConst{
    public static $serverID = '_tK_serverID_';
    public static $serverName = '_tK_serverName_';
+    public static $seasonIdx = '_tK_seasonIdx_';

    private function __construct(){}

@@ -659,8 +659,10 @@ function commandTable() {
    commandGroup("======= 개 인 ========");
    if($me['level'] >= 1) {
        addCommand("단련(자금$develcost, 군량$develcost)", 41);
+        addCommand("숙련전환(통솔경험, 자금$develcost, 군량$develcost)", 58);
    } else {
        addCommand("단련(자금$develcost, 군량$develcost)", 41, 0);
+        addCommand("숙련전환(통솔경험, 자금$develcost, 군량$develcost)", 58, 0);
    }
    addCommand("견문(자금?, 군량?, 경험치?)", 42);
    if($city['trade'] > 0 || $me['special'] == 30) {
@@ -865,8 +867,6 @@ function generalInfo($no) {
        $lbonus = "";
    }

-    $troop = getTroop($general['troop']);
-
    $level = getLevel($general['level'], $nation['level']);
    if($general['level'] == 2)     {
        $query = "select name from city where gen3='{$general['no']}'";
@@ -934,7 +934,23 @@ function generalInfo($no) {
        default:
            $train = "{$general['train']}"; break;
    }
-    if($general['troop'] == 0)    { $troop['name'] = "-"; }
+    if($general['troop'] == 0){
+        $troopInfo = '-';
+    }
+    else{
+        $troop = getTroop($general['troop']);
+        $troopLeader = $db->queryFirstRow('SELECT city,turn0 FROM general WHERE no=%i', $troop['no']);
+        $troopInfo = $troop['name'];
+
+        if(DecodeCommand($troopLeader['turn0'])[0] != 26){
+            $troopInfo = "<strike style='color:gray;'>{$troopInfo}</strike>";
+        }
+        else if($troopLeader['city'] != $general['city']){
+            $troopCityName = CityConst::byID($troopLeader['city'])->name;
+            $troopInfo = "<span style='color:orange;'>{$troopInfo}({$troopCityName})</span>";
+        }
+        
+    }
    if($general['mode'] == 2)     { $general['mode'] = "<font color=limegreen>수비 함(훈사80)</font>"; }
    elseif($general['mode'] == 1) { $general['mode'] = "<font color=limegreen>수비 함(훈사60)</font>"; }
    else                        { $general['mode'] = "<font color=red>수비 안함</font>"; }
@@ -1008,7 +1024,7 @@ function generalInfo($no) {
    </tr>
    <tr height=20>
        <td style='text-align:center;' class='bg1'><b>부대</b></td>
-        <td style='text-align:center;' colspan=3>{$troop['name']}</td>
+        <td style='text-align:center;' colspan=3>{$troopInfo}</td>
        <td style='text-align:center;' class='bg1'><b>벌점</b></td>
        <td style='text-align:center;' colspan=5>".getConnect($general['connect'])." {$general['connect']}({$general['con']})</td>
    </tr>
@@ -1267,8 +1283,9 @@ function increaseRefresh($type="", $cnt=1) {
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $gameStor->refresh = $gameStor->refresh+$cnt; //TODO: +로 증가하는 값은 별도로 분리
    $isunited = $gameStor->isunited;
+    $opentime = $gameStor->opentime;

-    if($isunited != 2 && $generalID && $userGrade < 6) {
+    if($isunited != 2 && $generalID && $userGrade < 6 && $opentime <= TimeUtil::DatetimeNow()) {
        $db->update('general', [
            'lastrefresh'=>$date,
            'con'=>$db->sqleval('con + %i', $cnt),
@@ -1579,6 +1596,7 @@ function checkTurn() {
    CheckOverhead();
    //서버정보

+    $autorun_user = $gameStor->autorun_user;
    
    // 최종 처리 월턴의 다음 월턴시간 구함
    $prevTurn = cutTurn($gameStor->turntime, $gameStor->turnterm);
@@ -1597,12 +1615,15 @@ function checkTurn() {
            //if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이전 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general['turn0']})";
            //if(PROCESS_LOG) pushProcessLog($processlog);
            
-            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
-            if($general['npc'] >= 2) { processAI($general['no']); }    // npc AI 처리
            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', PreprocessCommand');
            PreprocessCommand($general['no']);
+            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
+            $reduce_turn = false;
+            if($general['npc'] >= 2 || ($autorun_user['limit_minutes']??false)) {
+                processAI($general['no'], $reduce_turn); 
+            }    // npc AI 처리
            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processCommand');
-            processCommand($general['no']);
+            processCommand($general['no'], $reduce_turn);
            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateCommand');
            updateCommand($general['no']);
            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateTurntime');
@@ -1714,12 +1735,14 @@ function checkTurn() {
            //if(PROCESS_LOG) $processlog[0] = "[{$date}] 월턴 이후 갱신: name({$general['name']}), no({$general['no']}), turntime({$general['turntime']}), turn0({$general['turn0']})";
            //if(PROCESS_LOG) pushProcessLog($processlog);
            
-            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processAI');
-            if($general['npc'] >= 2) { processAI($general['no']); }    // npc AI 처리
            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', PreprocessCommand');
            PreprocessCommand($general['no']);
+            $reduce_turn = false;
+            if($general['npc'] >= 2 || ($autorun_user['limit_minutes']??false)) {
+                processAI($general['no'], $reduce_turn); 
+            } 
            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processCommand');
-            processCommand($general['no']);
+            processCommand($general['no'], $reduce_turn);
            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateCommand');
            updateCommand($general['no']);
            //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateTurntime');
@@ -1952,7 +1975,7 @@ function updateTurntime($no) {

    $admin = $gameStor->getValues(['year', 'month', 'isunited', 'turnterm']);

-    $query = "select no,name,name2,nation,troop,age,turntime,killturn,level,deadyear,npc,npc_org,affinity,npcid from general where no='$no'";
+    $query = "select no,owner,name,name2,nation,troop,age,startage,turntime,killturn,level,deadyear,npc,npc_org,affinity,npcid from general where no='$no'";
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $general = MYDB_fetch_array($result);

@@ -2022,68 +2045,77 @@ function updateTurntime($no) {
            $query = "update nation set totaltech=tech*'$gencount',gennum='$gennum' where nation='{$general['nation']}'";
            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

+            $generalName = $general['name'];
+
            // 병, 요절, 객사, 번개, 사채, 일확천금, 호랑이, 곰, 수영, 처형, 발견
-            $josaYi = JosaUtil::pick($general['name'], '이');
+            $josaYi = JosaUtil::pick($generalName, '이');
+
+            if($general['owner'] > 0 && $general['startage'] + 1 < $general['age']){
+                
+                $realName = RootDB::db()->queryFirstField('SELECT name FROM member WHERE no = %i', $general['owner'])??'??';
+                $generalName .= "({$realName})";
+            }
+
            switch(rand()%42) {
-            case 0:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 역병에 걸려 <R>죽고</> 말았습니다."; break;
-            case 1:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <R>요절</>하고 말았습니다."; break;
-            case 2:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 거리에서 갑자기 <R>객사</>하고 말았습니다."; break;
-            case 3:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 안타깝게도 번개에 맞아 <R>죽고</> 말았습니다."; break;
-            case 4:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 고리대금에 시달리다가 <R>자살</>하고 말았습니다."; break;
-            case 5:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 일확천금에 놀라 심장마비로 <R>죽고</> 말았습니다."; break;
-            case 6:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 산속에서 호랑이에게 물려 <R>죽고</> 말았습니다."; break;
-            case 7:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 산책중 곰에게 할퀴어 <R>죽고</> 말았습니다."; break;
-            case 8:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 수영을 하다 <R>익사</>하고 말았습니다."; break;
-            case 9:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 황제를 모독하다가 <R>처형</>당하고 말았습니다."; break;
-            case 10: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 이튿날 침실에서 <R>죽은채로</>발견되었습니다."; break;
-            case 11: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 색에 빠져 기력이 쇠진해 <R>죽고</>말았습니다."; break;
-            case 12: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 미녀를 보고 심장마비로 <R>죽고</>말았습니다."; break;
-            case 13: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 우울증에 걸려 <R>자살</>하고 말았습니다."; break;
-            case 14: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 천하 정세를 비관하며 <R>분신</>하고 말았습니다."; break;
-            case 15: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 어떤 관심도 못받고 쓸쓸히 <R>죽고</>말았습니다."; break;
-            case 16: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 유산 상속 문제로 다투다가 <R>살해</>당했습니다."; break;
-            case 17: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 누군가의 사주로 자객에게 <R>암살</>당했습니다."; break;
-            case 18: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 바람난 배우자에게 <R>독살</>당하고 말았습니다."; break;
-            case 19: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 농약을 술인줄 알고 마셔 <R>죽고</>말았습니다."; break;
-            case 20: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 아무 이유 없이 <R>죽고</>말았습니다."; break;
-            case 21: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 전재산을 잃고 화병으로 <R>죽고</>말았습니다."; break;
-            case 22: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 단식운동을 하다가 굶어 <R>죽고</>말았습니다."; break;
-            case 23: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 귀신에게 홀려 시름 앓다가 <R>죽고</>말았습니다."; break;
-            case 24: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 사람들에게 집단으로 맞아서 <R>죽고</>말았습니다."; break;
-            case 25: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 갑자기 성벽에서 뛰어내려 <R>죽고</>말았습니다."; break;
-            case 26: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 농사중 호미에 머리를 맞아 <R>죽고</>말았습니다."; break;
-            case 27: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 저세상이 궁금하다며 <R>자살</>하고 말았습니다."; break;
-            case 28: $alllog[0] = "<C>●</>{$admin['month']}월:운좋기로 소문난 <Y>{$general['name']}</>{$josaYi} 불운하게도 <R>죽고</>말았습니다."; break;
-            case 29: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 무리하게 단련을 하다가 <R>죽고</>말았습니다."; break;
-            case 30: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 생활고를 비관하며 <R>자살</>하고 말았습니다."; break;
-            case 31: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 평생 결혼도 못해보고 <R>죽고</> 말았습니다."; break;
-            case 32: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 과식하다 배가 터져 <R>죽고</> 말았습니다."; break;
-            case 33: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 웃다가 숨이 넘어가 <R>죽고</> 말았습니다."; break;
-            case 34: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 추녀를 보고 놀라서 <R>죽고</> 말았습니다."; break;
-            case 35: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 물에 빠진 사람을 구하려다 같이 <R>죽고</> 말았습니다."; break;
-            case 36: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 독살을 준비하다 독에 걸려 <R>죽고</> 말았습니다."; break;
-            case 37: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 뒷간에서 너무 힘을 주다가 <R>죽고</> 말았습니다."; break;
-            case 38: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 돌팔이 의사에게 치료받다가 <R>죽고</> 말았습니다."; break;
-            case 39: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 남의 보약을 훔쳐먹다 부작용으로 <R>죽고</> 말았습니다."; break;
-            case 40: $alllog[0] = "<C>●</>{$admin['month']}월:희대의 사기꾼 <Y>{$general['name']}</>{$josaYi} <R>사망</>했습니다."; break;
-            case 41: $alllog[0] = "<C>●</>{$admin['month']}월:희대의 호색한 <Y>{$general['name']}</>{$josaYi} <R>사망</>했습니다."; break;
-            default: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <R>사망</>했습니다."; break;
+            case 0:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 역병에 걸려 <R>죽고</> 말았습니다."; break;
+            case 1:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} <R>요절</>하고 말았습니다."; break;
+            case 2:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 거리에서 갑자기 <R>객사</>하고 말았습니다."; break;
+            case 3:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 안타깝게도 번개에 맞아 <R>죽고</> 말았습니다."; break;
+            case 4:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 고리대금에 시달리다가 <R>자살</>하고 말았습니다."; break;
+            case 5:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 일확천금에 놀라 심장마비로 <R>죽고</> 말았습니다."; break;
+            case 6:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 산속에서 호랑이에게 물려 <R>죽고</> 말았습니다."; break;
+            case 7:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 산책중 곰에게 할퀴어 <R>죽고</> 말았습니다."; break;
+            case 8:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 수영을 하다 <R>익사</>하고 말았습니다."; break;
+            case 9:  $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 황제를 모독하다가 <R>처형</>당하고 말았습니다."; break;
+            case 10: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 이튿날 침실에서 <R>죽은채로</>발견되었습니다."; break;
+            case 11: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 색에 빠져 기력이 쇠진해 <R>죽고</>말았습니다."; break;
+            case 12: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 미녀를 보고 심장마비로 <R>죽고</>말았습니다."; break;
+            case 13: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 우울증에 걸려 <R>자살</>하고 말았습니다."; break;
+            case 14: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 천하 정세를 비관하며 <R>분신</>하고 말았습니다."; break;
+            case 15: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 어떤 관심도 못받고 쓸쓸히 <R>죽고</>말았습니다."; break;
+            case 16: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 유산 상속 문제로 다투다가 <R>살해</>당했습니다."; break;
+            case 17: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 누군가의 사주로 자객에게 <R>암살</>당했습니다."; break;
+            case 18: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 바람난 배우자에게 <R>독살</>당하고 말았습니다."; break;
+            case 19: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 농약을 술인줄 알고 마셔 <R>죽고</>말았습니다."; break;
+            case 20: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 아무 이유 없이 <R>죽고</>말았습니다."; break;
+            case 21: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 전재산을 잃고 화병으로 <R>죽고</>말았습니다."; break;
+            case 22: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 단식운동을 하다가 굶어 <R>죽고</>말았습니다."; break;
+            case 23: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 귀신에게 홀려 시름 앓다가 <R>죽고</>말았습니다."; break;
+            case 24: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 사람들에게 집단으로 맞아서 <R>죽고</>말았습니다."; break;
+            case 25: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 갑자기 성벽에서 뛰어내려 <R>죽고</>말았습니다."; break;
+            case 26: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 농사중 호미에 머리를 맞아 <R>죽고</>말았습니다."; break;
+            case 27: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 저세상이 궁금하다며 <R>자살</>하고 말았습니다."; break;
+            case 28: $alllog[0] = "<C>●</>{$admin['month']}월:운좋기로 소문난 <Y>{$generalName}</>{$josaYi} 불운하게도 <R>죽고</>말았습니다."; break;
+            case 29: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 무리하게 단련을 하다가 <R>죽고</>말았습니다."; break;
+            case 30: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 생활고를 비관하며 <R>자살</>하고 말았습니다."; break;
+            case 31: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 평생 결혼도 못해보고 <R>죽고</> 말았습니다."; break;
+            case 32: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 과식하다 배가 터져 <R>죽고</> 말았습니다."; break;
+            case 33: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 웃다가 숨이 넘어가 <R>죽고</> 말았습니다."; break;
+            case 34: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 추녀를 보고 놀라서 <R>죽고</> 말았습니다."; break;
+            case 35: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 물에 빠진 사람을 구하려다 같이 <R>죽고</> 말았습니다."; break;
+            case 36: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 독살을 준비하다 독에 걸려 <R>죽고</> 말았습니다."; break;
+            case 37: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 뒷간에서 너무 힘을 주다가 <R>죽고</> 말았습니다."; break;
+            case 38: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 돌팔이 의사에게 치료받다가 <R>죽고</> 말았습니다."; break;
+            case 39: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 남의 보약을 훔쳐먹다 부작용으로 <R>죽고</> 말았습니다."; break;
+            case 40: $alllog[0] = "<C>●</>{$admin['month']}월:희대의 사기꾼 <Y>{$generalName}</>{$josaYi} <R>사망</>했습니다."; break;
+            case 41: $alllog[0] = "<C>●</>{$admin['month']}월:희대의 호색한 <Y>{$generalName}</>{$josaYi} <R>사망</>했습니다."; break;
+            default: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} <R>사망</>했습니다."; break;
            }
            // 엔피씨,엠피씨,의병 사망로그
            if($general['npc'] == 2 || $general['npc'] == 6) {
-                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <R>사망</>했습니다.";
+                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} <R>사망</>했습니다.";
            } elseif($general['npc'] >= 3) {
                switch(rand()%10) {
-                case 0: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 푸대접에 실망하여 떠났습니다."; break;
-                case 1: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 갑자기 화를 내며 떠났습니다."; break;
-                case 2: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 의견차이를 좁히지 못하고 떠났습니다."; break;
-                case 3: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 판단 착오였다며 떠났습니다."; break;
-                case 4: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 생활고가 나아지지 않는다며 떠났습니다."; break;
-                case 5: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 기대가 너무 컸다며 떠났습니다."; break;
-                case 6: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 아무 이유 없이 떠났습니다."; break;
-                case 7: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 자기 목적은 달성했다며 떠났습니다."; break;
-                case 8: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 자기가 없어도 될것 같다며 떠났습니다."; break;
-                case 9: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 처자식이 그립다며 떠났습니다."; break;
+                case 0: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 푸대접에 실망하여 떠났습니다."; break;
+                case 1: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 갑자기 화를 내며 떠났습니다."; break;
+                case 2: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 의견차이를 좁히지 못하고 떠났습니다."; break;
+                case 3: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 판단 착오였다며 떠났습니다."; break;
+                case 4: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 생활고가 나아지지 않는다며 떠났습니다."; break;
+                case 5: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 기대가 너무 컸다며 떠났습니다."; break;
+                case 6: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 아무 이유 없이 떠났습니다."; break;
+                case 7: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 자기 목적은 달성했다며 떠났습니다."; break;
+                case 8: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 자기가 없어도 될것 같다며 떠났습니다."; break;
+                case 9: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$generalName}</>{$josaYi} 처자식이 그립다며 떠났습니다."; break;
                }
            }

@@ -2210,6 +2242,7 @@ function CheckHall($no) {

        $db->insertIgnore('ng_hall', [
            'server_id'=>UniqueConst::$serverID,
+            'season'=>UniqueConst::$seasonIdx,
            'scenario'=>$scenarioIdx,
            'general_no'=>$no,
            'type'=>$idx,
@@ -2235,11 +2268,78 @@ function CheckHall($no) {
 }


+function guaranteedUniqueItemLottery(array $weightedArray, string $headerText='아이템'):?int{
+    //NOTE: Util::choiceRandomUsingWeight 사용
+    //TODO: 또 재 구현해야함.... ㅜㅜ
+
+    if(!$weightedArray){
+        return null;
+    }
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+
+    $targetGeneralID = Util::choiceRandomUsingWeight($weightedArray);
+    
+    $alllog = [];
+    $history = [];
+    $occupied = [];
+    $item = [];
+
+    $admin = $gameStor->getValues(['year', 'month', 'scenario']);
+
+    $selGroup = [
+        20 - $db->queryFirstField('SELECT count(*) from general where weap > 6'),
+        20 - $db->queryFirstField('SELECT count(*) from general where book > 6'),
+        20 - $db->queryFirstField('SELECT count(*) from general where horse > 6'),
+        20 - $db->queryFirstField('SELECT count(*) from general where item > 6')
+    ];
+
+    if(array_sum($selGroup) == 0){
+        return null;
+    }
+
+    $sel = Util::choiceRandomUsingWeight($selGroup);
+    switch($sel) {
+    case 0: [$type, $nameFunc] = ["weap", 'sammo\getWeapName']; break;
+    case 1: [$type, $nameFunc] = ["book", 'sammo\getBookName']; break;
+    case 2: [$type, $nameFunc] = ["horse", 'sammo\getHorseName']; break;
+    case 3: [$type, $nameFunc] = ["item", 'sammo\getItemName']; break;
+    }
+
+    foreach($db->queryFirstColumn('SELECT %b FROM general WHERE %b > 6', $type, $type) as $itemIdx){
+        $occupied[$itemIdx] = 1;
+    }
+    for($i=7; $i <= 26; $i++) {
+        if(!Util::array_get($occupied[$i])) {
+            $item[] = $i;
+        }
+    }
+    $it = Util::choiceRandom($item);
+
+    $general = $db->queryFirstRow('SELECT no, name, nation FROM general WHERE no = %i', $targetGeneralID);
+
+    $db->update('general', [$type=>$it], 'no=%i', $general['no']);
+
+    $nation = getNationStaticInfo($general['nation']);
+
+
+    $josaUl = JosaUtil::pick(($nameFunc)($it), '을');
+    $josaYi = JosaUtil::pick($general['name'], '이');
+    $log[] = "<C>●</><C>".($nameFunc)($it)."</>{$josaUl} 습득했습니다!";
+    $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".($nameFunc)($it)."</>{$josaUl} 습득했습니다!";
+    pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".($nameFunc)($it)."</>{$josaUl} 습득");
+    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【{$headerText}】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".($nameFunc)($it)."</>{$josaUl} 습득했습니다!";
+
+    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
+    pushWorldHistory($history, $admin['year'], $admin['month']);
+    pushGenLog($general, $log);
+    return $targetGeneralID;
+}
+
 function uniqueItem($general, $log, $vote=0) {
    //TODO: uniqueItem 재 구현
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();
    $alllog = [];
    $history = [];
    $occupied = [];
@@ -2250,124 +2350,71 @@ function uniqueItem($general, $log, $vote=0) {

    $admin = $gameStor->getValues(['year', 'month', 'scenario']);

-    $query = "select count(*) as cnt from general where npc<2";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gen = MYDB_fetch_array($result);
+    $genCnt = $db->queryFirstField('SELECT count(*) FROM general WHERE npc < 2');

-    if($admin['scenario'] < 100)  { $prob = $gen['cnt'] * 5; }  // 5~6개월에 하나씩 등장
-    else { $prob = $gen['cnt']; }  // 1~2개월에 하나씩 등장
+    if($admin['scenario'] < 100)  { $prob = $genCnt * 5; }  // 5~6개월에 하나씩 등장
+    else { $prob = $genCnt; }  // 1~2개월에 하나씩 등장

-    if($vote == 1) { $prob = Util::round($gen['cnt'] * 0.7 / 3); }     // 투표율 70%, 투표 한번에 2~3개 등장
-    elseif($vote == 2) { $prob = Util::round($gen['cnt'] / 10 / 2); }   // 랜임시 2개(10%) 등장(200명중 20명 랜임시도?)
-    elseif($vote == 3) { $prob = Util::round($gen['cnt'] / 10 / 4); }   // 건국시 4개(20%) 등장(200명시 20국 정도 됨)
+    if($vote == 1) { $prob = Util::round($genCnt * 0.7 / 3); }     // 투표율 70%, 투표 한번에 2~3개 등장
+    elseif($vote == 2) { $prob = Util::round($genCnt / 10 / 2); }   // 랜임시 2개(10%) 등장(200명중 20명 랜임시도?)
+    elseif($vote == 3) { $prob = Util::round($genCnt / 10 / 4); }   // 건국시 4개(20%) 등장(200명시 20국 정도 됨)

    if($prob < 3) { $prob = 3; }
    //아이템 습득 상황
-    if(rand() % $prob == 0) {
-        //셋중 선택
-        $selGroup = [
-            20 - $db->queryFirstField('SELECT count(*) from general where weap > 6'),
-            20 - $db->queryFirstField('SELECT count(*) from general where book > 6'),
-            20 - $db->queryFirstField('SELECT count(*) from general where horse > 6'),
-            20 - $db->queryFirstField('SELECT count(*) from general where item > 6')
-        ];
-        $sel = Util::choiceRandomUsingWeight($selGroup);
-        switch($sel) {
-        case 0: $type = "weap"; break;
-        case 1: $type = "book"; break;
-        case 2: $type = "horse"; break;
-        case 3: $type = "item"; break;
-        }
-        $query = "select no,{$type} from general where {$type}>6";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $count = MYDB_num_rows($result);
-        if($count < 20) {
-            for($i=0; $i < $count; $i++) {
-                $gen = MYDB_fetch_array($result);
-                $occupied[$gen[$type]] = 1;
-            }
-            for($i=7; $i <= 26; $i++) {
-                if(!Util::array_get($occupied[$i])) {
-                    $item[] = $i;
-                }
-            }
-            $it = $item[rand() % count($item)]??0;
+    if (rand() % $prob != 0) {
+        return $log;

-            $query = "update general set {$type}='$it' where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    }
+    //셋중 선택
+    $selGroup = [
+        20 - $db->queryFirstField('SELECT count(*) from general where weap > 6'),
+        20 - $db->queryFirstField('SELECT count(*) from general where book > 6'),
+        20 - $db->queryFirstField('SELECT count(*) from general where horse > 6'),
+        20 - $db->queryFirstField('SELECT count(*) from general where item > 6')
+    ];

-            $nation = getNationStaticInfo($general['nation']);
+    if(array_sum($selGroup) == 0){
+        return $log;
+    }

-            switch($sel) {
-            case 0:
-                $josaUl = JosaUtil::pick(getWeapName($it), '을');
-                $josaYi = JosaUtil::pick($general['name'], '이');
-                $log[] = "<C>●</><C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".getWeapName($it)."</>{$josaUl} 습득");
-                if($vote == 0) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                }
-                break;
-            case 1:
-                $josaUl = JosaUtil::pick(getBookName($it), '을');
-                $josaYi = JosaUtil::pick($general['name'], '이');
-                $log[] = "<C>●</><C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".getBookName($it)."</>{$josaUl} 습득");
-                if($vote == 0) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                }
-                break;
-            case 2:
-                $josaUl = JosaUtil::pick(getHorseName($it), '을');
-                $josaYi = JosaUtil::pick($general['name'], '이');
-                $log[] = "<C>●</><C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
-                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".getHorseName($it)."</>{$josaUl} 습득");
-                if($vote == 0) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
-                }
-                break;
-            case 3:
-                $josaUl = JosaUtil::pick(getItemName($it), '을');
-                $josaYi = JosaUtil::pick($general['name'], '이');
-                $log[] = "<C>●</><C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
-                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".getItemName($it)."</>{$josaUl} 습득");
-                if($vote == 0) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
-                }
-                break;
-            }
-            pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-            pushWorldHistory($history, $admin['year'], $admin['month']);
+    $sel = Util::choiceRandomUsingWeight($selGroup);
+    switch($sel) {
+    case 0: [$type, $nameFunc] = ["weap", 'sammo\getWeapName']; break;
+    case 1: [$type, $nameFunc] = ["book", 'sammo\getBookName']; break;
+    case 2: [$type, $nameFunc] = ["horse", 'sammo\getHorseName']; break;
+    case 3: [$type, $nameFunc] = ["item", 'sammo\getItemName']; break;
+    }
+
+    switch($vote){
+    case 1: $voteTypeText = '설문상품'; break;
+    case 2: $voteTypeText = '랜덤임관상품'; break;
+    case 3: $voteTypeText = '건국상품'; break;
+    default: $voteTypeText = '아이템'; break;
+    }
+
+    foreach($db->queryFirstColumn('SELECT %b FROM general WHERE %b > 6', $type, $type) as $itemIdx){
+        $occupied[$itemIdx] = 1;
+    }
+    for($i=7; $i <= 26; $i++) {
+        if(!Util::array_get($occupied[$i])) {
+            $item[] = $i;
        }
    }
+    $it = Util::choiceRandom($item);
+
+    $db->update('general', [$type=>$it], 'no=%i', $general['no']);
+
+    $nation = getNationStaticInfo($general['nation']);
+
+    $josaUl = JosaUtil::pick(($nameFunc)($it), '을');
+    $josaYi = JosaUtil::pick($general['name'], '이');
+    $log[] = "<C>●</><C>".($nameFunc)($it)."</>{$josaUl} 습득했습니다!";
+    $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".($nameFunc)($it)."</>{$josaUl} 습득했습니다!";
+    pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".($nameFunc)($it)."</>{$josaUl} 습득");
+    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【{$voteTypeText}】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".($nameFunc)($it)."</>{$josaUl} 습득했습니다!";
+
+    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
+    pushWorldHistory($history, $admin['year'], $admin['month']);
    return $log;
 }

@@ -103,21 +103,30 @@ function getTurn(array $general, $type, $font=1) {
                $str[$i] = "【{$general['name']}】{$josaUl} 등용";
                break;
            case 25: //임관
+                $third = $command[2];
                $double = $command[1];

-                if($double == 98){
-                    $nationName = '건국된 임의 국가';
+                if($third == 98){
+                    $str[$i] = "【건국된 임의 국가】로 임관";
                }
-                else if($double == 99){
-                    $nationName = '임의의 국가';
+                else if($third == 99){
+                    $str[$i] = "【임의의 국가】로 임관";
+                }
+                else if($third == 1){
+                    $generalName = $db->queryFirstField('SELECT name FROM general WHERE no=%i', $double)??'?!?!';
+                    $josaUl = JosaUtil::pick($generalName, '을');
+                    $str[$i] = "【{$generalName}】{$josaUl} 따라 임관";
+                }
+                else if($third == 0){
+                    $nationName = getNationStaticInfo($double)['name']??'?!?!';
+    
+                    $josaRo = JosaUtil::pick($nationName, '로');
+                    $str[$i] = "【{$nationName}】{$josaRo} 임관";
                }
                else{
-                    $nationName = getNationStaticInfo($double)['name']??'?!?!';
+                    $str[$i] = "????";
                }
                
-
-                $josaRo = JosaUtil::pick($nationName, '로');
-                $str[$i] = "【{$nationName}】{$josaRo} 임관";
                break;
            case 26: //집합
                $str[$i] = "집합";
@@ -251,7 +260,9 @@ function getTurn(array $general, $type, $font=1) {
            case 57: //모반 시도
                $str[$i] = "모반 시도";
                break;
-
+            case 58: //숙련 전환
+                $str[$i] = "숙련 전환";
+                break;
            default:
                $str[$i] = "????";
                break;
@@ -472,7 +483,7 @@ function getCoreTurn($nation, $level) {
 }


-function processCommand($no) {
+function processCommand($no, $reduceTurn) {
    $session = Session::getInstance();
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -550,6 +561,8 @@ function processCommand($no) {
            $newKillturn = $general['killturn'] - 1;
        } elseif($command[0] == 0) {
            $newKillturn = $general['killturn'] - 1;
+        } elseif($reduceTurn == true){
+            $newKillturn = $general['killturn'] - 1;
        } else {
            $newKillturn = $killturn;
        }
@@ -623,6 +636,8 @@ function processCommand($no) {
            case 55: process_55($general); break; //거병
            case 56: process_56($general); break; //해산
            case 57: process_57($general); break; //모반 시도
+
+            case 58: process_58($general); break; //숙련 전환
        }
    }
 }
@@ -707,8 +722,11 @@ where nation='{$general['nation']}'

 function command_Single($turn, $command) {
    if(!$turn){
-        header('location:commandlist.php', true, 303);
-        return;
+        Json::die([
+            'result'=>true,
+            'nextPage'=>null,
+            'reason'=>'invalid turn'
+        ]);
    }

    $db = DB::db();
@@ -722,7 +740,11 @@ function command_Single($turn, $command) {
    }
    $db->update('general', $setValues, 'owner=%i',$userID);
    
-    header('location:commandlist.php', true, 303);
+    Json::die([
+        'result'=>true,
+        'nextPage'=>null,
+        'reason'=>'success'
+    ]);
 }

 function command_Chief($turn, $command) {
@@ -749,37 +771,22 @@ function command_Chief($turn, $command) {
 }

 function command_Other($turn, $commandtype) {
-
-    $target = "processing.php?commandtype={$commandtype}";
-    foreach($turn as $turnItem){
-        $target.="&turn[]={$turnItem}";
+    if(!$turn){
+        Json::die([
+            'result'=>true,
+            'nextPage'=>null,
+            'reason'=>'invalid turn'
+        ]);
    }
-    $target.="&".mt_rand();
-    ?>
-<!DOCTYPE html>
-<html lang="ko">
-<head>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-    <script>
-parent.moveProcessing(<?=$commandtype?>, <?=Json::encode($turn)?>);
-</script>
-</head>
-<body style="background-color:black;">

-</body>
-</html>
-<?php
+    $unixNow = time();
+    $turnArg = join('&turn[]=', $turn);

-/*
-<form name='form1' action='processing.php' method='post' target=_parent>
-<?php foreach($turn as $turnItem): ?>
-    <input type='hidden' name='turn[]' value='<?=$turnItem?>'>
-<?php endforeach; ?>
-<input type=hidden name=commandtype value=<?=$commandtype?>>
-</form>&nbsp;
-<script>*/
+    Json::die([
+        'result'=>true,
+        'nextPage'=>"processing.php?commandtype={$commandtype}&turn[]={$turnArg}&t={$unixNow}",
+        'reason'=>'success'
+    ]);
 }


@@ -758,15 +758,15 @@ function getItemInfo(?int $item):?string{
        9=>['도소연명(치료)', '[군사] 턴 실행 전 부상 회복.'],
        10=>['칠엽청점(치료)', '[군사] 턴 실행 전 부상 회복.'],
        11=>['정력견혈(치료)', '[군사] 턴 실행 전 부상 회복.'],
-        12=>['과실주(훈련)', '[전투] 훈련 보정 +5'],
-        13=>['이강주(훈련)', '[전투] 훈련 보정 +5'],
-        14=>['의적주(사기)', '[전투] 사기 보정 +5'],
-        15=>['두강주(사기)', '[전투] 사기 보정 +5'],
-        16=>['보령압주(사기)', '[전투] 사기 보정 +5'],
-        17=>['철벽서(훈련)', '[전투] 훈련 보정 +7'],
-        18=>['단결도(훈련)', '[전투] 훈련 보정 +7'],
-        19=>['춘화첩(사기)', '[전투] 사기 보정 +7'],
-        20=>['초선화(사기)', '[전투] 사기 보정 +7'],
+        12=>['과실주(훈련)', '[전투] 훈련 보정 +10'],
+        13=>['이강주(훈련)', '[전투] 훈련 보정 +10'],
+        14=>['의적주(사기)', '[전투] 사기 보정 +10'],
+        15=>['두강주(사기)', '[전투] 사기 보정 +10'],
+        16=>['보령압주(사기)', '[전투] 사기 보정 +10'],
+        17=>['철벽서(훈련)', '[전투] 훈련 보정 +14'],
+        18=>['단결도(훈련)', '[전투] 훈련 보정 +14'],
+        19=>['춘화첩(사기)', '[전투] 사기 보정 +14'],
+        20=>['초선화(사기)', '[전투] 사기 보정 +14'],
        21=>['육도(계략)', '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p'],
        22=>['삼략(계략)', '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p'],
        23=>['청낭서(의술)', '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 20% 확률로 치료 발동(아군 피해 1/3 감소)'],
@@ -973,7 +973,7 @@ function updateNationState() {
    $connect=$db->get();

    $history = array();
-    $admin = $gameStor->getValues(['year', 'month', 'fiction', 'startyear', 'show_img_level', 'turnterm', 'turntime']);
+    $admin = $gameStor->getValues(['year', 'month', 'fiction', 'startyear', 'show_img_level', 'turnterm', 'turntime', 'killturn']);

    $query = "select nation,name,level,gennum,tech from nation";
    $nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1005,8 +1005,10 @@ function updateNationState() {
        }

        if($nationlevel > $nation['level']) {
+            $levelDiff = $nationlevel - $nation['level'];
            $oldLevel = $nation['level'];
            $nation['level'] = $nationlevel;
+            

            switch($nationlevel) {
                case 7:
@@ -1031,6 +1033,34 @@ function updateNationState() {
            }

            
+            foreach(range(1, $levelDiff) as $idx){
+                //유니크 아이템 하나 돌리자
+                $targetKillTurn = $admin['killturn'];
+                $targetKillTurn -= 24 * 60 / $admin['turnterm'];
+                $nationGenList = $db->query('SELECT no, level, belong, horse, weap, book, item FROM general WHERE nation = %i AND killturn >= %i AND npc < 2', $nation['nation'], $targetKillTurn);
+                $uniqueLotteryWeightList = [];
+
+                foreach($nationGenList as $nationGen){
+                    if($nationGen['horse'] > 6 || $nationGen['weap'] > 6 || $nationGen['book'] > 6 || $nationGen['item'] > 6){
+                        continue;
+                    }
+                    $score = $nationGen['belong'] + 5; //임관 년도 + 5
+                    if($nationGen['level'] == 12){
+                        $score += 200; //NOTE: 꼬우면 군주하세요.
+                    }
+                    else if($nationGen['level'] == 11){
+                        $score += 70;
+                    }
+                    else if($nationGen['level'] > 4){
+                        $score += 35;
+                    }
+                    $uniqueLotteryWeightList[$nationGen['no']] = $score;
+                }
+                guaranteedUniqueItemLottery($uniqueLotteryWeightList, '작위보상');
+            }
+            
+
+            
            $lastAssemblerID = $gameStor->assembler_id??0;
            for($levelGen = max(1, $oldLevel) + 1; $levelGen <= $nationlevel; $levelGen+=1){
                if(in_array($levelGen, [3, 5, 7])){
@@ -1,10 +1,82 @@
 <?php
 namespace sammo;

+class AIAllowedAction{
+
+    public $develop = true;
+    public $warp = true;
+
+    public $randomRecruit = true;
+    public $recruit = true;
+    public $recruit_high = false;
+    public $train = true;
+    public $atmos = true;
+    public $battle = true;
+
+    public $appointment = true;
+    public $changeWarCondition = true;
+    public $donation = true;
+    public $buySellRice = true;
+
+    public $staffAction = true;
+
+    function __construct($npc, $aiOptions){
+        if($npc >= 2){
+            return;
+        }
+
+        $this->develop = false;
+        $this->warp = false;
+
+        $this->randomRecruit = false;
+        $this->recruit = false;
+        $this->recruit_high = false;
+        $this->train = false;
+        $this->atmos = false;
+        $this->battle = false;
+
+        $this->appointment = false;
+        $this->changeWarCondition = false;
+        $this->donation = false;
+        $this->buySellRice = true;
+
+        $this->staffAction = false;
+
+        foreach($aiOptions as $key=>$value){
+            assert($value);
+            switch($key){
+            case 'develop':
+                $this->develop = true;
+                break;
+            case 'warp':
+                $this->warp = true;
+                break;
+            case 'recruit_high': 
+                $this->recruit_high = true;
+            case 'recruit': 
+                $this->recruit = true;
+                $this->changeWarCondition = true;
+                break;
+            case 'train':
+                $this->train = true;
+                $this->atmos = true;
+                $this->changeWarCondition = true;
+                break;
+            case 'battle':
+                $this->battle = true;
+                break;
+            }
+        }
+    }
+}
+
 function SetDevelop($genType, $no, $city, $tech) {
    $db = DB::db();
    $connect=$db->get();

+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    [$startyear, $year] = $gameStor->getValuesAsArray(['startyear', 'year']);
+
    $query = "select rate,pop/pop2*100 as po,comm/comm2*100 as co,def/def2*100 as de,wall/wall2*100 as wa,secu/secu2*100 as se,agri/agri2*100 as ag from city where city='$city'";
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $city = MYDB_fetch_array($result);
@@ -43,20 +115,20 @@ function SetDevelop($genType, $no, $city, $tech) {
    case 3: //지내정장
        if($prob < 40) {
            if($city['ag'] < 99) { $command = EncodeCommand(0, 0, 0, 1); } //농업
-            elseif($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            elseif(!TechLimit($startyear, $year, $tech)) { $command = EncodeCommand(0, 0, 0, 3); } //기술
            elseif($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
            else { $command = EncodeCommand(0, 0, 0, 9); } //조달
        } elseif($prob < 80) {
            if($city['co'] < 99) { $command = EncodeCommand(0, 0, 0, 2); } //상업
-            elseif($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            elseif(!TechLimit($startyear, $year, $tech)) { $command = EncodeCommand(0, 0, 0, 3); } //기술
            elseif($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
            else { $command = EncodeCommand(0, 0, 0, 9); } //조달
        } elseif($prob < 90) {
-            if($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            if(!TechLimit($startyear, $year, $tech)) { $command = EncodeCommand(0, 0, 0, 3); } //기술
            elseif($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
            else { $command = EncodeCommand(0, 0, 0, 9); } //조달
        } else {
-            if($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3 + (rand() % 2) * 6); } //기술, 조달
+            if(!TechLimit($startyear, $year, $tech)) { $command = EncodeCommand(0, 0, 0, 3 + (rand() % 2) * 6); } //기술, 조달
            else { $command = EncodeCommand(0, 0, 0, 29); }
        }
        break;
@@ -80,7 +152,7 @@ function SetDevelop($genType, $no, $city, $tech) {
    return;
 }

-function SetCrew($no, $nationID, $personal, $gold, $leader, $genType, $tech, $dex0, $dex10, $dex20, $dex30, $dex40) {
+function SetCrew($no, $nationID, $personal, $gold, $leader, $genType, $tech, $dex0, $dex10, $dex20, $dex30, $dex40, $currentCrewType, AIAllowedAction $allowedAction) {
    $db = DB::db();
    $connect=$db->get();

@@ -157,7 +229,13 @@ function SetCrew($no, $nationID, $personal, $gold, $leader, $genType, $tech, $de
    }

    if($types){
-        $type = Util::choiceRandom($types);
+        if(!$allowedAction->randomRecruit && in_array($currentCrewType, $types) && $type != GameUnitConst::DEFAULT_CREWTYPE){
+            $type = $currentCrewType;
+        }
+        else{
+            $type = Util::choiceRandom($types);
+        }
+        
    }
    else{
        $type = GameUnitConst::DEFAULT_CREWTYPE;
@@ -172,19 +250,25 @@ function SetCrew($no, $nationID, $personal, $gold, $leader, $genType, $tech, $de

    $crew = intdiv($gold, $cost);
    if($leader < $crew) { $crew = $leader; }
-    $command = EncodeCommand(0, $type, $crew, 11);
+
+    if($allowedAction->recruit_high && $crew * $cost * 6 < $gold){
+        $command = EncodeCommand(0, $type, $crew, 12);
+    }
+    else{
+        $command = EncodeCommand(0, $type, $crew, 11);
+    }

    $query = "update general set turn0='$command' where no='$no'";
    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    return;
 }

-function processAI($no) {
+function processAI($no, &$reduce_turn) {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $connect=$db->get();

-    $admin = $gameStor->getValues(['startyear','year','month','turnterm','scenario','gold_rate','rice_rate']);
+    $admin = $gameStor->getValues(['startyear','year','month','turnterm','scenario','gold_rate','rice_rate','killturn','autorun_user']);
    // 초반 여부
    if($admin['startyear']+2 > $admin['year'] || ($admin['startyear']+2 == $admin['year'] && $admin['month'] < 5)) {
        $isStart = 1;
@@ -192,7 +276,8 @@ function processAI($no) {
        $isStart = 0;
    }

-    $query = "select no,turn0,npcid,name,nation,nations,city,level,npcmsg,personal,leader,intel,power,gold,rice,crew,train,atmos,troop,npc,affinity,mode,injury,picture,imgsvr,killturn,makelimit,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
+
+    $query = "select no,turn0,npcid,name,nation,nations,city,level,npcmsg,personal,leader,intel,power,gold,rice,crew,crewtype,train,atmos,troop,npc,affinity,mode,injury,picture,imgsvr,killturn,makelimit,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
    $result = MYDB_query($query, $connect) or Error("processAI01 ".MYDB_error($connect),"");
    $general = MYDB_fetch_array($result);

@@ -237,15 +322,55 @@ function processAI($no) {
        return;
    }

+    $autorun_user = $admin['autorun_user'];
+    if($general['npc'] < 2){
+        $autorun_limit_minutes = $autorun_user['limit_minutes']??0;
+        if(!$autorun_limit_minutes){
+            return;
+        }
+        if($general['nation'] == 0){
+            return;
+        }
+        $blankTurnCnt = $admin['killturn']-$general['killturn'];
+        if($blankTurnCnt * $admin['turnterm'] > $autorun_limit_minutes){
+            return;
+        }
+    }
+
    // 입력된 턴이 있으면 그것 실행
    if(DecodeCommand($general['turn0'])[0] != 0) {
        return;
    }

-    $query = "select city,region,nation,level,path,rate,gen1,gen2,gen3,pop,supply,front from city where city='{$general['city']}'";
+    $reduce_turn = true;
+
+    $allowedAction = new AIAllowedAction($general['npc'], $autorun_user['options']??[]);
+    if($general['troop'] && $allowedAction->warp){
+        $troopLeader = $db->query(
+            'SELECT general.no,general.name,general.city,turn0,troop,general.nation, city.nation AS city_nation FROM general JOIN city ON city.city = general.city WHERE troop = %i', $general['troop']
+        );
+
+        if(DecodeCommand($troopLeader['turn0'])[0] != 26){
+            //valid
+        }
+        else if($troopLeader['nation'] == $troopLeader['city_nation']){
+            //valid
+        }
+        else{
+            $allowedAction->warp = false;
+        }
+    }
+
+    $query = "select city,region,nation,level,path,rate,gen1,gen2,gen3,pop,supply,front,trade from city where city='{$general['city']}'";
    $result = MYDB_query($query, $connect) or Error("processAI02 ".MYDB_error($connect),"");
    $city = MYDB_fetch_array($result);

+    if ($general['npc'] < 2 && $allowedAction->buySellRice) {
+        if($city['trade'] == 0){
+            $allowedAction->buySellRice = false;
+        }
+    }
+
    $query = "select nation,level,tech,gold,rice,rate,type,color,name,war from nation where nation='{$general['nation']}'";
    $result = MYDB_query($query, $connect) or Error("processAI03 ".MYDB_error($connect),"");
    $nation = MYDB_fetch_array($result)??[
@@ -324,17 +449,20 @@ function processAI($no) {
    $tech = getTechCost($nation['tech']);
    $resrc = $tech * 700;//XXX: 왜 700이지?

-    if($general['atmos'] >= 90 && $general['train'] >= 90) {
-        if($general['mode'] == 0) {
-            $query = "update general set mode=1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
-        }
-    } else {
-        if($general['mode'] == 1) {
-            $query = "update general set mode=0 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
+    if($allowedAction->changeWarCondition){
+        if($general['atmos'] >= 90 && $general['train'] >= 90) {
+            if($general['mode'] == 0) {
+                $query = "update general set mode=1 where no='{$general['no']}'";
+                MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
+            }
+        } else {
+            if($general['mode'] == 1) {
+                $query = "update general set mode=0 where no='{$general['no']}'";
+                MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
+            }
        }
    }
+    

    //운영자메시지 출력 하루 6번..?
    //특별 메세지 있는 경우 출력 하루 4번
@@ -366,7 +494,7 @@ function processAI($no) {

        $rulerNation = $db->queryFirstField('SELECT nation FROM general WHERE `level`=12 AND npc=9 and nation not in %li ORDER BY RAND() limit 1', Json::decode($general['nations']));
        
-        if($ruler) {
+        if($rulerNation) {
            $command = EncodeCommand(0, 0, $rulerNation, 25); //임관
        } else {
            $command = EncodeCommand(0, 0, 0, 42); //견문
@@ -374,7 +502,7 @@ function processAI($no) {
        $query = "update general set turn0='$command' where no='{$general['no']}'";
        MYDB_query($query, $connect) or Error("processAI07 ".MYDB_error($connect),"");
        return;
-    } elseif($general['npc'] != 9 && $general['level'] == 0) {
+    } elseif($general['npc'] != 9 && $general['level'] == 0 && $allowedAction->appointment) {
        switch(Util::choiceRandomUsingWeight([11.4, 40, 20, 28.6])) {
        //임관 10%
        case 0:
@@ -399,7 +527,7 @@ function processAI($no) {
            }
            else{
                //랜임 커맨드 입력.
-                $command = EncodeCommand(0, 0, 99, 25); //임관
+                $command = EncodeCommand(0, 99, 0, 25); //임관
            }
            break;
        case 1: //거병이나 견문 40%
@@ -429,7 +557,7 @@ function processAI($no) {

    $rulerCommand = 0;
    //군주가 할일
-    if($general['level'] == 12) {
+    if($general['level'] == 12 && $allowedAction->staffAction) {
        //오랑캐인데 공격 못하면 바로 방랑/해산
        if($general['npc'] == 9 && $dipState == 0 && !$attackable) {
            //방랑군이냐 아니냐
@@ -544,7 +672,7 @@ function processAI($no) {
    }

    //방랑군 아니고, 입력된 턴이 없을때 수뇌부가 할일
-    if($nation['level'] != 0 && $general['level'] >= 5 && $rulerCommand == 0) {
+    if($nation['level'] != 0 && $general['level'] >= 5 && $rulerCommand == 0 && $allowedAction->staffAction) {
        $command = NPCStaffWork($general, $nation, $dipState);
        if($command){
            $db->update('nation', [
@@ -566,7 +694,7 @@ function processAI($no) {
    } elseif($general['injury'] > 10) {
    // 부상 2달 이상이면 요양
        $command = EncodeCommand(0, 0, 0, 50);  //요양
-    } elseif($nation['level'] == 0) {
+    } elseif($nation['level'] == 0 && $allowedAction->appointment) {
    //방랑군일때
        if($admin['startyear']+3 <= $admin['year']) {
            $command = EncodeCommand(0, 0, 0, 45); //하야
@@ -588,7 +716,7 @@ function processAI($no) {
            return;
        }

-        if($general['leader'] < 40){
+        if($general['leader'] < 40 && $allowedAction->donation){
            //무지장인데
            
            if(
@@ -623,7 +751,7 @@ function processAI($no) {
        }

        //국가 병량이 없을때 바로 헌납
-        if($nation['rice'] < 2000 && $general['rice'] > 200) {
+        if($nation['rice'] < 2000 && $general['rice'] > 200 && $allowedAction->donation) {
            $amount = intdiv($general['rice'] - 200, 100) + 1;
            if($amount > 20) { $amount = 20; }
            $command = EncodeCommand(0, 2, $amount, 44);  //헌납
@@ -643,23 +771,23 @@ function processAI($no) {
        
        $target = array();
        // 평시거나 초반아니면서 공격가능 없으면서 병사 있으면 해제(25%)
-        if($dipState == 0 && $isStart == 0 && !$attackable && $general['crew'] > 0 && rand()% 100 < 25) {
+        if($allowedAction->recruit && $dipState == 0 && $isStart == 0 && !$attackable && $general['crew'] > 0 && rand()% 100 < 25) {
            $command = EncodeCommand(0, 0, 0, 17);    //소집해제
        } elseif($dipState <= 1 || $isStart == 1) {
        //평시이거나 선포있어도 초반이면
            if($general['gold'] + $general['rice'] < 200) { $command = EncodeCommand(0, 0, 0, 9); } //금쌀없으면 조달9
-            elseif($general['rice'] > 100 && $city['rate'] < 95) { $command = EncodeCommand(0, 0, 0, 4); } //우선 선정
-            elseif($general['gold'] < 100) {                                      //금없으면 쌀팜
+            elseif($general['rice'] > 100 && $city['rate'] < 95 && $allowedAction->develop) { $command = EncodeCommand(0, 0, 0, 4); } //우선 선정
+            elseif($general['gold'] < 100 && $allowedAction->buySellRice) {                                      //금없으면 쌀팜
                $amount = intdiv(($general['rice'] - $general['gold'])/2, 100);   // 100단위
                $command = EncodeCommand(0, 1, $amount, 49);                    //팜
-            } elseif($general['gold'] < 500 && $general['rice'] < 500) { $command = EncodeCommand(0, 0, 0, 1); } //금쌀되면 내정
-            elseif($general['rice'] < 100) {                                      //쌀없으면 쌀삼
+            } elseif($general['gold'] < 500 && $general['rice'] < 500 && $allowedAction->develop) { $command = EncodeCommand(0, 0, 0, 1); } //금쌀되면 내정
+            elseif($general['rice'] < 100 && $allowedAction->buySellRice) {                                      //쌀없으면 쌀삼
                $amount = intdiv(($general['gold'] - $general['rice'])/2, 100);  // 100단위
                $command = EncodeCommand(0, 2, $amount, 49);                    //삼
-            } elseif($genType >= 2) { $command = EncodeCommand(0, 0, 0, 1); } //내정장일때 내정
+            } elseif($genType >= 2 && $allowedAction->develop) { $command = EncodeCommand(0, 0, 0, 1); } //내정장일때 내정
            else {
                //현도시가 전방이면 공격 가능성 체크
-                if($city['front'] > 0) {
+                if($city['front'] > 0 && $allowedAction->battle) {
                    //주변도시 체크
                    $paths = explode('|', $city['path']);
                    for($i=0; $i < count($paths); $i++) {
@@ -684,6 +812,11 @@ function processAI($no) {
                    $sel = rand() % 10;
                    if($selCity['dev'] > 95) { $sel = 9; }
                    elseif($selCity['dev'] < 70) { $sel = 0; }
+
+                    if(!$allowedAction->warp){
+                        $sel = 0;
+                    }
+
                    switch($sel) {
                    case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: // 그대로 내정 80 %
                        $command = EncodeCommand(0, 0, 0, 1);
@@ -726,22 +859,22 @@ function processAI($no) {

                } else {                // 공격인 경우
                    if($general['crew'] < 1000 && $general['gold'] >= $resrc && $general['rice'] >= $resrc) { //자원되고, 병사없을때
-                        if($city['pop'] > 40000) { $command = EncodeCommand(0, 0, 0, 11); }
+                        if($city['pop'] > 40000 && $allowedAction->recruit) { $command = EncodeCommand(0, 0, 0, 11); }
                        else { $command = EncodeCommand(0, 0, 0, 1); }
-                    } elseif($general['rice'] < $resrc && $general['rice'] <= $general['gold']) {
+                    } elseif($general['rice'] < $resrc && $general['rice'] <= $general['gold'] && $allowedAction->buySellRice) {
                        //금이 더 많으면 매매
                        $amount = intdiv(($general['gold'] - $general['rice']) / 2, 100);  // 100단위
                        if($amount > 0) { $command = EncodeCommand(0, 2, $amount, 49); }//삼
                        else { $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1); }   // 내정, 조달
-                    } elseif($general['gold'] < $resrc && $general['rice'] > $general['gold']) {
+                    } elseif($general['gold'] < $resrc && $general['rice'] > $general['gold'] && $allowedAction->buySellRice) {
                        //쌀이 더 많으면 매매
                        $amount = intdiv(($general['rice'] - $general['gold']) / 2, 100);  // 100단위
                        if($amount > 0) { $command = EncodeCommand(0, 1, $amount, 49); }//팜
                        else { $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1); }   // 내정, 조달
                    //자원, 병사 모두 충족
-                    } elseif($general['crew'] >= 1000 && $general['train'] < 90) {
+                    } elseif($general['crew'] >= 1000 && $general['train'] < 90 && $allowedAction->train) {
                        $command = EncodeCommand(0, 0, 0, 13);  //훈련
-                    } elseif($general['crew'] >= 1000 && $general['atmos'] < 90) {
+                    } elseif($general['crew'] >= 1000 && $general['atmos'] < 90 && $allowedAction->atmos) {
                        $command = EncodeCommand(0, 0, 0, 14);  //사기진작
                    } else {
                        //공격
@@ -761,18 +894,18 @@ function processAI($no) {

        //전시일때
            if($general['gold'] + $general['rice'] < $resrc*2) { $command = EncodeCommand(0, 0, 0, 9); } //금쌀없으면 조달
-            elseif($general['rice'] > $resrc && $city['rate'] < 95 && $city['front'] == 0) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
-            elseif($general['rice'] > $resrc && $city['rate'] < 50 && $city['front'] > 0) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
-            elseif($general['gold'] < $resrc || ($general['gold'] < $resrc *2 && $general['rice'] > $resrc * 6)) {                                   // 금없으면 쌀팜
+            elseif($general['rice'] > $resrc && $city['rate'] < 95 && $city['front'] == 0 && $allowedAction->develop) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
+            elseif($general['rice'] > $resrc && $city['rate'] < 50 && $city['front'] > 0 && $allowedAction->develop) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
+            elseif(($general['gold'] < $resrc || ($general['gold'] < $resrc *2 && $general['rice'] > $resrc * 6)) && $allowedAction->buySellRice) {                                   // 금없으면 쌀팜
                $amount = intdiv(($general['rice'] - $general['gold'])/2, 100);   // 100단위
                if($amount > 0) { $command = EncodeCommand(0, 1, $amount, 49); }// 팜
                else { $command = EncodeCommand(0, 0, 0, 9); }                  // 조달
-            } elseif($general['rice'] < $resrc || ($general['rice'] < $resrc *2 && $general['gold'] > $resrc * 6)) {                                 // 쌀없으면 쌀삼
+            } elseif(($general['rice'] < $resrc || ($general['rice'] < $resrc *2 && $general['gold'] > $resrc * 6)) && $allowedAction->buySellRice) {                                 // 쌀없으면 쌀삼
                $amount = intdiv(($general['gold'] - $general['rice'])/2, 100);   // 100단위
                if($amount > 0) { $command = EncodeCommand(0, 2, $amount, 49); }// 팜
                else { $command = EncodeCommand(0, 0, 0, 9); }                  // 조달
            } elseif($genType >= 2) { $command = EncodeCommand(0, 0, 0, 1); } //내정장일때 내정
-            elseif($general['crew'] < 1000 && $general['gold'] >= $resrc && $general['rice'] >= $resrc) {
+            elseif($general['crew'] < 1000 && $general['gold'] >= $resrc && $general['rice'] >= $resrc && $allowedAction->recruit) {
                $query = "select no from general where nation='{$general['nation']}'";
                $result = MYDB_query($query, $connect) or Error("processAI16 ".MYDB_error($connect),"");
                $genCount = MYDB_num_rows($result);
@@ -792,12 +925,12 @@ function processAI($no) {
                // 전체 인구 대비 확률로 현지에서 징병
                if($city['pop'] > 40000 && 100 + $ratio - $ratio2 > $ratio3) {
                    $command = EncodeCommand(0, 0, 0, 11);  //인구 되면 징병
-                } else {
+                } else{
                    // 인구 안되면 4만 이상인 도시로 워프
                    $query = "select city from city where nation='{$general['nation']}' and pop>40000 and supply='1' order by rand() limit 0,1";
                    $result = MYDB_query($query, $connect) or Error("processAI16 ".MYDB_error($connect),"");
                    $cityCount = MYDB_num_rows($result);
-                    if($cityCount > 0) {
+                    if($cityCount > 0 && $allowedAction->warp) {
                        $selCity = MYDB_fetch_array($result);
                        //워프
                        $query = "update general set city='{$selCity['city']}' where no='{$general['no']}'";
@@ -807,17 +940,17 @@ function processAI($no) {
                        $query = "update general set turn0='$command' where no='{$general['no']}'";
                        MYDB_query($query, $connect) or Error("processAI23 ".MYDB_error($connect),"");
                        return;
-                    } else {
+                    } else if($allowedAction->develop){
                        $command = EncodeCommand(0, 0, 0, 7);  //인구 안되면 정장
                    }
                }
-            } elseif($general['crew'] >= 1000 && $general['train'] < 90) {
+            } elseif($general['crew'] >= 1000 && $general['train'] < 90 && $allowedAction->train) {
                if($general['atmos'] >= 90 && $general['train'] >= 60 && $general['mode'] == 0) {
                    $query = "update general set mode=1 where no='{$general['no']}'";
                    MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
                }
                $command = EncodeCommand(0, 0, 0, 13);  //훈련
-            } elseif($general['crew'] >= 1000 && $general['atmos'] < 90) {
+            } elseif($general['crew'] >= 1000 && $general['atmos'] < 90 && $allowedAction->atmos) {
                if($general['atmos'] >= 60 && $general['train'] >= 90 && $general['mode'] == 0) {
                    $query = "update general set mode=1 where no='{$general['no']}'";
                    MYDB_query($query, $connect) or Error("processAI05 ".MYDB_error($connect),"");
@@ -841,7 +974,7 @@ function processAI($no) {
                        if($dip['state'] == 0) $target[] = $targetCity['city'];
                    }
                }
-                if(count($target) == 0) {
+                if(count($target) == 0 && $allowedAction->warp) {
                    //전방 도시 선택, 30% 확률로 태수 있는 전방으로 워프
                    if(rand()%100 < 30) {
                        $query = "select city from city where nation='{$general['nation']}' and supply='1' and front>0 order by gen1 desc,rand() limit 0,1";
@@ -876,20 +1009,36 @@ function processAI($no) {
                    } else {
                        $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1); //공격 가능도시가 없고 워프도 안되면 내정, 조달
                    }
-                } elseif($nation['war'] == 1) {
+                } elseif($nation['war'] == 1 || !$allowedAction->battle) {
                    //전금이면 내정, 조달
                    $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1);   //내정, 조달
-                } else { $command = EncodeCommand(0, 0, $target[rand()%count($target)], 16); }  //있으면 공격
+                } else if($target){ $command = EncodeCommand(0, 0, $target[rand()%count($target)], 16); }  //있으면 공격
            }
        }
    }

    switch($command) {
    case EncodeCommand(0, 0, 0, 1): //내정
-        SetDevelop($genType, $general['no'], $general['city'], $nation['tech']);
+        if($allowedAction->develop){
+            SetDevelop($genType, $general['no'], $general['city'], $nation['tech']);
+        }
+        else{
+            $db->update('general', [
+                'turn0'=>EncodeCommand(0, 0, 0, 29)
+            ], 'no=%i', $general['no']);
+        }
+        
        return;
    case EncodeCommand(0, 0, 0, 11): //징병
-        SetCrew($general['no'], $general['nation'], $general['personal'], $general['gold'], $general['leader'], $genType, $nation['tech'], $general['dex0'], $general['dex10'], $general['dex20'], $general['dex30'], $general['dex40']);
+        if ($allowedAction->recruit) {
+            SetCrew($general['no'], $general['nation'], $general['personal'], $general['gold'], $general['leader'], $genType, $nation['tech'], $general['dex0'], $general['dex10'], $general['dex20'], $general['dex30'], $general['dex40'], $general['crewtype'], $allowedAction);
+        }
+        else{
+            $db->update('general', [
+                'turn0'=>EncodeCommand(0, 0, 0, 29)
+            ], 'no=%i', $general['no']);
+        }
+        
        return;
    default:
        $query = "update general set turn0='$command' where no='{$general['no']}'";
@@ -2528,6 +2528,73 @@ function process_50(&$general) {
    pushGenLog($general, $log);
 }

+
+function process_58(&$general) {
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+
+    $log = [];
+    $alllog = [];
+    $history = [];
+    $date = substr($general['turntime'],11,5);
+
+    $admin = $gameStor->getValues(['year', 'month', 'develcost']);
+
+    $command = DecodeCommand($general['turn0']);
+
+    $fromDexIdx = $command[1];
+    $toDexIdx = $command[2];
+
+
+    
+
+    if($general['nation'] == 0) {
+        $log[] = "<C>●</>{$admin['month']}월:재야입니다. 숙련 전환 실패. <1>$date</>";
+    } elseif($general['gold'] < $admin['develcost']) {
+        $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. 숙련 전환 실패. <1>$date</>";
+    } elseif($general['rice'] < $admin['develcost']) {
+        $log[] = "<C>●</>{$admin['month']}월:군량이 모자랍니다. 숙련 전환 실패. <1>$date</>";
+    } elseif($fromDexIdx < 0 || $fromDexIdx > 4 || $toDexIdx < 0 || $toDexIdx > 4){
+        $log[] = "<C>●</>{$admin['month']}월:올바르지 않은 병종 코드입니다. 숙련 전환 실패. <1>$date</>";
+    } elseif($general['dex'.($fromDexIdx*10)] == 0) {
+        $log[] = "<C>●</>{$admin['month']}월:전환할 병종 숙련이 없습니다. 숙련 전환 실패. <1>$date</>";
+    } else {
+
+        $fromOrigDex = $general['dex'.($fromDexIdx*10)];
+        $toOrigDex = $general['dex'.($toDexIdx*10)];
+
+        $cutDex = Util::toInt($fromOrigDex * 0.3);
+        $fromNewDex = $fromOrigDex - $cutDex;
+        $addDex = Util::toInt($cutDex * 2 / 3);
+        $toNewDex = $toOrigDex + $addDex;
+
+        $exp = 10;
+        $exp = CharExperience($exp, $general['personal']);
+
+        $fromCrewStr = GameUnitConst::allType()[$fromDexIdx];
+        $toCrewStr = GameUnitConst::allType()[$toDexIdx];
+
+
+        $josaUl = JosaUtil::pick($cutDex, '을');
+        $josaRo = JosaUtil::pick($addDex, '로');
+        $log[] = "<C>●</>{$admin['month']}월:$fromCrewStr 숙련 {$cutDex}{$josaUl} $toCrewStr 숙련 {$addDex}{$josaRo} 전환했습니다. <1>$date</>";
+
+        $general['leader2'] += 2;
+
+        $db->update('general', [
+            'resturn'=>'SUCCESS',
+            'gold'=>$db->sqleval('gold-%i', $admin['develcost']),
+            'rice'=>$db->sqleval('rice-%i', $admin['develcost']),
+            'experience'=>$db->sqleval('experience+%i',$exp),
+            'leader2'=>$general['leader2'],
+            'dex'.($fromDexIdx*10)=>$fromNewDex,
+            'dex'.($toDexIdx*10)=>$toNewDex,
+        ], 'no=%i', $general['no']);
+    }
+    pushGenLog($general, $log);
+}
+
+
 function process_99(&$general) {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -80,10 +80,11 @@ function process_25(&$general) {
    $city = MYDB_fetch_array($result);

    $command = DecodeCommand($general['turn0']);
+    $type = $command[2];
    $where = $command[1];

-    if($admin['join_mode'] == 'onlyRandom' && $where < 98){
-        $where = 99;
+    if($admin['join_mode'] == 'onlyRandom' && $type < 98){
+        $type = 99;
    }

    $nation = null;
@@ -91,7 +92,7 @@ function process_25(&$general) {
    $joinedNations = Json::decode($general['nations']);

    // 랜덤임관인 경우
-    if($general['npc'] >= 2 && $where >= 98 && !$admin['fiction'] && 1000 <= $admin['scenario'] && $admin['scenario'] < 2000){
+    if($general['npc'] >= 2 && $type >= 98 && !$admin['fiction'] && 1000 <= $admin['scenario'] && $admin['scenario'] < 2000){
        //'사실' 모드에서는 '성향'에 우선을 두되, 장수수, 랜덤에 비중을 둠
        $nations = $db->query(
            'SELECT nation.`name` as `name`,nation.nation as nation,scout,nation.`level` as `level`,gennum,`affinity` FROM nation join general on general.nation = nation.nation and general.level = 12 WHERE nation.nation not in %li and gennum < %i and scout = 0',
@@ -124,7 +125,7 @@ function process_25(&$general) {
        }
            
    }
-    else if($where >= 98) {
+    else if($type >= 98) {
        //랜임
        $generals = [];
        foreach($db->queryAllLists('SELECT count(no), nation FROM general WHERE npc <= 2 AND nation > 0 GROUP BY nation') as list($cnt, $nation)){
@@ -161,7 +162,7 @@ function process_25(&$general) {
        $randVals = [];
        foreach($nations as $idx=>$testNation){
            // 임관금지없음 국가, 방랑군 제외
-            if($where == 98 && $testNation['level'] == 0){
+            if($type == 98 && $testNation['level'] == 0){
                continue;
            }

@@ -181,7 +182,10 @@ function process_25(&$general) {
            $nation = null;
        }

-    } else {
+    } else if($type == 0) {
+        $nation = $db->queryFirstRow('SELECT `name`,nation,scout,`level` FROM nation WHERE nation=%i', $where);
+    } else if($type == 1){
+        $where = $db->queryFirstField('SELECT nation FROM general WHERE no=%i', $where)??0;
        $nation = $db->queryFirstRow('SELECT `name`,nation,scout,`level` FROM nation WHERE nation=%i', $where);
    }

@@ -192,10 +196,10 @@ function process_25(&$general) {
    
    if(!$nation) {
        $log[] = "<C>●</>{$admin['month']}월:임관할 국가가 없습니다. 임관 실패. <1>$date</>";
-        if($where >= 98 && $genLimit == GameConst::$initialNationGenLimitForRandInit){
+        if($type >= 98 && $genLimit == GameConst::$initialNationGenLimitForRandInit){
            //랜덤 모드, 초기화시에는 랜덤 임관을 대신 한턴 더 넣어준다.
            $db->update('general', [
-                'turn1'=>EncodeCommand(0, 0, $where, 25),
+                'turn1'=>EncodeCommand(0, 0, $type, 25),
            ], '`no` = %i', $general['no']);
            pushGenLog($general, $log);
            process_42($general);
@@ -217,7 +221,7 @@ function process_25(&$general) {
        $log[] = "<C>●</>{$admin['month']}월:이미 임관했었던 국가입니다. 임관 실패. <1>$date</>";
    } else {
        $josaYi = JosaUtil::pick($general['name'], '이');
-        if($where == 99 || $where == 98) {
+        if($type == 99 || $type == 98) {
            $alllog[] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} 어쩌다보니 <D><b>{$nation['name']}</b></>에 <S>임관</>했습니다.";
            $log[] = "<C>●</>{$admin['month']}월:<D>{$nation['name']}</>에 랜덤으로 임관했습니다. <1>$date</>";
            pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>에 임관");
@@ -269,7 +273,7 @@ function process_25(&$general) {
        $query = "update nation set totaltech=tech*'$gencount',gennum='$gennum' where nation='{$nation['nation']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

-        if($where < 99) {
+        if($type < 99) {
            $log = uniqueItem($general, $log);
        } else {
            $log = uniqueItem($general, $log, 2);
@@ -47,7 +47,7 @@ function turnTable() {

 function CoreTurnTable() {
    return "
-<select name=turn[] size=3 multiple style=color:white;background-color:black;font-size:13px;>
+<select name=turn[] size=6 multiple style=color:white;background-color:black;font-size:13px;>
    <option selected value=0> 1턴</option>
    <option value=1> 2턴</option>
    <option value=2> 3턴</option>
@@ -77,11 +77,13 @@ if ($admin['npcmode'] == 0) {
 }
 $color = "cyan";
 $mapTheme = $admin['map_theme'];
+$serverName = UniqueConst::$serverName;
+$serverCnt = $db->queryFirstField('SELECT count(*) FROM ng_games');
 ?>
 <!DOCTYPE html>
 <html>
 <head>
-<title><?=UniqueConst::$serverName?>: 메인</title>
+<title><?=$serverName?>: 메인</title>
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
@@ -109,6 +111,8 @@ $(function(){
    setInterval(function(){
        refreshMsg();
    }, 5000);
+
+    reloadCommandList();
 });
 </script>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
@@ -127,7 +131,7 @@ $(function(){
 <div><?=allButton()?></div>
 <table class="tb_layout bg0" style="width:1000px;">
    <tr height=50>
-        <td colspan=5 align=center><font size=4>삼국지 모의전투 HiDCHe (<font color=cyan><?=$scenario?></font>)</font></td>
+        <td colspan=5 id="server_title" align=center><font size=4>삼국지 모의전투 HiDCHe <?=$serverName.$serverCnt?>기 (<font color=cyan><?=$scenario?></font>)</font></td>
    </tr>
 <?php if ($valid == 1): ?>
    <tr height=30>
@@ -239,9 +243,9 @@ else if($session->userGrade == 4){
        <td style='width:700px;height:520px;' colspan=2>
            <?=getMapHtml($mapTheme)?>
        </td>
-        <td style='width:300px;' rowspan=4><iframe seamless="seamless" name=commandlist src='commandlist.php' style='width:300px;height:700px;' frameborder=0 marginwidth=0 marginheight=0 topmargin=0 scrolling=no></iframe></td>
+        <td style='width:300px;' rowspan=4 id='commandlist'></td>
    </tr>
-<form name=form2 action=preprocessing.php method=post target=commandlist>
+<form id='form2' name=form2>
    <tr>
        <td rowspan=3 width=50 valign=top><?=turnTable()?></td>
        <td style="width:650px;border:none;text-align:center;"><?php cityInfo(); ?></td>
@@ -152,6 +152,101 @@ if($session->userGrade < 5 && !$allowReset){
                        </div>
                    </div>

+                    <div class="form-group row">
+                        <label class="col-sm-3 col-form-label">휴식 턴 시 장수 턴</label>
+                        <div class="col-sm-9">
+                            <div class="input-group">
+                                <div class="input-group-prepend btn-group btn-group-toggle" data-toggle="buttons">
+                                    <label class="btn btn-secondary">
+                                        <input type="checkbox" class="autorun_user_chk" data-key="develop" name="autorun_develop" id="autorun_develop">내정
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="checkbox" class="autorun_user_chk" data-key="warp" name="autorun_warp" id="autorun_warp">순간이동
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="checkbox" class="autorun_user_chk" data-key="recruit" name="autorun_recruit" id="autorun_recruit">징병
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="checkbox" class="autorun_user_chk" data-key="recruit_high" name="autorun_recruit_high" id="autorun_recruit_high">모병
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="checkbox" class="autorun_user_chk" data-key="train" name="autorun_train" id="autorun_train">훈사
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="checkbox" class="autorun_user_chk" data-key="battle" name="autorun_battle" id="autorun_battle">출병
+                                    </label>
+                                </div>
+                                <div class="input-group-append">
+                                    <span class="input-group-text">유효 시간</span>
+                                </div>
+                                <select class="custom-select" name="autorun_user_minutes" id="autorun_user_minutes">
+                                        <option value="0" selected>꺼짐</option>
+                                        <option value="43200">항상</option>
+                                        <option value="10">10분</option>
+                                        <option value="20">20분</option>
+                                        <option value="30">30분</option>
+                                        <option value="60">1시간</option>
+                                        <option value="120">2시간</option>
+                                        <option value="180">3시간</option>
+                                        <option value="240">4시간</option>
+                                        <option value="360">6시간</option>
+                                        <option value="480">8시간</option>
+                                        <option value="600">10시간</option>
+                                        <option value="720">12시간</option>
+                                        <option value="1440">24시간</option>
+                                        <option value="2160">36시간</option>
+                                        <option value="2880">48시간</option>
+                                        <option value="3600">60시간</option>
+                                        <option value="4320">72시간</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!--
+                    <div class="form-group row">
+                        <label class="col-sm-3 col-form-label">휴식 턴 시 사령 턴</label>
+                        <div class="col-sm-9">
+                            <div class="input-group">
+                                <div class="input-group-prepend btn-group btn-group-toggle" data-toggle="buttons">
+                                    <label class="btn btn-secondary">
+                                        <input type="radio" name="autorun_chief_reward" id="autorun_chief_reward">포상/몰수
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="radio" name="autorun_chief_warp" id="autorun_chief_warp">발령
+                                    </label>
+                                    <label class="btn btn-secondary">
+                                        <input type="radio" name="autorun_chief_declaration" id="autorun_chief_declaration">선포
+                                    </label>
+                                </div>
+                                <div class="input-group-append">
+                                    <span class="input-group-text">유효 시간</span>
+                                </div>
+                                <select class="custom-select" name="autorun_chief_minutes" id="autorun_chief_minutes">
+                                        <option value="0" selected>꺼짐</option>
+                                        <option value="43200">항상</option>
+                                        <option value="10">10분</option>
+                                        <option value="20">20분</option>
+                                        <option value="30">30분</option>
+                                        <option value="60">1시간</option>
+                                        <option value="120">2시간</option>
+                                        <option value="180">3시간</option>
+                                        <option value="240">4시간</option>
+                                        <option value="360">6시간</option>
+                                        <option value="480">8시간</option>
+                                        <option value="600">10시간</option>
+                                        <option value="720">12시간</option>
+                                        <option value="1440">24시간</option>
+                                        <option value="2160">36시간</option>
+                                        <option value="2880">48시간</option>
+                                        <option value="3600">60시간</option>
+                                        <option value="4320">72시간</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    -->
+
                    <div class="form-group row">
                        <label for="join_mode" class="col-sm-3 col-form-label">임관 모드</label>
                        <div class="col-sm-9">
@@ -89,7 +89,8 @@ $result = ResetHelper::buildScenario(
    $options['show_img_level'],
    $options['tournament_trig'],
    $options['join_mode'],
-    $options['starttime']
+    $options['starttime'],
+    $options['autorun_user']?:null
 );

 $result['affected']=1;
@@ -32,7 +32,7 @@ $nationID = $me['nation'];
 if($isAmbassador){
    $targetType = 'ambassador';
    $targetLevel = 4;
-    if(count($genlist) > 2){
+    if($genlist && count($genlist) > 2){
        Json::die([
            'result'=>false,
            'reason'=>'외교권자는 최대 둘까지만 설정 가능합니다.'
@@ -57,7 +57,8 @@ $v->rule('required', [
    'extend',
    'join_mode',
    'npcmode',
-    'show_img_level'
+    'show_img_level',
+    'autorun_user_minutes'
 ])->rule('integer', [
    'turnterm',
    'sync',
@@ -67,6 +68,7 @@ $v->rule('required', [
    'npcmode',
    'show_img_level',
    'tournament_trig',
+    'autorun_user_minutes'
 ])->rule('in', 'join_mode', ['onlyRandom', 'full']);
 if(!$v->validate()){
    Json::die([
@@ -108,6 +110,30 @@ $npcmode = (int)$_POST['npcmode'];
 $show_img_level = (int)$_POST['show_img_level'];
 $tournament_trig = (int)$_POST['tournament_trig'];
 $join_mode = $_POST['join_mode'];
+$autorun_user_minutes = (int)$_POST['autorun_user_minutes'];
+$autorun_user_options = [];
+foreach(Util::getReq('autorun_user', 'array_string', []) as $autorun_option){
+    $autorun_user_options[$autorun_option] = 1;
+}
+
+if($autorun_user_minutes > 0 && !$autorun_user_options){
+    Json::die([
+        'result'=>false,
+        'reason'=>'적어도 자동 행동 중 하나는 선택을 해야합니다.'
+    ]);
+}
+
+if($autorun_user_minutes < 0){
+    Json::die([
+        'result'=>false,
+        'reason'=>'자동 행동 기한이 0보다 작을 수 없습니다.'
+    ]);
+}
+
+$autorun_user = $autorun_user_minutes?[
+    'limit_minutes'=>$autorun_user_minutes,
+    'options'=>$autorun_user_options
+]:null;

 if($reserve_open){
    $reserve_open = new \DateTime($reserve_open);
@@ -143,6 +169,7 @@ if($reserve_open){
        'gameConf'=>$scenarioObj->getGameConf(),
        'join_mode'=>$join_mode,
        'starttime'=>$open_date,
+        'autorun_user'=>$autorun_user
    ];

    
@@ -175,5 +202,6 @@ Json::die(ResetHelper::buildScenario(
    $show_img_level,
    $tournament_trig,
    $join_mode,
-    TimeUtil::DatetimeNow()
+    TimeUtil::DatetimeNow(),
+    $autorun_user
 ));
@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
+$session = Session::requireGameLogin([])->setReadOnly();
 $userID = Session::getUserID();

 $db = DB::db();
@@ -17,8 +17,10 @@ $commandtype = Util::getReq('commandtype', 'int');
 increaseRefresh("턴입력", 1);

 if(!$turn || $commandtype === null || $sel === null){
-    header('location:commandlist.php', true, 303);
-    die();
+    Json::die([
+        'result'=>true,
+        'reason'=>'empty command'
+    ]);
 }

 $count = count($turn);
@@ -98,6 +100,7 @@ switch($commandtype) {
    case 55: command_Single($turn, 55); break; //거병
    case 56: command_Single($turn, 56); break; //해산
    case 57: command_Single($turn, 57); break; //모반 시도
+//    case 58: command_Single($turn, 58); break; //숙련 전환

 //    case 61: command_61($turn, 61); break; //불가침
 //    case 62: command_62($turn, 62); break; //선포
@@ -22,6 +22,13 @@ $rootDB = RootDB::db();
 $oNow = new \DateTimeImmutable();
 $now = $oNow->format('Y-m-d H:i:s');

+list(
+    $year,
+    $month,
+    $maxgeneral,
+    $npcmode
+) = $gameStor->getValuesAsArray(['year', 'month', 'maxgeneral', 'npcmode']);
+
 $userNick = RootDB::db()->queryFirstField('SELECT `NAME` FROM member WHERE `NO`=%i',$userID);
 if(!$userNick){
    Json::die([
@@ -30,6 +37,8 @@ if(!$userNick){
    ]);
 }

+$db->query("lock tables general write, select_npc_token write");
+
 $pickResult = $db->queryFirstField('SELECT pick_result FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%s', $userID, $now);
 if(!$pickResult){
    Json::die([
@@ -38,7 +47,6 @@ if(!$pickResult){
    ]);
 }

-
 $pickResult = Json::decode($pickResult);
 if(!key_exists($pick, $pickResult)){
    Json::die([
@@ -50,14 +58,9 @@ $pickedNPC = $pickResult[$pick];


 $gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
-list(
-    $year,
-    $month,
-    $maxgeneral,
-    $npcmode
-) = $gameStor->getValuesAsArray(['year', 'month', 'maxgeneral', 'npcmode']);

 if(!$npcmode){
+    $db->query("unlock tables");
    Json::die([
        'result'=>false,
        'reason'=>'빙의 가능한 서버가 아닙니다'
@@ -65,12 +68,15 @@ if(!$npcmode){
 }

 if ($gencount >= $maxgeneral) {
+    $db->query("unlock tables");
    Json::die([
        'result'=>false,
        'reason'=>'더 이상 등록 할 수 없습니다.'
    ]);
 }

+
+
 //등록 시작
 $db->update('general', [
    'name2'=>$userNick,
@@ -81,7 +87,10 @@ $db->update('general', [
    'owner'=>$userID,
 ], 'owner <= 0 AND npc = 2 AND no = %i', $pick);

+
+
 if(!$db->affectedRows()){
+    $db->query("unlock tables");
    Json::die([
        'result'=>false,
        'reason'=>'장수 등록에 실패했습니다.'
@@ -90,6 +99,8 @@ if(!$db->affectedRows()){

 $db->delete('select_npc_token', 'owner=%i or valid_until < %s', $userID, $now);

+$db->query("unlock tables");
+
 $josaYi = JosaUtil::pick($userNick, '이');
 pushGeneralHistory($pickedNPC, "<C>●</>{$year}년 {$month}월:<Y>{$pickedNPC['name']}</>의 육체에 <Y>{$userNick}</>{$josaYi} 빙의되다.");
 //pushGenLog($me, $mylog);
@@ -16,6 +16,8 @@ if(!class_exists('\\sammo\\DB')){
    ]);
 }

+$templates = new \League\Plates\Engine(__dir__.'/templates');
+
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');

@@ -38,6 +40,27 @@ if(file_exists(__dir__.'/.htaccess')){
        $otherTextInfo[] = '랜덤 임관 전용';
    }

+    if($options['autorun_user']['limit_minutes']??false){
+        $auto_info = [];
+        foreach($options['autorun_user']['options'] as $auto_option => $value){
+            assert($value);
+            switch($auto_option){
+                case 'develop': $auto_info['내정'] = '내정'; break;
+                case 'warp': $auto_info['순간이동'] = '순간이동'; break;
+                case 'recruit': $auto_info['징병'] = $auto_info['징병']??'징병'; break;
+                case 'recruit_high': $auto_info['징병'] = '모병'; break;
+                case 'train': $auto_info['훈사'] = '훈련/사기진작'; break;
+                case 'battle': $auto_info['출병'] = '출병'; break;
+            }
+        }
+        $auto_info = join(', ', array_values($auto_info));
+        $otherTextInfo[] = $templates->render('tooltip', [
+            'text'=>'자율행동',
+            'info'=>$auto_info,
+            'style'=>'text-decoration:underline'
+        ]);
+    }
+
    if(!$otherTextInfo){
        $otherTextInfo = '표준';
    }
@@ -64,7 +87,7 @@ if(file_exists(__dir__.'/.htaccess')){

 //TODO: 천통시에도 예약 오픈 알림이 필요..?

-$admin = $gameStor->getValues(['isunited', 'npcmode', 'year', 'month', 'scenario', 'scenario_text', 'maxgeneral', 'turnterm', 'opentime', 'turntime']);
+$admin = $gameStor->getValues(['isunited', 'npcmode', 'year', 'month', 'scenario', 'scenario_text', 'maxgeneral', 'turnterm', 'opentime', 'turntime', 'join_mode', 'fiction', 'autorun_user']);
 $admin['maxUserCnt'] = $admin['maxgeneral'];
 $admin['npcMode'] = $admin['npcmode'];
 $admin['turnTerm'] = $admin['turnterm'];
@@ -85,6 +108,48 @@ $admin['userCnt'] = $genCnt;
 $admin['npcCnt'] = $npcCnt;
 $admin['nationCnt'] = $nationCnt;

+$admin['npcMode'] = $admin['npcMode']?'가능':'불가';
+$admin['fictionMode'] = $admin['fiction']?'가상':'사실';
+
+$otherTextInfo = [];
+
+if($admin['join_mode'] == 'onlyRandom'){
+    $otherTextInfo[] = '랜덤 임관 전용';
+}
+
+
+if($admin['autorun_user']['limit_minutes']??false){
+    
+    $auto_info = [];
+    foreach($admin['autorun_user']['options'] as $auto_option => $value){
+        assert($value);
+        switch($auto_option){
+            case 'develop': $auto_info['내정'] = '내정'; break;
+            case 'warp': $auto_info['순간이동'] = '순간이동'; break;
+            case 'recruit': $auto_info['징병'] = $auto_info['징병']??'징병'; break;
+            case 'recruit_high': $auto_info['징병'] = '모병'; break;
+            case 'train': $auto_info['훈사'] = '훈련/사기진작'; break;
+            case 'battle': $auto_info['출병'] = '출병'; break;
+        }
+    }
+    $auto_info = join(', ', array_values($auto_info));
+    $otherTextInfo[] = $templates->render('tooltip', [
+        'text'=>'자율행동',
+        'info'=>$auto_info,
+        'style'=>'text-decoration:underline'
+    ]);
+}
+
+if(!$otherTextInfo){
+    $otherTextInfo = '표준';
+}
+else{
+    $otherTextInfo = join(', ', $otherTextInfo);
+}
+
+
+$admin['otherTextInfo'] = $otherTextInfo;
+$admin['defaultStatTotal'] = GameConst::$defaultStatTotal;
 $me = [];

 $general = $db->queryFirstRow('SELECT name, picture, imgsvr from general where owner=%i', $userID);
@@ -0,0 +1,165 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+// $btn, $name, $troop
+$action = Util::getReq('action');
+$name = Util::getReq('name');
+$gen = Util::getReq('gen', 'int');
+$troop = Util::getReq('troop', 'int');
+
+//로그인 검사
+$session = Session::requireGameLogin([])->setReadOnly();
+$userID = $session::getUserID();
+
+$db = DB::db();
+
+$me = $db->queryFirstRow('SELECT `no`, name, nation, troop FROM general WHERE `owner`=%i', $userID);
+
+
+
+if($action == '부대창설'){
+    $name = trim($name);
+    if(!$name){
+        Json::die([
+            'result'=>false,
+            'reason'=>'부대 이름이 없습니다.'
+        ]);
+    }
+    if($me['troop'] != 0){
+        Json::die([
+            'result'=>false,
+            'reason'=>'이미 부대에 가입해있습니다.'
+        ]);
+    }
+    $db->insert('troop',[
+        'name'=>$name,
+        'nation'=>$me['nation'],
+        'no'=>$me['no']
+    ]);
+    $troopID = $db->insertId();
+
+    $db->update('general', [
+        'troop'=>$troopID
+    ], 'no=%i',$me['no']);
+
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+
+if($action == '부대변경'){
+    $name = trim($name);
+    if(!$name){
+        Json::die([
+            'result'=>false,
+            'reason'=>'부대 이름이 없습니다.'
+        ]);
+    }
+
+    $db->update('troop', [
+        'name'=>$name
+    ], 'no=%i',$me['no']);
+
+    if($db->affectedRows() == 0){
+        Json::die([
+            'result'=>false,
+            'reason'=>'부대장이 아닙니다.'
+        ]);
+    }
+
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+
+if($action == '부대추방'){
+    if (!$gen){
+        Json::die([
+            'result'=>false,
+            'reason'=>'장수를 지정해야 합니다.'
+        ]);
+    }
+
+    $db->update('general', [
+        'troop'=>0
+    ], 'no=%i AND troop=(SELECT troop FROM troop WHERE no = %i)', $gen, $me['no']);
+
+    if($db->affectedRows() == 0){
+        Json::die([
+            'result'=>false,
+            'reason'=>'부대장이 아니거나, 장수를 잘못 지정했습니다.'
+        ]);
+    }
+
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+
+if ($action == '부대가입') {
+    if(!$troop){
+        Json::die([
+            'result'=>false,
+            'reason'=>'부대를 지정해야 합니다.'
+        ]);
+    }
+
+    $troopLeader = $db->queryFirstField('SELECT `no` FROM troop WHERE troop=%i', $troop)?:0;
+    $troopLeaderNation = $db->queryFirstField('SELECT `nation` FROM `general` WHERE `no`=%i AND `nation`=%i', $troopLeader, $me['nation']);
+
+    if (!$troopLeaderNation) {
+        Json::die([
+            'result'=>false,
+            'reason'=>'올바른 부대장이 아닙니다.'
+        ]);
+    }
+
+    $db->update('general', [
+        'troop'=>$troop
+    ], 'no=%i', $me['no']);
+
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+
+if($action ==  "부대탈퇴") {
+
+    if($me['troop'] == 0){
+        Json::die([
+            'result'=>false,
+            'reason'=>'부대에 속해있지 않습니다.'
+        ]);
+    }
+    $troopLeader = $db->queryFirstField('SELECT `no` FROM troop WHERE troop=%i', $me['troop']);
+    
+    //부대장일 경우
+    if($troopLeader == $me['no']) {
+        // 모두 탈퇴
+        $db->update('general', [
+            'troop'=>0
+        ], 'troop=%i',$me['troop']);
+        // 부대 삭제
+        $db->delete('troop', 'troop=%i', $me['troop']);
+    } else {
+        $db->update('general', [
+            'troop'=>0
+        ], 'no=%i', $me['no']);
+    }
+
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+
+Json::die([
+    'result'=>false,
+    'reason'=>'올바르지 않은 명령입니다.'
+]);
@@ -6,4 +6,66 @@ include "func.php";



-$session = Session::requireGameLogin([])->setReadOnly();
+$session = Session::requireGameLogin([])->setReadOnly();
+
+$type = Util::getReq('type', 'int', 0);
+$sel = Util::getReq('sel', 'int', 1);
+
+if($sel <= 0 || $sel > 12){
+    $sel = 1;
+}
+
+$userID = Session::getUserID();
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+increaseRefresh("턴반복", 1);
+
+$myActionCnt = $db->queryFirstField('SELECT con FROM general WHERE `owner`=%i', $userID);
+
+$con = checkLimit($myActionCnt);
+if($con >= 2) { 
+    Json::die([
+        'result'=>false,
+        'result'=>'접속 제한입니다.'
+    ]);
+ }
+
+switch($type) {
+case 0://반복
+    $valueMap = [];
+    foreach(range($sel, GameConst::$maxTurn - 1) as $idx){
+        $src = $idx % $sel;
+        $valueMap['turn'.$idx] = $db->sqleval('%b', 'turn'.$src);
+    }
+    $db->update('general', $valueMap, 'owner=%i', $userID);
+    break;
+case 1:
+    $valueMap = [];
+    foreach(range(GameConst::$maxTurn -1, $sel, -1) as $idx){
+        $src = $idx - $sel;
+        $valueMap['turn'.$idx] = $db->sqleval('%b', 'turn'.$src);
+    }
+    foreach(range($sel -1, 0, -1) as $idx){
+        $valueMap['turn'.$idx] = EncodeCommand(0, 0, 0, 0);
+    }
+    $db->update('general', $valueMap, 'owner=%i', $userID);
+    break;
+case 2:
+    $valueMap = [];
+    foreach(range(0, GameConst::$maxTurn - $sel - 1) as $idx){
+        $src = $idx + $sel;
+        $valueMap['turn'.$idx] = $db->sqleval('%b', 'turn'.$src);
+    }
+    foreach(range(GameConst::$maxTurn - $sel, GameConst::$maxTurn - 1) as $idx){
+        $valueMap['turn'.$idx] = EncodeCommand(0, 0, 0, 0);
+    }
+    $db->update('general', $valueMap, 'owner=%i', $userID);
+    break;
+}
+
+Json::die([
+    'result'=>true,
+    'result'=>'success'
+]);
@@ -71,6 +71,8 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 $gameStor->cacheValues(['year','month','maxgeneral','scenario','show_img_level','turnterm','turntime','genius','npcmode']);
 ########## 동일 정보 존재여부 확인. ##########

+$db->query("lock tables general write, city read, storage read");
+
 $gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
 $oldGeneral = $db->queryFirstField('SELECT `no` FROM general WHERE `owner`=%i', $userID);
 $oldName = $db->queryFirstField('SELECT `no` FROM general WHERE `name`=%s', $name);
@@ -80,6 +82,7 @@ if ($oldGeneral) {
      window.alert('이미 등록하셨습니다!')
      history.go(-1)
      </script>");
+    $db->query("unlock tables");
    exit;
 }
 if ($oldName) {
@@ -87,6 +90,7 @@ if ($oldName) {
      window.alert('이미 있는 장수입니다. 다른 이름으로 등록해 주세요!')
      history.go(-1)
      </script>");
+    $db->query("unlock tables");
    exit;
 }
 if ($gameStor->maxgeneral <= $gencount) {
@@ -94,6 +98,7 @@ if ($gameStor->maxgeneral <= $gencount) {
      window.alert('더이상 등록할 수 없습니다!')
      history.go(-1)
      </script>");
+    $db->query("unlock tables");
    exit;
 }
 if (mb_strlen($name) < 1) {
@@ -101,6 +106,7 @@ if (mb_strlen($name) < 1) {
      window.alert('이름이 짧습니다. 다시 가입해주세요!')
      history.go(-1)
      </script>");
+    $db->query("unlock tables");
    exit;
 }
 if (mb_strlen($name) > 9) {
@@ -108,6 +114,7 @@ if (mb_strlen($name) > 9) {
      window.alert('이름이 유효하지 않습니다. 다시 가입해주세요!')
      history.go(-1)
      </script>");
+    $db->query("unlock tables");
    exit;
 }
 if ($leader + $power + $intel > GameConst::$defaultStatTotal) {
@@ -115,6 +122,7 @@ if ($leader + $power + $intel > GameConst::$defaultStatTotal) {
      window.alert('능력치가 ".GameConst::$defaultStatTotal."을 넘어섰습니다. 다시 가입해주세요!')
      history.go(-1)
      </script>");
+    $db->query("unlock tables");
    exit;
 }

@@ -189,8 +197,8 @@ else{

 $turntime = getRandTurn($admin['turnterm'], new \DateTimeImmutable($admin['turntime']));

-$lastconnect = date('Y-m-d H:i:s');
-if ($lastconnect >= $turntime) {
+$now = date('Y-m-d H:i:s');
+if ($now >= $turntime) {
    $turntime = addTurn($turntime, $admin['turnterm']);
 }

@@ -233,7 +241,8 @@ $db->insert('general', [
    'level' => 0,
    'turntime' => $turntime,
    'killturn' => 6,
-    'lastconnect' => $lastconnect,
+    'lastconnect' => $now,
+    'lastrefresh' => $now,
    'crewtype'=>GameUnitConst::DEFAULT_CREWTYPE,
    'makelimit' => 0,
    'age' => $age,
@@ -246,6 +255,8 @@ $db->insert('general', [
 ]);
 $generalID = $db->insertId();

+$db->query("unlock tables");
+
 $cityname = CityConst::byID($city)->name;

 $me = [
@@ -1,7 +1,10 @@
 jQuery(function($){
    $('#by_scenario').change(function(){
-        var scenarioIdx = $(this).val();
-        $.redirect('a_hallOfFame.php', {scenarioIdx:scenarioIdx}, 'get');
+        var $this = $(this);
+        var scenarioIdx = $this.val();
+        var seasonIdx = $(this).find('option:selected').data('season');
+        
+        
+        $.redirect('a_hallOfFame.php', {scenarioIdx:scenarioIdx, seasonIdx:seasonIdx}, 'get');
    })
-    //$.redirect("processing.php",{ commandtype: commandtype, turn: turn}, 'post'); 
 });
@@ -105,6 +105,22 @@ function scenarioPreview(){
 }

 function formSetup(){
+    $.validator.addMethod("autorun_user", function(value,element){
+        var parent = $(element).parent('.input-group');
+        var checkCnt = parent.find('input:checked').length;
+        if(value <= 0){
+            if(checkCnt > 0){
+                return false;
+            }
+            return true;
+        }
+
+        
+        if(checkCnt == 0){
+            return false;
+        }
+        return true;
+    }, "유효 시간과 옵션은 동시에 설정해야합니다.");
    $('#game_form').validate({
        rules:{
            turnterm:"required",
@@ -116,6 +132,7 @@ function formSetup(){
            show_img_level:"required",
            tournament_trig:"required",
            join_mode:'required',
+            autorun_user_minutes:{required: true, autorun_user: true, min:0}
        },
        errorElement: "div",
        errorPlacement: function ( error, element ) {
@@ -140,6 +157,15 @@ function formSetup(){
        if(!$("#game_form").valid()){
            return;
        }
+        
+        var autorun_user_minutes = parseInt($('#autorun_user_minutes').val());
+        var autorun_user = [];
+        if(autorun_user_minutes > 0){
+            $('.autorun_user_chk:checked').each(function(){
+                autorun_user.push($(this).data('key'));
+            });
+        }
+
        $.ajax({
            cache:false,
            type:'post',
@@ -157,6 +183,8 @@ function formSetup(){
                reserve_open:$('#reserve_open').val(),
                pre_reserve_open:$('#pre_reserve_open').val(),
                join_mode:$('#join_mode input:radio:checked').val(),
+                autorun_user_minutes:autorun_user_minutes,
+                autorun_user:autorun_user
            }
        }).then(function(result){
            var deferred = $.Deferred();
@@ -28,7 +28,7 @@ function refreshing(obj, arg1, arg2) {
    switch(arg1) {
        case 0: document.location.reload(); break;
        case 2: turn(arg2); break;
-        case 3: arg2.submit(); break;
+        case 3: $(arg2).submit(); break;
        case 4:
            arg2.submit();
            message.msg.value = "";
@@ -39,14 +39,48 @@ function refreshing(obj, arg1, arg2) {
    return false;
 }

-function moveProcessing(commandtype, turn){
-    console.log(commandtype, turn);
-    $.redirect("processing.php",{ commandtype: commandtype, turn: turn}, 'post'); 
+function turn(type) {
+    $.post({
+        url:'j_turn.php',
+        dataType:'json',
+        data:{
+            type:type,
+            sel:form2.sel.value
+        }
+    }).then(function(data){
+        if(!data.result){
+            alert(data.reason);
+        }
+        reloadCommandList();
+    });
 }

-function turn(type) {
-    num = form2.sel.value;
-    commandlist.location.replace('turn.php?type=' + type + '&sel=' + num);
+function reloadCommandList(){
+    $.get({
+        url:'commandlist.php',
+        cache: false,
+    }).then(function(rdata){
+        $('#commandlist').html(rdata);
+    });
+}
+
+function myclock() {
+
+    var $clock = $('#clock');
+    var now_clock = moment();
+
+    if(!$clock.attr('data-time-diff')){
+        var base_clock = moment($clock.attr('data-server-time'));
+        $clock.attr('data-time-diff', base_clock.diff(now_clock));
+    }
+
+    var game_clock = now_clock.add(parseInt($clock.attr('data-time-diff')), 'milliseconds');
+
+    $('#clock').val(game_clock.format('YYYY-MM-DD HH:mm:ss'));
+    
+    window.setTimeout(function(){
+        myclock();
+    }, 500);
 }

 jQuery(function($){
@@ -54,11 +88,40 @@ jQuery(function($){
        var $this = $(this);
        var target = $('[name="genlist"]').val();
        var msg = $('#msg').val();
-        console.log(target, msg);
        return false;
    });

    $('#mainBtnSubmit').click(function(){

    });
+
+    $('#form2').submit(function(){
+        var values = $(this).serializeArray();
+        console.log(values);
+        $.post({
+            url:'j_preprocessing.php',
+            dataType:'json',
+            data:values
+        }).then(function(data){
+            if(!data.result){
+                alert(data.reason);
+                reloadCommandList();
+                return;
+            }
+
+            if(!data.nextPage){
+                reloadCommandList();
+                return;
+            }
+
+            document.location = data.nextPage;
+            return;
+        }, function(){
+            alert('알 수 없는 에러');
+            location.reload();
+        });
+        return false;
+    });
+
+    myclock();
 });
@@ -95,6 +95,7 @@ switch($commandtype) {
    case 55: command_Single($turn, 55); break; //거병
    case 56: command_Single($turn, 56); break; //해산
    case 57: command_Single($turn, 57); break; //모반 시도
+    case 58: command_58(    $turn, 58); break; //숙련 전환

    case 61: command_61($turn, 61); break; //불가침
    case 62: command_62($turn, 62); break; //선포
@@ -535,7 +536,7 @@ function command_23($turn, $command) {
    $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
    $general = MYDB_fetch_array($result);

-    $query = "select no,name,level,npc from general where nation='{$general['nation']}' and no!='{$general['no']}' order by npc,binary(name)";
+    $query = "select no,name,level,gold,rice,npc from general where nation='{$general['nation']}' and no!='{$general['no']}' order by npc,binary(name)";
    $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
    $gencount = MYDB_num_rows($result);

@@ -551,10 +552,10 @@ function command_23($turn, $command) {
        else                       { $style = ""; }
        if($general['level'] >= 5) {
            echo "
-    <option value={$general['no']} {$style}>*{$general['name']}*</option>";
+    <option value={$general['no']} {$style}>*{$general['name']}*(금:{$general['gold']}, 쌀:{$general['rice']})</option>";
        } else {
            echo "
-    <option value={$general['no']} {$style}>{$general['name']}</option>";
+    <option value={$general['no']} {$style}>{$general['name']}(금:{$general['gold']}, 쌀:{$general['rice']})</option>";
        }
    }

@@ -612,7 +613,7 @@ function command_24($turn, $command) {
    $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
    $general = MYDB_fetch_array($result);

-    $query = "select no,name,level,npc from general where nation='{$general['nation']}' and no!='{$general['no']}' order by npc,binary(name)";
+    $query = "select no,name,level,gold,rice,npc from general where nation='{$general['nation']}' and no!='{$general['no']}' order by npc,binary(name)";
    $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
    $gencount = MYDB_num_rows($result);

@@ -628,11 +629,9 @@ function command_24($turn, $command) {
        elseif($general['npc'] == 1) { $style = "style=color:skyblue;"; }
        else                       { $style = ""; }
        if($general['level'] >= 5) {
-            echo "
-    <option value={$general['no']} {$style}>*{$general['name']}*</option>";
+            echo "<option value={$general['no']} {$style}>*{$general['name']}*(금:{$general['gold']}, 쌀:{$general['rice']})</option>";
        } else {
-            echo "
-    <option value={$general['no']} {$style}>{$general['name']}</option>";
+            echo "<option value={$general['no']} {$style}>{$general['name']}(금:{$general['gold']}, 쌀:{$general['rice']})</option>";
        }
    }

@@ -718,6 +717,8 @@ function command_25($turn, $command) {
        }
    }
    unset($nation);
+
+    $generalList = $db->query('SELECT no,name,nation,npc FROM general WHERE owner!=%i ORDER BY name ASC', $userID);
 ?>

 국가에 임관합니다.<br>
@@ -728,22 +729,31 @@ function command_25($turn, $command) {
 <?php else: ?>
 임관할 국가를 목록에서 선택하세요.<br>
 <?php endif; ?>
-!!!는 방랑군을 포함한 랜덤임관입니다. 유니크를 기대하신다면!<br>
-???는 방랑군을 제외한 랜덤임관입니다. 유니크 혜택은 없습니다.<br>
+임의의 국가로 임관할 경우 유니크 아이템을 얻을 기회가 높습니다.
 임관 금지이거나 초기 제한중인 국가는 붉은색 배경으로 표시됩니다.<br>
 870px x 200px를 넘어서는 내용은 표시되지 않습니다.<br>
 <form name=form1 action=c_double.php method=post>
-<select name=double size=1 style=color:white;background-color:black>
-    <option value=99 style=color:white;background-color:black;>!!!</option>
-    <option value=98 style=color:white;background-color:black;>???</option>
-
-    <?php foreach($nationList as $nation): ?>
-        <?php if(!$nation['availableJoin']): ?>
-            <option value='<?=$nation['nation']?>' style='color:<?=$nation['color']?>;background-color:red;' <?=$onlyRandom?'disabled':''?>>【 <?=$nation['name']?> 】</option>
-        <?php else: ?>
-            <option value='<?=$nation['nation']?>' style='color:<?=$nation['color']?>;' <?=$onlyRandom?'disabled':''?>>【 <?=$nation['name']?> 】</option>
-        <?php endif; ?>
-    <?php endforeach; ?>
+<input id='double' name='double' type='hidden'>
+<input id='third' name='third' type='hidden'>
+<select id='selectorV' name=value size=1 style=color:white;background-color:black>
+    <optgroup label='랜덤 임관'>
+        <option value=99 style=color:white;background-color:black;>임의의 국가</option>
+        <option value=98 style=color:white;background-color:black;>건국된 임의 국가</option>
+    </optgroup>
+    <optgroup label='국가로 임관'>
+        <?php foreach($nationList as $nation): ?>
+            <?php if(!$nation['availableJoin']): ?>
+                <option value='<?=$nation['nation']?>' style='color:<?=$nation['color']?>;background-color:red;' <?=$onlyRandom?'disabled':''?>>【 <?=$nation['name']?> 】</option>
+            <?php else: ?>
+                <option value='<?=$nation['nation']?>' style='color:<?=$nation['color']?>;' <?=$onlyRandom?'disabled':''?>>【 <?=$nation['name']?> 】</option>
+            <?php endif; ?>
+        <?php endforeach; ?>
+    </optgroup>
+    <optgroup label='장수를 따라 임관'>
+        <?php foreach($generalList as $targetGeneral): ?>
+            <option value='-<?=$targetGeneral['no']?>' <?=$onlyRandom?'disabled':''?>><?=formatName($targetGeneral['name'],$targetGeneral['npc'])?>【<?=getNationStaticInfo($targetGeneral['nation'])['name']??'재야'?>】</option>
+        <?php endforeach; ?>
+    </optgroup>
    
 </select>
 <input type=submit value=임관>
@@ -752,6 +762,29 @@ function command_25($turn, $command) {
            <input type=hidden name=turn[] value=<?=$turn[$i]?>>
    <?php endforeach; ?>
 </form>
+<script>
+$(function(){
+    var $third = $('#third');
+    var $double = $('#double');
+    var $selector = $('#selectorV');
+    $selector.on('change', function(){
+        var value=$selector.val();
+        if(value >= 98){
+            $third.val(value);
+            $double.val(0);
+        }
+        else if(value>0){
+            $third.val(0);
+            $double.val(value);
+        }
+        else{
+            $third.val(1);
+            $double.val(-value);
+        }
+    });
+    $selector.val(99).trigger('change');
+});
+</script>
 <?php
    echo getInvitationList($nationList);

@@ -769,7 +802,7 @@ function command_27($turn, $command) {
    $result = MYDB_query($query, $connect) or Error("command_27 ".MYDB_error($connect),"");
    $me = MYDB_fetch_array($result);

-    $query = "select no,name,level,npc from general where nation='{$me['nation']}' and no!='{$me['no']}' order by npc,binary(name)";
+    $query = "select no,name,city,level,npc from general where nation='{$me['nation']}' and no!='{$me['no']}' order by npc,binary(name)";
    $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
    $gencount = MYDB_num_rows($result);

@@ -783,15 +816,16 @@ function command_27($turn, $command) {

    for($i=0; $i < $gencount; $i++) {
        $general = MYDB_fetch_array($result);
+        $cityName = CityConst::byID($general['city'])->name;
        if    ($general['npc'] >= 2) { $style = "style=color:cyan;"; }
        elseif($general['npc'] == 1) { $style = "style=color:skyblue;"; }
        else                       { $style = ""; }
        if($general['level'] >= 5) {
            echo "
-    <option value={$general['no']} {$style}>*{$general['name']}*</option>";
+    <option value={$general['no']} {$style}>*{$general['name']}*({$cityName})</option>";
        } else {
            echo "
-    <option value={$general['no']} {$style}>{$general['name']}</option>";
+    <option value={$general['no']} {$style}>{$general['name']}({$cityName})</option>";
        }
    }

@@ -1724,6 +1758,56 @@ function command_54($turn, $command) {
    ender();
 }

+function command_58($turn, $command) {
+    $db = DB::db();
+    $connect=$db->get();
+    $userID = Session::getUserID();
+
+    starter("숙련 전환");
+
+    $dexVals = $db->queryFirstList('SELECT dex0, dex10, dex20, dex30, dex40 FROM general WHERE owner = %i', $userID);
+
+    $dexTexts = [];
+    foreach($dexVals as $idx => $val){
+        $prevDexLevel = getDexCall($val);
+        $newDexLevel = getDexCall(Util::toInt($val * 0.7));
+        $addDex = Util::toInt(($val - $val * 0.7) * 0.5);
+        $dexTexts[$idx] = "$prevDexLevel ⇒ $newDexLevel, {$addDex} 전환";
+    }
+
+    echo "
+본인의 특정 병종 숙련을 30% 줄이고, 줄어든 숙련 중 2/3(20%p)를 다른 병종 숙련으로 전환합니다.<br>
+<form name=form1 action=c_double.php method=post>
+<select name=double size=1 style=color:white;background-color:black>
+    <option value=0>보병 ({$dexTexts[0]})</option>
+    <option value=1>궁병 ({$dexTexts[1]})</option>
+    <option value=2>기병 ({$dexTexts[2]})</option>
+    <option value=3>귀병 ({$dexTexts[3]})</option>
+    <option value=4>차병 ({$dexTexts[4]})</option>
+</select>
+숙련을 
+<select name=third size=1 style=color:white;background-color:black>
+    <option value=0>보병 ({$dexVals[0]})</option>
+    <option value=1>궁병 ({$dexVals[1]})</option>
+    <option value=2>기병 ({$dexVals[2]})</option>
+    <option value=3>귀병 ({$dexVals[3]})</option>
+    <option value=4>차병 ({$dexVals[4]})</option>
+</select>
+으로
+<input type=submit value=전환>
+<input type=hidden name=command value=$command>";
+    for($i=0; $i < count($turn); $i++) {
+        echo "
+            <input type=hidden name=turn[] value=$turn[$i]>";
+    }
+
+    echo "
+</form>
+";
+
+    ender();
+}
+
 function command_61($turn, $command) {
    $db = DB::db();
    $connect=$db->get();
@@ -81,11 +81,22 @@ class ResetHelper{
        mkdir($servRoot.'/logs/'.$serverID, 0755);
        mkdir($servRoot.'/data/'.$serverID, 0755);

+        $seasonIdx = 1;
+        if($db->queryFirstField('SHOW TABLES LIKE %s', 'storage') !== null){
+            $gameStor = KVStorage::getStorage($db, 'game_env');
+            $nextSeasonIdx = $gameStor->next_season_idx;
+            if($nextSeasonIdx !== null){
+                $seasonIdx = $nextSeasonIdx;
+            }
+            $gameStor->resetCache();
+        }
+
        $result = Util::generateFileUsingSimpleTemplate(
            $servRoot.'/d_setting/UniqueConst.orig.php',
            $servRoot.'/d_setting/UniqueConst.php',[
                'serverID'=>$serverID,
                'serverName'=>AppConf::getList()[$prefix]->getKorName(),
+                'seasonIdx'=>$seasonIdx
            ], true
        );

@@ -112,11 +123,14 @@ class ResetHelper{
            }
        }

-        (KVStorage::getStorage($db, 'game_env'))->resetValues();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $gameStor->resetValues();
+        $gameStor->next_season_idx = $seasonIdx;

        return [
            'result'=>true,
-            'serverID'=>$serverID
+            'serverID'=>$serverID,
+            'seasonIdx'=>$seasonIdx
        ];
    }

@@ -130,7 +144,8 @@ class ResetHelper{
        int $show_img_level,
        int $tournament_trig,
        string $join_mode,
-        string $turntime
+        string $turntime,
+        ?array $autorun_user
    ):array{
        //FIXME: 분리할 것
        if(120 % $turnterm != 0){
@@ -153,6 +168,7 @@ class ResetHelper{
        }

        $serverID = $clearResult['serverID'];
+        $seasonIdx = $clearResult['seasonIdx'];
        
        $scenarioObj = new Scenario($scenario, false);
        $scenarioObj->buildConf();
@@ -222,7 +238,7 @@ class ResetHelper{
            'msg'=>'공지사항',//TODO:공지사항
            'maxgeneral'=>GameConst::$defaultMaxGeneral,
            'maxnation'=>GameConst::$defaultMaxNation,
-            'conlimit'=>300,
+            'conlimit'=>30000,
            'gold_rate'=>100,
            'rice_rate'=>100,
            'develcost'=>$develcost,
@@ -238,7 +254,8 @@ class ResetHelper{
            'extended_general'=>$extend,
            'fiction'=>$fiction,
            'tnmt_trig'=>$tournament_trig,
-            'prev_winner'=>$prevWinner
+            'prev_winner'=>$prevWinner,
+            'autorun_user'=>$autorun_user
        ];

        foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){
@@ -262,6 +279,7 @@ class ResetHelper{
            'date'=>$turntime,
            'winner_nation'=>null,
            'map'=>$scenarioObj->getMapTheme(),
+            'season'=>$seasonIdx,
            'scenario'=>$scenario,
            'scenario_name'=>$scenarioObj->getTitle(),
            'env'=>Json::encode($env)
@@ -314,12 +314,12 @@ class WarUnitGeneral extends WarUnit{
        }
        else if($item >= 14 && $item <= 16){
            //의적주, 두강주, 보령압주 사용
-            $this->addAtmosBonus(5);
+            $this->addAtmosBonus(10);
            $itemActivated = true;
        }
        else if($item >= 19 && $item <= 20){
            //춘화첩, 초선화 사용
-            $this->addAtmosBonus(7);
+            $this->addAtmosBonus(14);
            $itemActivated = true;
        }
        else if($item == 4){
@@ -330,12 +330,12 @@ class WarUnitGeneral extends WarUnit{
        }
        else if($item >= 12 && $item <= 13){
            //과실주, 이강주 사용
-            $this->addTrainBonus(5);
+            $this->addTrainBonus(10);
            $itemActivated = true;
        }
-        else if($item >= 18 && $item <= 18){
+        else if($item >= 17 && $item <= 18){
            //철벽서, 단결도 사용
-            $this->addTrainBonus(7);
+            $this->addTrainBonus(14);
            $itemActivated = true;
        }

@@ -23,18 +23,18 @@
    },
    "diplomacy":[],
    "general":[
-        [0, "이윤열", null, 0, null, 101, 103, 103, 0, 1985, 2190, null, null],
-        [0, "임요환", null, 0, null, 94, 93, 101, 0, 1985, 2190, null, null],
-        [0, "이영호", null, 0, null, 111, 108, 108, 0, 1985, 2190, null, null],
-        [0, "서지훈", null, 0, null, 93, 95, 88, 0, 1985, 2190, null, null],
-        [0, "전상욱", null, 0, null, 89, 87, 84, 0, 1985, 2190, null, null],
+        [0, "이윤열", null, 0, null, 110, 105, 111, 0, 1985, 2190, null, null, "전 전설로 남고 싶셒습니다"],
+        [0, "임요환", null, 0, null, 95, 100, 112, 0, 1985, 2190, null, null, "역시 콩은 까야 제맛이지"],
+        [0, "이영호", null, 0, null, 115, 111, 111, 0, 1985, 2190, null, null, "정말 득도를 했어요 정말 스타를 깨달았어요!"],
+        [0, "서지훈", null, 0, null, 99, 99, 96, 0, 1985, 2190, null, null, "엄마 많이 사랑해요!"],
+        [0, "전상욱", null, 0, null, 93, 90, 91, 0, 1985, 2190, null, null],
        [0, "염보성", null, 0, null, 90, 88, 86, 0, 1985, 2190, null, null],
-        [0, "최연성", null, 0, null, 104, 110, 99, 0, 1985, 2190, null, null],
+        [0, "최연성", null, 0, null, 112, 115, 100, 0, 1985, 2190, null, null, "별로.. 별로 안좋아요"],
        [0, "이재호", null, 0, null, 91, 86, 81, 0, 1985, 2190, null, null],
        [0, "변형태", null, 0, null, 89, 93, 79, 0, 1985, 2190, null, null],
        [0, "구성훈", null, 0, null, 76, 79, 81, 0, 1985, 2190, null, null],
-        [0, "정명훈", null, 0, null, 99, 100, 99, 0, 1985, 2190, null, null],
-        [0, "박성균", null, 0, null, 90, 82, 93, 0, 1985, 2190, null, null],
+        [0, "정명훈", null, 0, null, 102, 100, 99, 0, 1985, 2190, null, null],
+        [0, "박성균", null, 0, null, 94, 93, 98, 0, 1985, 2190, null, null],
        [0, "신상문", null, 0, null, 91, 94, 81, 0, 1985, 2190, null, null],
        [0, "이성은", null, 0, null, 89, 95, 79, 0, 1985, 2190, null, null],
        [0, "한동욱", null, 0, null, 94, 91, 96, 0, 1985, 2190, null, null],
@@ -85,7 +85,7 @@
        [0, "오세기", null, 0, null, 46, 33, 68, 0, 1985, 2190, null, null],
        [0, "백승혁", null, 0, null, 55, 30, 47, 0, 1985, 2190, null, null],
        [0, "모상호", null, 0, null, 55, 60, 65, 0, 1985, 2190, null, null],
-        [0, "김대기", null, 0, null, 57, 55, 35, 0, 1985, 2190, null, null],
+        [0, "김대기", null, 0, null, 70, 70, 70, 0, 1985, 2190, null, null],
        [0, "박상규", null, 0, null, 46, 46, 68, 0, 1985, 2190, null, null],
        [0, "최은창", null, 0, null, 50, 37, 46, 0, 1985, 2190, null, null],
        [0, "김우영", null, 0, null, 59, 46, 30, 0, 1985, 2190, null, null],
@@ -140,17 +140,17 @@
        [0, "김용호", null, 0, null, 45, 67, 56, 0, 1985, 2190, null, null],
        [0, "김도욱", null, 0, null, 41, 40, 22, 0, 1985, 2190, null, null],
        [0, "서지수", null, 0, null, 100, 100, 100, 0, 1985, 2190, null, null],
-        [0, "송병구", null, 0, null, 100, 100, 98, 0, 1985, 2190, null, null],
-        [0, "김택용", null, 0, null, 109, 105, 103, 0, 1985, 2190, null, null],
+        [0, "송병구", null, 0, null, 102, 102, 98, 0, 1985, 2190, null, null],
+        [0, "김택용", null, 0, null, 110, 105, 105, 0, 1985, 2190, null, null],
        [0, "박정석", null, 0, null, 98, 95, 90, 0, 1985, 2190, null, null],
        [0, "강민", null, 0, null, 99, 94, 99, 0, 1985, 2190, null, null],
        [0, "윤용태", null, 0, null, 93, 99, 79, 0, 1985, 2190, null, null],
        [0, "김구현", null, 0, null, 88, 91, 70, 0, 1985, 2190, null, null],
-        [0, "허영무", null, 0, null, 94, 94, 94, 0, 1985, 2190, null, null],
+        [0, "허영무", null, 0, null, 97, 97, 97, 0, 1985, 2190, null, null, "게임 알지도 못하는 놈들아 너네들이 와서 함 해볼래!?"],
        [0, "박지호", null, 0, null, 81, 94, 69, 0, 1985, 2190, null, null],
        [0, "전태규", null, 0, null, 83, 87, 75, 0, 1985, 2190, null, null],
-        [0, "오영종", null, 0, null, 93, 85, 93, 0, 1985, 2190, null, null],
-        [0, "도재욱", null, 0, null, 108, 96, 79, 0, 1985, 2190, null, null],
+        [0, "오영종", null, 0, null, 97, 88, 96, 0, 1985, 2190, null, null],
+        [0, "도재욱", null, 0, null, 103, 101, 79, 0, 1985, 2190, null, null],
        [0, "박영민", null, 0, null, 78, 73, 68, 0, 1985, 2190, null, null],
        [0, "기욤패트리", null, 0, null, 93, 91, 91, 0, 1985, 2190, null, null],
        [0, "안기효", null, 0, null, 81, 76, 73, 0, 1985, 2190, null, null],
@@ -179,7 +179,7 @@
        [0, "한동훈", null, 0, null, 61, 63, 46, 0, 1985, 2190, null, null],
        [0, "김민제", null, 0, null, 51, 43, 58, 0, 1985, 2190, null, null],
        [0, "신재욱", null, 0, null, 50, 40, 31, 0, 1985, 2190, null, null],
-        [0, "손석희", null, 0, null, 55, 43, 52, 0, 1985, 2190, null, null],
+        [0, "손석희", null, 0, null, 40, 20, 89, 0, 1985, 2190, null, null],
        [0, "손재범", null, 0, null, 60, 36, 62, 0, 1985, 2190, null, null],
        [0, "노영훈", null, 0, null, 55, 36, 54, 0, 1985, 2190, null, null],
        [0, "김인기", null, 0, null, 59, 31, 64, 0, 1985, 2190, null, null],
@@ -193,7 +193,7 @@
        [0, "김학수", null, 0, null, 47, 40, 41, 0, 1985, 2190, null, null],
        [0, "임효진", null, 0, null, 61, 31, 33, 0, 1985, 2190, null, null],
        [0, "윤현욱", null, 0, null, 47, 49, 49, 0, 1985, 2190, null, null],
-        [0, "변현제", null, 0, null, 51, 33, 42, 0, 1985, 2190, null, null],
+        [0, "변현제", null, 0, null, 51, 33, 79, 0, 1985, 2190, null, null],
        [0, "최홍희", null, 0, null, 57, 44, 48, 0, 1985, 2190, null, null],
        [0, "정경두", null, 0, null, 47, 39, 60, 0, 1985, 2190, null, null],
        [0, "최수민", null, 0, null, 55, 56, 47, 0, 1985, 2190, null, null],
@@ -245,7 +245,6 @@
        [0, "김진", null, 0, null, 53, 30, 49, 0, 1985, 2190, null, null],
        [0, "hao lei", null, 0, null, 53, 35, 32, 0, 1985, 2190, null, null],
        [0, "김승엽", null, 0, null, 56, 30, 45, 0, 1985, 2190, null, null],
-        [0, "윤지현", null, 0, null, 47, 50, 36, 0, 1985, 2190, null, null],
        [0, "이상길", null, 0, null, 50, 63, 60, 0, 1985, 2190, null, null],
        [0, "정재우P", null, 0, null, 59, 37, 30, 0, 1985, 2190, null, null],
        [0, "곽기성", null, 0, null, 50, 38, 49, 0, 1985, 2190, null, null],
@@ -260,15 +259,15 @@
        [0, "정정호", null, 0, null, 50, 39, 31, 0, 1985, 2190, null, null],
        [0, "구찬우", null, 0, null, 60, 30, 41, 0, 1985, 2190, null, null],
        [0, "원선재", null, 0, null, 46, 39, 52, 0, 1985, 2190, null, null],
-        [0, "콩", null, 0, null, 22, 22, 22, 0, 1985, 2190, null, null],
-        [0, "이제동", null, 0, null, 103, 101, 100, 0, 1985, 2190, null, null],
-        [0, "홍진호", null, 0, null, 92, 102, 83, 0, 1985, 2190, null, null],
-        [0, "박성준", null, 0, null, 97, 100, 91, 0, 1985, 2190, null, null],
-        [0, "박태민", null, 0, null, 98, 88, 97, 0, 1985, 2190, null, null],
+        [0, "콩", null, 0, null, 22, 22, 22, 0, 1985, 2190, null, null, "Chili Con Carne Chili Con Carne"],
+        [0, "이제동", null, 0, null, 109, 113, 106, 0, 1985, 2190, null, null],
+        [0, "홍진호", null, 0, null, 100, 102, 98, 0, 1985, 2190, null, null, "오늘의 전 홍진호도 아니고 폭풍저그도 아니었습니다. 그냥.. 그냥.. 저그 였습니다. 저그.."],
+        [0, "박성준", null, 0, null, 101, 109, 95, 0, 1985, 2190, null, null],
+        [0, "박태민", null, 0, null, 98, 90, 106, 0, 1985, 2190, null, null],
        [0, "김윤환Z", null, 0, null, 90, 81, 95, 0, 1985, 2190, null, null],
-        [0, "김명운", null, 0, null, 97, 94, 97, 0, 1985, 2190, null, null],
-        [0, "김정우", null, 0, null, 100, 99, 99, 0, 1985, 2190, null, null],
-        [0, "김준영", null, 0, null, 102, 87, 94, 0, 1985, 2190, null, null],
+        [0, "김명운", null, 0, null, 97, 94, 99, 0, 1985, 2190, null, null],
+        [0, "김정우", null, 0, null, 100, 108, 99, 0, 1985, 2190, null, null],
+        [0, "김준영", null, 0, null, 105, 87, 96, 0, 1985, 2190, null, null],
        [0, "주진철", null, 0, null, 63, 42, 56, 0, 1985, 2190, null, null],
        [0, "박재혁", null, 0, null, 74, 71, 62, 0, 1985, 2190, null, null],
        [0, "박준오", null, 0, null, 84, 74, 88, 0, 1985, 2190, null, null],
@@ -280,7 +279,7 @@
        [0, "신노열", null, 0, null, 62, 33, 67, 0, 1985, 2190, null, null],
        [0, "신동원", null, 0, null, 76, 80, 44, 0, 1985, 2190, null, null],
        [0, "이영한", null, 0, null, 78, 84, 39, 0, 1985, 2190, null, null],
-        [0, "김민철", null, 0, null, 99, 86, 97, 0, 1985, 2190, null, null],
+        [0, "김민철", null, 0, null, 99, 90, 97, 0, 1985, 2190, null, null],
        [0, "김동현", null, 0, null, 63, 32, 62, 0, 1985, 2190, null, null],
        [0, "서경종", null, 0, null, 73, 63, 54, 0, 1985, 2190, null, null],
        [0, "이승석", null, 0, null, 59, 63, 23, 0, 1985, 2190, null, null],
@@ -292,7 +291,7 @@
        [0, "고강민", null, 0, null, 75, 73, 45, 0, 1985, 2190, null, null],
        [0, "주영달", null, 0, null, 50, 69, 61, 0, 1985, 2190, null, null],
        [0, "박신영", null, 0, null, 50, 61, 34, 0, 1985, 2190, null, null],
-        [0, "김경모", null, 0, null, 57, 49, 53, 0, 1985, 2190, null, null],
+        [0, "김경모", null, 0, null, 70, 78, 61, 0, 1985, 2190, null, null],
        [0, "정영주", null, 0, null, 53, 52, 33, 0, 1985, 2190, null, null],
        [0, "윤종민", null, 0, null, 56, 51, 42, 0, 1985, 2190, null, null],
        [0, "배병우", null, 0, null, 50, 53, 60, 0, 1985, 2190, null, null],
@@ -351,10 +350,8 @@
        [0, "노재상", null, 0, null, 51, 56, 40, 0, 1985, 2190, null, null],
        [0, "장일석", null, 0, null, 47, 37, 34, 0, 1985, 2190, null, null],
        [0, "이정진", null, 0, null, 47, 41, 32, 0, 1985, 2190, null, null],
-        [0, "이종미", null, 0, null, 52, 47, 36, 0, 1985, 2190, null, null],
        [0, "이진수", null, 0, null, 45, 60, 58, 0, 1985, 2190, null, null],
        [0, "한지원", null, 0, null, 48, 34, 63, 0, 1985, 2190, null, null],
-        [0, "김지혜", null, 0, null, 61, 68, 66, 0, 1985, 2190, null, null],
        [0, "박경호", null, 0, null, 46, 43, 40, 0, 1985, 2190, null, null],
        [0, "이병렬", null, 0, null, 56, 38, 59, 0, 1985, 2190, null, null],
        [0, "김현철", null, 0, null, 49, 64, 48, 0, 1985, 2190, null, null],
@@ -421,6 +418,9 @@
        [0, "김지은", null, 0, null, 92, 87, 93, 0, 1985, 2190, null, null],
        [0, "강민경", null, 0, null, 88, 71, 97, 0, 1985, 2190, null, null],
        [0, "이현주", null, 0, null, 97, 98, 90, 0, 1985, 2190, null, null],
+        [0, "김지혜", null, 0, null, 98, 94, 89, 0, 1985, 2190, null, null],
+        [0, "이종미", null, 0, null, 102, 96, 103, 0, 1985, 2190, null, null],
+        [0, "윤지현", null, 0, null, 99, 90, 104, 0, 1985, 2190, null, null],
        [0, "김정민", null, 0, null, 92, 88, 93, 0, 1985, 2190, null, null],
        [0, "조용호", null, 0, null, 100, 99, 94, 0, 1985, 2190, null, null],
        [0, "변길섭", null, 0, null, 89, 99, 78, 0, 1985, 2190, null, null],
@@ -481,12 +481,12 @@
        [0, "장육", null, 0, null, 78, 32, 33, 0, 1985, 2190, null, null],
        [0, "이용범", null, 0, null, 63, 46, 63, 0, 1985, 2190, null, null],
        [0, "김상우", null, 0, null, 48, 49, 31, 0, 1985, 2190, null, null],
-        [0, "문준희", null, 0, null, 69, 39, 45, 0, 1985, 2190, null, null],
+        [0, "문준희", null, 0, null, 69, 99, 35, 0, 1985, 2190, null, null],
        [0, "박동수", null, 0, null, 45, 67, 59, 0, 1985, 2190, null, null],
        [0, "박대경", null, 0, null, 65, 34, 56, 0, 1985, 2190, null, null],
        [0, "임재덕", null, 0, null, 74, 45, 35, 0, 1985, 2190, null, null],
        [0, "김원기", null, 0, null, 51, 58, 53, 0, 1985, 2190, null, null],
-        [0, "유대현", null, 0, null, 52, 36, 63, 0, 1985, 2190, null, null],
+        [0, "유대현", null, 0, null, 84, 43, 90, 0, 1985, 2190, null, null],
        [0, "김동우", null, 0, null, 64, 37, 64, 0, 1985, 2190, null, null],
        [0, "김민호", null, 0, null, 46, 44, 59, 0, 1985, 2190, null, null],
        [0, "이건준", null, 0, null, 52, 43, 48, 0, 1985, 2190, null, null],
@@ -499,7 +499,7 @@
        [0, "문지훈", null, 0, null, 63, 56, 34, 0, 1985, 2190, null, null],
        [0, "장용석", null, 0, null, 66, 55, 44, 0, 1985, 2190, null, null],
        [0, "유인봉", null, 0, null, 62, 64, 60, 0, 1985, 2190, null, null],
-        [0, "김동준", null, 0, null, 63, 64, 38, 0, 1985, 2190, null, null]
+        [0, "김동준", null, 0, null, 86, 72, 93, 0, 1985, 2190, null, null]
    ],
    "general_ex":[
        
@@ -438,6 +438,7 @@ ENGINE=InnoDB;
 CREATE TABLE IF NOT EXISTS `ng_hall` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`server_id` CHAR(20) NOT NULL,
+	`season` INT(11) NOT NULL,
 	`scenario` INT(11) NOT NULL,
 	`general_no` INT(11) NOT NULL,
 	`type` INT(11) NOT NULL,
@@ -448,7 +449,7 @@ CREATE TABLE IF NOT EXISTS `ng_hall` (
 	UNIQUE INDEX `server_general` (`server_id`, `type`, `general_no`),
 	UNIQUE INDEX `owner` (`owner`, `server_id`, `type`),
 	INDEX `server_show` (`server_id`, `type`, `value`),
-	INDEX `scenario` (`scenario`, `type`, `value`)
+	INDEX `scenario` (`season`, `scenario`, `type`, `value`)
 )
 ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPRESSED;

@@ -463,6 +464,7 @@ CREATE TABLE IF NOT EXISTS `ng_games` (
 	`date` DATETIME NOT NULL,
 	`winner_nation` INT(11) NULL DEFAULT NULL,
 	`map` VARCHAR(50) NULL DEFAULT NULL,
+	`season` INT(11) NOT NULL,
 	`scenario` INT(11) NOT NULL,
 	`scenario_name` TEXT NOT NULL,
 	`env` TEXT NOT NULL COMMENT 'json',
@@ -1,5 +1,6 @@
-<span class="obj_tooltip" data-toggle="tooltip" data-placement="top"><?=$text??''?>
-    <span class="tooltiptext">
-        <?=$info??''?>
-    </span>
-</span>
+<span class="obj_tooltip" data-toggle="tooltip" data-placement="top"
+    ><span <?=isset($style)?"style=\"$style\"":''?>><?=$text??''?></span
+    ><span class="tooltiptext"
+        ><?=$info??''
+    ?></span
+></span>
@@ -1,65 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-
-$type = Util::getReq('type', 'int', 0);
-$sel = Util::getReq('sel', 'int', 1);
-
-if($sel <= 0 || $sel > 12){
-    $sel = 1;
-}
-
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-$connect=$db->get();
-
-increaseRefresh("턴반복", 1);
-
-$myActionCnt = $db->queryFirstField('SELECT con FROM general WHERE `owner`=%i', $userID);
-
-$con = checkLimit($myActionCnt);
-if($con >= 2) { 
-    header('location:commandlist.php', true, 303);
-    exit();
- }
-
-switch($type) {
-case 0://반복
-    $valueMap = [];
-    foreach(range($sel, GameConst::$maxTurn - 1) as $idx){
-        $src = $idx % $sel;
-        $valueMap['turn'.$idx] = $db->sqleval('%b', 'turn'.$src);
-    }
-    $db->update('general', $valueMap, 'owner=%i', $userID);
-    break;
-case 1:
-    $valueMap = [];
-    foreach(range(GameConst::$maxTurn -1, $sel, -1) as $idx){
-        $src = $idx - $sel;
-        $valueMap['turn'.$idx] = $db->sqleval('%b', 'turn'.$src);
-    }
-    foreach(range($sel -1, 0, -1) as $idx){
-        $valueMap['turn'.$idx] = EncodeCommand(0, 0, 0, 0);
-    }
-    $db->update('general', $valueMap, 'owner=%i', $userID);
-    break;
-case 2:
-    $valueMap = [];
-    foreach(range(0, GameConst::$maxTurn - $sel - 1) as $idx){
-        $src = $idx + $sel;
-        $valueMap['turn'.$idx] = $db->sqleval('%b', 'turn'.$src);
-    }
-    foreach(range(GameConst::$maxTurn - $sel, GameConst::$maxTurn - 1) as $idx){
-        $valueMap['turn'.$idx] = EncodeCommand(0, 0, 0, 0);
-    }
-    $db->update('general', $valueMap, 'owner=%i', $userID);
-    break;
-}
-
-header('location:commandlist.php', true, 303);
@@ -32,6 +32,7 @@ $acl = $session->acl;
        <!-- 액션 -->
        <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
        <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+        <?=WebUtil::printJS('../e_lib/moment.min.js')?>
        <?=WebUtil::printJS('../js/common.js')?>
        <?=WebUtil::printJS('../js/func.js')?>
        <?=WebUtil::printJS('../js/entrance.js')?>
@@ -76,7 +76,7 @@ foreach (AppConf::getList() as $setting) {
        'korName' => $serverKorName,
        'color' => $serverColor,
        'isRoot' => $serverDir == $rootServer,
-        'lastGitPath' => ($serverGitPath[$serverDir][0])??'origin/master'
+        'lastGitPath' => ($serverGitPath[$serverDir][0])??($serverDir == $rootServer?'devel':'origin/devel')
    ];
    $server[] = $state;
 }  
@@ -196,7 +196,7 @@ function postOAuthResult(result){
    </div>
    </div>
    <div id="bottom_box">
-    <div class="container"><a href="terms.2.html">개인정보처리방침</a> &amp; <a href="terms.1.html">이용약관</a><br>© 2018  •  HideD
+    <div class="container"><a href="terms.2.html">개인정보처리방침</a> &amp; <a href="terms.1.html">이용약관</a><br>© 2019  •  HideD
    <br>크롬과 파이어폭스에 최적화되어있습니다.</div></div>
 </div>

@@ -58,12 +58,13 @@ if(!$allowUpdate){
    ]);
 }

+$src_target = $storage->$server;
+if($src_target){
+    $src_target = $src_target[0];
+}

 if(!$allowFullUpdate || !$target){
-    $target = $storage->$server;
-    if($target){
-        $target = $target[0];
-    }
+    $target = $src_target;
 }
 else{
    $target = $request['target'];
@@ -114,6 +115,26 @@ if(!file_exists($server)){


 if($server == $baseServerName){
+
+    exec("git fetch -q 2>&1", $output);
+    if($output){
+        Json::die([
+            'result'=>false,
+            'reason'=>'git pull 작업 : '.join(', ', $output)
+        ]);
+    }
+
+    if($target != $src_target){
+        $command = sprintf('git checkout %s -q 2>&1', $target);
+        exec($command, $output);
+        if($output){
+            Json::die([
+                'result'=>false,
+                'reason'=>join(', ', $output)
+            ]);
+        }
+    }
+
    exec("git pull -q 2>&1", $output);
    if($output && $output[0] != 'Already up-to-date.'){
        Json::die([
@@ -129,13 +150,44 @@ if($server == $baseServerName){
            'verionGit'=>$version
        ], true
    );
+    
+    if(ServConfig::$imageRequestKey){
+        try {
+            $imagePullPath = ServConfig::getImagePullURI();
+            $pullResult = @file_get_contents($imagePullPath);
+            if($pullResult === false){
+                throw new \ErrorException('Invalid URI');
+            }
+            $pullResult = Json::decode($pullResult);
+            if($pullResult['result']){
+                $imgResult = true;
+                $imgDetail = $pullResult['version'];
+            }
+            else{
+                $imgResult = false;
+                $imgDetail = $pullResult['reason'];
+            }
+        }
+        catch(\Exception $e){
+            $imgResult = false;
+            $imgDetail = $e->getMessage();
+        }
+    }
+    else{
+        $imgResult = true;
+        $imgDetail = 'No key';
+    }
+    
+    

-    $storage->$server = [null, $version];
+    $storage->$server = [$target, $version];

    Json::die([
        'server'=>$server,
        'result'=>true,
-        'version'=>$version
+        'version'=>$version,
+        'imgResult'=>$imgResult,
+        'imgDetail'=>$imgDetail,
    ]);

 }
@@ -38,22 +38,20 @@ function serverUpdate(caller){
        return;
    }

-    if(isRoot){
-        if(!confirm('서버 라이브러리, 루트 서버에 대해 git pull을 실행합니다.')){
-            return;
-        }
-    }
-    else if(!allowFullUpdate){
-        if (!confirm('다음 git tree-ish 주소로 업데이트를 시도합니다 : ' + target)) {
-            return;
-        }
-    }
-    else {
+    
+    if(allowFullUpdate){
        target = prompt('가져올 git tree-ish 명을 입력해주세요.', target)
        if(!target){
            return;
        }
-
+    }
+    else if(isRoot){
+        if(!confirm('서버 라이브러리, 루트 서버에 대해 git pull을 실행합니다.')){
+            return;
+        }
+    }
+    else if (!confirm('다음 git tree-ish 주소로 업데이트를 시도합니다 : ' + target)) {
+        return;
    }
    
    $.ajax({
@@ -66,7 +64,11 @@ function serverUpdate(caller){
        }
    }).then(function(response) {
            if(response.result) {
-                alert('{0} 서버가 {1} 버전으로 업데이트 되었습니다.'.format(response.server, response.version));
+                var aux = '';
+                if(isRoot){
+                    aux = ' (이미지 서버 갱신:{0}, {1})'.format(response.imgResult, response.imgDetail);
+                }
+                alert('{0} 서버가 {1} 버전으로 업데이트 되었습니다.{2}'.format(response.server, response.version, aux));
                location.reload();
            } else {
                alert(response.reason);
@@ -12,7 +12,17 @@ var serverListTemplate = "\
 var serverTextInfo = "\
 <td>\
 서기 <%year%>년 <%month%>월 (<span style='color:orange;'><%scenario%></span>)<br>\
-유저 : <%userCnt%> / <%maxUserCnt%>명 <span style='color:cyan;'>NPC : <%npcCnt%>명</span> (<span style='color:limegreen;'><%turnTerm%>분 턴 서버</span>)\
+유저 : <%userCnt%> / <%maxUserCnt%>명 <span style='color:cyan;'>NPC : <%npcCnt%>명</span> (<span style='color:limegreen;'><%turnTerm%>분 턴 서버</span>)<br>\
+(상성 설정:<%fictionMode%>), (기타 설정:<%otherTextInfo%>)\
+</td>\
+";
+
+var serverProvisionalInfo = "\
+<td>\
+- 오픈 일시 : <%opentime%> -<br>\
+서기 <%year%>년 <%month%>월 (<span style='color:orange;'><%scenario%></span>)<br>\
+유저 : <%userCnt%> / <%maxUserCnt%>명 <span style='color:cyan;'>NPC : <%npcCnt%>명</span> (<span style='color:limegreen;'><%turnTerm%>분 턴 서버</span>)<br>\
+(상성 설정:<%fictionMode%>), (기타 설정:<%otherTextInfo%>)\
 </td>\
 ";

@@ -49,7 +59,8 @@ var serverReservedTemplate = "\
 <%openDatetime==starttime?'':'- 가오픈 일시 : '+openDatetime+ '- <br>'%>\
 - 오픈 일시 : <%starttime%> - <br>\
 <span style='color:orange;'><%scenarioName%></span> <span style='color:limegreen;'><%turnterm%>분 턴 서버</span><br>\
-(상성 설정:<%fictionMode%>), (빙의 여부:<%npcMode%>), (최대 스탯:<%gameConf.defaultStatTotal%>), (기타 설정:<%otherTextInfo%>)</td>\
+(상성 설정:<%fictionMode%>), (빙의 여부:<%npcMode%>), (최대 스탯:<%gameConf.defaultStatTotal%>), (기타 설정:<%otherTextInfo%>)\
+</td>\
 ";

 $(function(){
@@ -71,6 +82,7 @@ function Entrance_UpdateServer() {

 function Entrance_drawServerList(serverInfos){
    var $serverList = $('#server_list');
+    var now = moment().format('YYYY-MM-DD HH:mm:ss');
    $.each(serverInfos, function(idx, serverInfo){
        var $serverHtml = $(TemplateEngine(serverListTemplate, serverInfo));
        $serverList.append($serverHtml);
@@ -87,6 +99,7 @@ function Entrance_drawServerList(serverInfos){
                $serverHtml.append(
                    TemplateEngine(serverReservedTemplate, result.reserved)
                );
+                initTooltip($serverHtml);
                return;
            }

@@ -104,14 +117,26 @@ function Entrance_drawServerList(serverInfos){
                $serverHtml.find('.n_country').html('§천하통일§');
                $serverHtml.find('.server_date').html('{0} <br>~ {1}'.format(game.starttime, game.turntime));
            }
-            else{
+            else if(game.opentime <= now){
                $serverHtml.find('.n_country').html('<{0}국 경쟁중>'.format(game.nationCnt));
                $serverHtml.find('.server_date').html('{0} ~'.format(game.starttime));
            }
+            else{
+                $serverHtml.find('.n_country').html('-가오픈 중-');
+                $serverHtml.find('.server_date').html('{0} ~'.format(game.starttime));
+            }

-            $serverHtml.append(
-                TemplateEngine(serverTextInfo, game)
-            );
+            if(game.opentime <= now){
+                $serverHtml.append(
+                    TemplateEngine(serverTextInfo, game)
+                );
+            }
+            else{
+                $serverHtml.append(
+                    TemplateEngine(serverProvisionalInfo, game)
+                );
+            }
+            

            if(result.me && result.me.name){
                var me = result.me;
@@ -125,7 +150,7 @@ function Entrance_drawServerList(serverInfos){
                    TemplateEngine(serverFullTemplate, {})
                );
            }
-            else if(game.npcMode == 1){
+            else if(game.npcMode == '가능'){
                $serverHtml.append(
                    TemplateEngine(serverCreateAndSelectTemplate, {serverPath:serverPath})
                ).addClass('server_create_and_select');
@@ -47,6 +47,16 @@ $(document).ready( function () {
    $('#serv_host').val(
        [location.protocol, '//', location.host, parentPathname].join('')
    );
+
+    $('#btn_random_generate_key').click(function(){
+        var token = '';
+        while(token.length < 24){
+            token += (Math.random() + 1).toString(36).substring(7); 
+        }
+        token = token.substr(0,24);
+        $('#image_request_key').val(token);
+    });
+
    $('#db_form').validate({
        rules:{
            db_host:"required",
@@ -56,7 +66,11 @@ $(document).ready( function () {
            db_name:"required",
            serv_host:"required",
            shared_icon_path:"required",
-            game_image_path:"required"
+            game_image_path:"required",
+            image_request_key:{
+                required:false,
+                minlength:16
+            }
        },
        errorElement: "div",
        errorPlacement: function ( error, element ) {
@@ -94,7 +108,10 @@ $(document).ready( function () {
                db_name:$('#db_name').val(),
                serv_host:$('#serv_host').val(),
                shared_icon_path:$('#shared_icon_path').val(),
-                game_image_path:$('#game_image_path').val()
+                game_image_path:$('#game_image_path').val(),
+                image_request_key:$('#image_request_key').val(),
+                kakao_rest_key:$('#kakao_rest_key').val(),
+                kakao_admin_key:$('#kakao_admin_key').val(),
            }
        }).then(function(result){
            var deferred = $.Deferred();
@@ -5,9 +5,11 @@ import time
 import glob
 import urllib.request
 import concurrent.futures
+from datetime import datetime

 def run(webPath):
-    print(webPath)
+    now = datetime.now()
+    print(now.strftime("%Y-%m-%d %H:%M:%S"), webPath)
    obj = urllib.request.urlopen(webPath)
    obj.read()

@@ -44,15 +46,17 @@ def main():
        
        servList.append(webPath)

-    with concurrent.futures.ThreadPoolExecutor(max_workers=len(servList)) as executor:
+    with concurrent.futures.ThreadPoolExecutor(max_workers=max(1,len(servList))) as executor:
        waiters=[]
        for resetPath in autoResetList:
            future = executor.submit(run, resetPath)
            waiters.append(future)
-        for _ in range(4):
+        for idx in range(4):
            for webPath in servList:
                future = executor.submit(run, webPath)
                waiters.append(future)
+            if idx == 3:
+                break
            time.sleep(15)
        for future in waiters:
            future.done()
@@ -133,6 +133,9 @@ class WebUtil
        }

        $config = \HTMLPurifier_HTML5Config::createDefault();
+        $config->set('Filter.Custom', array (new \HTMLPurifier_Filter_YouTube()));
+        $config->set('HTML.SafeIframe', true);
+        $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%'); //allow YouTube and Vimeo
        $def = $config->getHTMLDefinition();
        $def->info_global_attr['data-flip'] = new \HTMLPurifier_AttrDef_Text;
        $purifier = new \HTMLPurifier($config);
Author	SHA1	Message	Date
Hide_D	f2a785f2fc	imagePull 기능 추가, 인스톨러 완성	2019-09-23 00:28:15 +09:00
Hide_D	6fafcfae4e	훈사 분리	2019-09-21 23:27:43 +09:00
Hide_D	33e075f669	훈사를 분리	2019-09-21 21:29:20 +09:00
Hide_D	e5fc467c4e	버그 수정	2019-09-21 21:04:17 +09:00
Hide_D	b7a5de49c6	표기 일부 변경	2019-09-21 18:09:37 +09:00
Hide_D	3f145abd6f	모훈사 기준을 징병 6회로 변경	2019-09-21 17:39:13 +09:00
Hide_D	4612834870	워프 기준, 쌀 삼팜 기준 변경	2019-09-21 14:41:23 +09:00
Hide_D	83c5609fad	징병 버그 수정 2	2019-09-21 11:42:10 +09:00
Hide_D	d142056098	징병 안되는 버그 수정	2019-09-21 11:39:51 +09:00
Hide_D	4d8ecf4191	진짜로 삭턴 버그 수정	2019-09-21 02:44:00 +09:00
Hide_D	af6c3f466d	삭턴 버그 수정	2019-09-21 02:38:06 +09:00
Hide_D	033a2d8674	삭턴 버그 수정	2019-09-21 02:35:15 +09:00
Hide_D	9079788b2b	삭턴 기준 변경	2019-09-21 02:33:39 +09:00
Hide_D	44ddb2e480	git fetch에도 -q	2019-09-21 02:28:49 +09:00
Hide_D	295ba84071	자동 행동 세부를 툴팁으로	2019-09-21 02:27:05 +09:00
Hide_D	8773250aab	초기 병종이 보병일 때 고정되는 버그 수정	2019-09-21 02:14:25 +09:00
Hide_D	c5a4602fe1	옵션 표기 버그 수정	2019-09-21 02:11:54 +09:00
Hide_D	5f4c43baf6	Merge branch 'devel' into autorun	2019-09-21 02:07:26 +09:00
Hide_D	0ef3921e17	update 서버 변경	2019-09-21 02:06:49 +09:00
Hide_D	efcf0f772e	server checkout 추가2	2019-09-21 01:50:36 +09:00
Hide_D	ccabe847bb	루트도 git tree-ish 지정 가능	2019-09-21 01:42:21 +09:00
Hide_D	45ed63ffe3	버그 수정	2019-09-21 01:38:29 +09:00
Hide_D	7bebbe3a16	징병, 모병 추가	2019-09-21 01:09:17 +09:00
Hide_D	53ba1db79f	autorun_user 초기 세팅	2019-09-20 02:12:42 +09:00
Hide_D	76c306a122	npc AI를 '사전 턴' 수행 이후에 처리하도록 변경	2019-09-20 00:41:38 +09:00
Hide_D	89c2c163cb	서버 정보에 자동행동 표기	2019-09-20 00:35:13 +09:00
Hide_D	8826061266	autorun_user 인자 세팅	2019-09-20 00:05:40 +09:00
Hide_D	e684877c94	리셋 화면에서 '휴식 턴 시 장수 턴' 추가	2019-09-19 02:21:51 +09:00
Hide_D	12c8152901	docker 메시지 수정	2019-09-19 01:16:21 +09:00
Hide_D	8ba20bf4d2	Docker를 이용한 설치 안내	2019-09-15 23:25:11 +09:00
Hide_D	0bc1ad09d1	년도 변경	2019-09-15 23:19:04 +09:00
Hide_D	231c79132a	run_daemon 1분 유지 수정	2019-09-15 20:59:35 +09:00
Hide_D	089803c599	cron 수정	2019-09-15 20:53:23 +09:00
Hide_D	4ea373aff6	gitignore change	2019-09-15 20:08:57 +09:00
Hide_D	0d94b8c742	Merge branch 'devel' of ssh://storage.hided.net:2525/devsam/core into devel	2019-09-15 19:49:32 +09:00
Hide_D	d444f19043	date_default_timezone_set 해제	2019-09-15 19:49:24 +09:00
Hide_D	87a0e73c96	인스톨러 버그 수정	2019-09-15 02:59:38 +09:00
Hide_D	b5922095f0	인스톨러 임시 트윅	2019-09-15 02:50:10 +09:00
Hide_D	3fee29e9e9	setup_db에서 global_salt 추가	2019-09-15 00:55:57 +09:00
Hide_D	4e351b3be8	Merge branch 'devel' of ssh://storage.hided.net:2525/devsam/core into devel	2019-09-15 00:38:00 +09:00
Hide_D	3432b900df	설치 직후 기본 gitpath 변경	2019-09-15 00:37:46 +09:00
Hide_D	fb7c67f317	빙의 안되는 버그 수정, 가입/빙의 시 락	2019-08-18 18:01:11 +09:00
Hide_D	28d5a5c39a	장수 생성시 빠르게 쿼리를 날려 중복 생성하는 것이 불가능하도록	2019-08-18 17:50:38 +09:00
Hide_D	e2754511d9	부대탈퇴 시 propergation 처리 실수 수정	2019-08-18 00:46:39 +09:00
Hide_D	71d179de76	서버 시간을 더 정교하게 반영하도록 수정	2019-08-16 23:42:46 +09:00
Hide_D	08523852da	마지막 남은 iframe 안녕!!!	2019-08-16 23:27:28 +09:00
Hide_D	3dd52942d2	부대 명령을 json api로 변경	2019-08-16 22:16:28 +09:00
Hide_D	bb24e45028	서버가 오픈되지 않으면 벌점이 늘지 않도록 변경	2019-08-15 19:37:03 +09:00
Hide_D	f8c72a6a0a	NPC기술연구 관련 마저 고침	2019-08-15 16:10:39 +09:00
Hide_D	fa246ff810	단순 건국 상품 롤백	2019-08-15 00:37:49 +09:00
Hide_D	1a1d384a3e	최종 보정 수정	2019-08-14 01:36:41 +09:00
Hide_D	6d85c609fd	동시에 관직이 여러번 뛸때에도 관직 보상 많이 줌	2019-08-14 01:33:50 +09:00
Hide_D	e1b8dde60a	보정 롤백	2019-08-14 01:27:37 +09:00
Hide_D	e8d32eef4e	작위보상의 수뇌 보정을 낮춤	2019-08-14 01:26:05 +09:00
Hide_D	ec0fa686a9	여유를 '절대 시간' 으로 변경	2019-08-14 01:00:10 +09:00
Hide_D	7604273c1a	삭턴에 조금 여유를 줌	2019-08-14 00:58:56 +09:00
Hide_D	00db927ce7	작위 보상 추가	2019-08-14 00:55:45 +09:00
Hide_D	9fea24f0f6	건국 즉시 얻는 템 삭제, 유니크 복권 리팩토링, '고정된 한개'를 주는 유니크 복권 추가	2019-08-14 00:27:36 +09:00
Hide_D	c903ce929f	서버 정보 추가 제공	2019-08-13 23:37:46 +09:00
Hide_D	d48d9f85b3	가오픈시 별도 표기 추가	2019-08-13 23:24:05 +09:00
Hide_D	5bdf7ba316	가오픈시 삭제는 유저장만 가능하도록 변경	2019-08-13 02:24:58 +09:00
Hide_D	518c74736f	가 오픈기간내 장수 삭제/빙의해제 가능	2019-08-13 02:23:27 +09:00
Hide_D	223d2cf786	서버 가오픈시 대비 넉넉하게 시간 제공	2019-08-13 01:30:41 +09:00
Hide_D	cfa2cff34a	NPC의 기술 연구 기준을 '기술제한이 아니면'으로 변경	2019-08-13 00:20:07 +09:00
Hide_D	26eacfe795	랜임 버그 핫픽스	2019-07-18 21:21:58 +09:00
Hide_D	b1b937ee31	(6턴 제외) 삭턴사시 본닉 공개	2019-07-17 23:32:59 +09:00
Hide_D	122479158c	'장수를 따라' 임관하는 기능 추가	2019-07-17 23:06:20 +09:00
Hide_D	0af5e9ec84	외교권자 임명 시 내부적으로 warning뜨는 버그 수정	2019-07-17 21:19:34 +09:00
Hide_D	cb5414f789	youtube, vimeo iframe 가능하도록 변경	2019-07-17 21:12:25 +09:00
sars	224cb1b913	server_title id 추가	2019-07-10 19:52:29 -07:00
sars	8bd84cc701	serverCnt 변수로 지정	2019-07-10 19:39:25 -07:00
sars	a14dcf8b3e	깃수 출력	2019-07-10 15:27:44 -07:00
Hide_D	a1a26bf8fe	훈련,사기템 효과 두배 증가, 철벽서 버그 수정	2019-06-21 10:06:05 +09:00
Hide_D	fea229c4ad	사령부 턴 높이 늘림	2019-06-21 09:58:17 +09:00
Hide_D	7040d940ac	왕조 일람 정보 추가	2019-06-21 09:55:40 +09:00
Hide_D	a576d72335	메인 페이지 부대 이름 관련 보조정보 추가	2019-06-21 09:51:39 +09:00
Hide_D	5aab373d20	발령, 포상, 몰수에서 보조 데이터 추가	2019-06-21 09:29:33 +09:00
Hide_D	32f8160eb2	시즌 값 추가	2019-06-18 03:32:14 +09:00
Hide_D	701355beb3	시즌 별 검색 기능 추가, 기본 값으로 현재 시즌 표기	2019-06-18 03:30:09 +09:00
Hide_D	28de7c517b	UniqueConst와 game_env에 seasonIdx 추가	2019-06-18 03:12:36 +09:00
Hide_D	7365ca7a64	숙련전환 커맨드 추가	2019-06-16 04:42:43 +09:00
Hide_D	2a61813b67	스1 시나리오 업데이트	2019-06-14 23:55:43 +09:00