From 7ec3fcc78ee82b57f089df241d0edb3a93c0e469 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 19:11:09 +0900
Subject: [PATCH 001/184] =?UTF-8?q?=EB=8C=80=EB=AC=B8=EC=9E=90=20GAME=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/func.php b/hwe/func.php
index 65c6d9d5..bb3538b0 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1373,7 +1373,7 @@ function updateTraffic() {
 function CheckOverhead() {
     //서버정보
     $db = DB::db();
-    $admin = $db->queryFirstRow('SELECT turnterm, conlimit from GAME LIMIT 1');
+    $admin = $db->queryFirstRow('SELECT turnterm, conlimit from game LIMIT 1');
 
     $con = Util::round(pow($admin['turnterm'], 0.6) * 3) * 10;
 

From bfd79f479e40a97394153039f1ac843dd0e5fe7b Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 19:21:30 +0900
Subject: [PATCH 002/184] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EA=B2=BD=EB=A1=9C?=
 =?UTF-8?q?=EB=A5=BC=20=EC=A0=88=EB=8C=80=20=EA=B2=BD=EB=A1=9C=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php         |  6 +++---
 hwe/func_history.php | 36 ++++++++++++++++++------------------
 hwe/j_install.php    |  4 ++--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index bb3538b0..93487b90 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1138,7 +1138,7 @@ function PushMsg($type, $nation, $picture, $imgsvr, $from, $fromcolor, $to, $toc
     $date = date('Y-m-d H:i:s');
     if($type == 1) { $file = "_all_msg.txt"; }
     else { $file = "_nation_msg{$nation}.txt"; }
-    $fp = fopen("logs/{$file}", "a");
+    $fp = fopen(__dir__."/logs/{$file}", "a");
     //로그 파일에 기록
     $str = "{$type}|".StringUtil::padStringAlignRight($from,12," ")."|".StringUtil::padStringAlignRight($to,12," ")."|".$date."|".$msg."|".$fromcolor."|".$tocolor."|".$picture."|".$imgsvr;
     fwrite($fp, "{$str}\n");
@@ -1287,7 +1287,7 @@ function increaseRefresh($type="", $cnt=1) {
     $date2 = substr($date, 0, 10);
     $online = getOnlineNum();
     file_put_contents(
-        "logs/_{$date2}_refresh.txt",
+        __dir__."/logs/_{$date2}_refresh.txt",
         sprintf(
             "%s, %s, %s, %s, %s, %d\n",
             $date,
@@ -1324,7 +1324,7 @@ function increaseRefresh($type="", $cnt=1) {
     }
     if($str != "") {
         file_put_contents(
-            "logs/_{$date2}_ipcheck.txt",
+            __dir__."/logs/_{$date2}_ipcheck.txt",
             sprintf(
                 "%s, %s, %s%s\n",
                 $session->userName,
diff --git a/hwe/func_history.php b/hwe/func_history.php
index ea38d3f4..d51125ad 100644
--- a/hwe/func_history.php
+++ b/hwe/func_history.php
@@ -5,7 +5,7 @@ namespace sammo;
 
 function delStepLog() {
     $date = date('Y_m_d');
-    @unlink("logs/_{$date}_steplog.txt");
+    @unlink(__dir__."/logs/_{$date}_steplog.txt");
 }
 
 function pushRawFileLog($path, $lines){
@@ -50,81 +50,81 @@ function eraseTnmtFightLogAll(){
 }
 
 function eraseTnmtFightLog(int $group){
-    $filepath = "logs/fight{$group}.txt";
+    $filepath = __dir__."/logs/fight{$group}.txt";
     if(file_exists($filepath)){
         @unlink($filepath);
     }
 }
 
 function pushTnmtFightLog(int $group, $log) {
-    pushRawFileLog("logs/fight{$group}.txt", $log);
+    pushRawFileLog(__dir__."/logs/fight{$group}.txt", $log);
 }
 
 function getTnmtFightLogAll(int $group) {
-    return join('<br>',getFormattedFileLogAll("logs/fight{$group}.txt"));
+    return join('<br>',getFormattedFileLogAll(__dir__."/logs/fight{$group}.txt"));
 }
 
 function pushSabotageLog($log) {
-    pushRawFileLog("logs/_sabotagelog.txt", $log);
+    pushRawFileLog(__dir__."/logs/_sabotagelog.txt", $log);
 }
 
 function getSabotageLogRecent($count) {
-    return join('<br>', getFormattedFileLogRecent("logs/_sabotagelog.txt", $count, 150));
+    return join('<br>', getFormattedFileLogRecent(__dir__."/logs/_sabotagelog.txt", $count, 150));
 }
 
 function pushProcessLog($log) {
     $date = date('Y_m_d');
-    pushRawFileLog("logs/_{$date}_processlog.txt", $log);
+    pushRawFileLog(__dir__."/logs/_{$date}_processlog.txt", $log);
 }
 
 
 function pushStepLog($log) {
     $date = date('Y_m_d');
-    pushRawFileLog("logs/_{$date}_steplog.txt", $log);
+    pushRawFileLog(__dir__."/logs/_{$date}_steplog.txt", $log);
 }
 
 function pushLockLog($log) {
     $date = date('Y_m_d');
-    pushRawFileLog("logs/_{$date}_locklog.txt", $log);
+    pushRawFileLog(__dir__."/logs/_{$date}_locklog.txt", $log);
 }
 
 function pushAdminLog($log) {
-    pushRawFileLog("logs/_adminlog.txt", $log);
+    pushRawFileLog(__dir__."/logs/_adminlog.txt", $log);
 }
 
 function pushAuctionLog($log) {
-    pushRawFileLog("logs/_auctionlog.txt", $log);
+    pushRawFileLog(__dir__."/logs/_auctionlog.txt", $log);
 }
 
 function getAuctionLogRecent(int $count) {
-    return join('<br>', array_reverse(getFormattedFileLogRecent("logs/_auctionlog.txt", $count, 300)));
+    return join('<br>', array_reverse(getFormattedFileLogRecent(__dir__."/logs/_auctionlog.txt", $count, 300)));
 }
 
 function pushGenLog($general, $log) {
     $no = Util::toInt($general['no']);
-    pushRawFileLog("logs/gen{$no}.txt", $log);
+    pushRawFileLog(__dir__."/logs/gen{$no}.txt", $log);
 }
 
 function getGenLogRecent(int $no, int $count) {
-    return join('<br>', array_reverse(getFormattedFileLogRecent("logs/gen{$no}.txt", $count, 300)));
+    return join('<br>', array_reverse(getFormattedFileLogRecent(__dir__."/logs/gen{$no}.txt", $count, 300)));
 }
 
 function pushBatRes($general, $log) {
     $no = Util::toInt($general['no']);
-    pushRawFileLog("logs/batres{$no}.txt", $log);
+    pushRawFileLog(__dir__."/logs/batres{$no}.txt", $log);
 }
 
 function getBatResRecent(int $no, int $count) {
-    return join('<br>', array_reverse(getFormattedFileLogRecent("logs/batres{$no}.txt", $count, 300)));
+    return join('<br>', array_reverse(getFormattedFileLogRecent(__dir__."/logs/batres{$no}.txt", $count, 300)));
 }
 
 function pushBatLog($general, $log) {
     $no = Util::toInt($general['no']);
-    pushRawFileLog("logs/batlog{$no}.txt", $log);
+    pushRawFileLog(__dir__."/logs/batlog{$no}.txt", $log);
 }
 
 function getBatLogRecent(int $no, int $count) {
-    return join('<br>', array_reverse(getFormattedFileLogRecent("logs/batlog{$no}.txt", $count, 300)));
+    return join('<br>', array_reverse(getFormattedFileLogRecent(__dir__."/logs/batlog{$no}.txt", $count, 300)));
 }
 
 //DB-based
diff --git a/hwe/j_install.php b/hwe/j_install.php
index 97d5a8fc..b8013b90 100644
--- a/hwe/j_install.php
+++ b/hwe/j_install.php
@@ -100,8 +100,8 @@ $mysqli_obj = $db->get();
 $scenarioObj = new Scenario($scenario, false);
 $startyear = $scenarioObj->getYear()??GameConst::$defaultStartYear;
 
-FileUtil::delInDir("logs");
-FileUtil::delInDir("data");
+FileUtil::delInDir(__dir__."/logs");
+FileUtil::delInDir(__dir__."/data");
 
 $result = Util::generateFileUsingSimpleTemplate(
     __DIR__.'/d_setting/UniqueConst.orig.php',

From d7fb88eed6c91939beb51d7b4050bc47dbe24ac9 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 19:23:05 +0900
Subject: [PATCH 003/184] =?UTF-8?q?TimeZone=20=EC=84=B8=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 f_config/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f_config/config.php b/f_config/config.php
index ce147685..dc8536ff 100644
--- a/f_config/config.php
+++ b/f_config/config.php
@@ -2,7 +2,7 @@
 namespace sammo;
 
 define('ROOT', realpath(__dir__.'/..'));
-
+date_default_timezone_set('Asia/Seoul');
 mb_internal_encoding("UTF-8");
 mb_http_output('UTF-8');
 mb_regex_encoding('UTF-8'); 

From a69f25616899bfad34a701049e9af4504eb34987 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 20:08:15 +0900
Subject: [PATCH 004/184] =?UTF-8?q?=EC=95=BD=EA=B4=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/login.css                   |  15 +++-
 f_install/sql/common_schema.sql |   1 +
 js/join.js                      |  16 +++-
 oauth_kakao/j_join_process.php  |  10 +++
 oauth_kakao/join.php            |  34 +++++++-
 oauth_kakao/terms.1.html        | 143 ++++++++++++++++++++++++++++++++
 oauth_kakao/terms.2.html        |  22 +++++
 oauth_kakao/terms.html          |   5 --
 src/sammo/Util.php              |   2 +-
 9 files changed, 234 insertions(+), 14 deletions(-)
 create mode 100644 oauth_kakao/terms.1.html
 create mode 100644 oauth_kakao/terms.2.html
 delete mode 100644 oauth_kakao/terms.html

diff --git a/css/login.css b/css/login.css
index 14439c99..b46e9bc1 100644
--- a/css/login.css
+++ b/css/login.css
@@ -62,8 +62,21 @@ input::-webkit-input-placeholder {
 }
 
 
+.col-form-label{
+    text-align:center;
+}
+
 .terms{
-    max-height: 200px; overflow: auto;
+    max-height: 200px; overflow-y: auto;
+}
+
+.terms pre{
+    width:100%;
+    white-space: pre-wrap;       /* Since CSS 2.1 */
+    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    white-space: -pre-wrap;      /* Opera 4-6 */
+    white-space: -o-pre-wrap;    /* Opera 7 */
+    word-wrap: break-word;       /* Internet Explorer 5.5+ */
 }
 
 .vertical-center {
diff --git a/f_install/sql/common_schema.sql b/f_install/sql/common_schema.sql
index 236442a7..75844246 100644
--- a/f_install/sql/common_schema.sql
+++ b/f_install/sql/common_schema.sql
@@ -25,6 +25,7 @@ CREATE TABLE `member` (
 	`EMAIL` VARCHAR(64) NULL DEFAULT NULL,
 	`PW` CHAR(128) NOT NULL,
 	`salt` CHAR(16) NOT NULL,
+	`third_use` INT(1) NOT NULL DEFAULT '0',
 	`NAME` VARCHAR(64) NOT NULL,
 	`PICTURE` VARCHAR(64) NULL DEFAULT 'default.jpg',
 	`IMGSVR` INT(1) NULL DEFAULT '0',
diff --git a/js/join.js b/js/join.js
index 6e886a74..534d6d4e 100644
--- a/js/join.js
+++ b/js/join.js
@@ -41,7 +41,8 @@ $(document).ready( function () {
                     dataType: 'json'
                 }
             },
-            secret_agree: "required"
+            secret_agree: "required",
+            secret_agree2: "required"
         },
         messages: {
             username: {
@@ -62,7 +63,8 @@ $(document).ready( function () {
                 required: "닉네임을 입력해주세요",
                 maxlength: '닉네임은 {0}자를 넘을 수 없습니다'
             },
-            secret_agree: "동의해야만 가입하실 수 있습니다."
+            secret_agree: "동의해야만 가입하실 수 있습니다.",
+            secret_agree2: "동의해야만 가입하실 수 있습니다."
         },
         errorElement: "div",
         errorPlacement: function ( error, element ) {
@@ -97,6 +99,8 @@ $(document).ready( function () {
             dataType:'json',
             data:{
                 'secret_agree':$('#secret_agree').val(),
+                'secret_agree2':$('#secret_agree2').val(),
+                'third_use':$('#third_use').val(),
                 'username':$('#username').val(),
                 'password':hash_pw,
                 'nickname':$('#nickname').val(),
@@ -120,7 +124,11 @@ $(document).ready( function () {
 
 
 $(function($){
-    $.get('terms.html').then(function(txt){
-        $('#terms').html(txt);
+    $.get('terms.1.html').then(function(txt){
+        $('#terms1').html(txt);
+    });
+
+    $.get('terms.2.html').then(function(txt){
+        $('#terms2').html(txt);
     });
 });
\ No newline at end of file
diff --git a/oauth_kakao/j_join_process.php b/oauth_kakao/j_join_process.php
index c4c37985..76fd4e2a 100644
--- a/oauth_kakao/j_join_process.php
+++ b/oauth_kakao/j_join_process.php
@@ -36,6 +36,8 @@ if($expires < $nowDate && (!$refresh_token || ($refresh_token_expires < $nowDate
     ]);
 }
 $secret_agree = Util::getReq('secret_agree', 'bool');
+$secret_agree2 = Util::getReq('secret_agree2', 'bool');
+$third_use = Util::getReq('third_use', 'bool');
 $username = mb_strtolower(Util::getReq('username'), 'utf-8');
 $password = Util::getReq('password');
 $nickname = Util::getReq('nickname');
@@ -63,6 +65,13 @@ if(!$secret_agree){
     ]);
 }
 
+if(!$secret_agree2){
+    Json::die([
+        'result'=>false,
+        'reason'=>'개인정보 제공 및 이용에 대해 동의해야 가입하실 수 있습니다.'
+    ]);
+}
+
 $usernameChk = checkUsernameDup($username);
 if($usernameChk !== true){
     Json::die([
@@ -149,6 +158,7 @@ RootDB::db()->insert('member',[
     'oauth_type' => 'KAKAO',
     'id' => $username,
     'email' => $email,
+    'third_use'=> $third_use,
     'pw' => $finalPassword,
     'salt' => $userSalt,
     'name'=>$nickname,
diff --git a/oauth_kakao/join.php b/oauth_kakao/join.php
index 48c1403b..08d988f6 100644
--- a/oauth_kakao/join.php
+++ b/oauth_kakao/join.php
@@ -39,7 +39,7 @@ if($canJoin != 'Y'){
     <div class="container">
         <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe</h1>
         <div class="row justify-content-md-center">
-        <div class="col col-12 col-md-10 col-lg-7">
+        <div class="col col-12 col-md-12 col-lg-12">
         <div class="card">
             <h3 class="card-header">
                 회원가입
@@ -80,10 +80,10 @@ if($canJoin != 'Y'){
                     </div>
 
                     <div class="form-group row">
-                        <label for="username" class="col-sm-3 col-form-label">약관</label>
+                        <label for="username" class="col-sm-3 col-form-label">이용 약관</label>
                         <div class="col-sm-9">
                             <div class="card">
-                                <div class="card-body terms" id="terms">
+                                <div class="card-body terms" id="terms1">
                                     
                                 </div>
                             </div>
@@ -97,6 +97,34 @@ if($canJoin != 'Y'){
                         </div>
                     </div>
 
+                    <div class="form-group row">
+                        <label for="username" class="col-sm-3 col-form-label">개인정보 제공<br>및<br>이용에 대한 동의</label>
+                        <div class="col-sm-9">
+                            <div class="card">
+                                <div class="card-body terms" id="terms2">
+                                    
+                                </div>
+                            </div>
+                            <div class="custom-control custom-checkbox">
+                                <input type="checkbox" class="custom-control-input" id="secret_agree2" name="secret_agree2">
+                                <label class="custom-control-label" for="secret_agree2">동의합니다.</label>
+                                <div class="invalid-feedback">
+                                    동의해야만 가입하실 수 있습니다.
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group row">
+                        <label for="username" class="col-sm-3 col-form-label">개인정보의 제3자 수집<br>이용 제공에 대한 동의<br>(선택)</label>
+                        <div class="col-sm-9">
+                            <div class="custom-control custom-checkbox">
+                                <input type="checkbox" class="custom-control-input" id="third_use" name="third_use">
+                                <label class="custom-control-label" for="third_use">동의합니다.</label>
+                            </div>
+                        </div>
+                    </div>
+
                     <input type="hidden" id="global_salt" name="global_salt" value="<?=RootDB::getGlobalSalt()?>">
                     <div class="form-group row">
                         <div class="col-sm-3"></div>
diff --git a/oauth_kakao/terms.1.html b/oauth_kakao/terms.1.html
new file mode 100644
index 00000000..74cfb242
--- /dev/null
+++ b/oauth_kakao/terms.1.html
@@ -0,0 +1,143 @@
+<pre>
+    HiDCHe서버 이용 약관
+
+    제1조 (목적)
+    이 약관은 HiDCHe서버 서비스 제공자(이하 “서비스 제공자”)가 제공하는 삼국지 모의전투 서비스와 관련하여 서비스 제공자와 이용자의 권리, 의무, 책임사항 및 기타 필요 사항을 규정함을 그 목적으로 한다. 
+    
+    제2조 (정의)
+    이 약관에서 사용하는 용어의 정의는 다음과 같다. 
+      1. “서비스”라 함은 디스플레이가 구현되는 단말 장치(PC, 휴대폰, TV 등 각종 유무선 장치를 포함하나 이에 제한되지 아니한)에서 제공되는 삼국지 모의전투 서비스 및 관련 제반 서비스를 의미한다. 
+      2. “이용자”라 함은 서비스에 접속하여 본 약관에 따라 서비스 제공자와 이용계약을 체결하고 서비스 이용자가 제공하는 서비스를 이용하는 자를 의미한다. 
+      3. “아이디”라 함은 이용자의 식별과 서비스 이용을 위하여 사용자가 정한 일련의 문자(한글, 영문, 숫자 등) 조합을 의미한다. 
+      4. “비밀번호” 또는 “패스워드”란 아이디와 1:1로 매칭되어 이용자가 해당 아이디와 일치되는 이용자임을 확인하고 보호하는 이용자 본인이 지정한 일련의 문자 조합을 의미한다. 
+      5. “게시물”이라 함은 이용자가 서비스를 이용함에 있어서 서비스 상에 게시한 문자, 문서, 그림, 영상 등 시청각적 요소를 의미한다. 
+      6. “운영자”란 서비스 제공자 및 서비스 제공자에 의하여 권한을 위임받은 자로써, 안정적이고 쾌적한 서비스 제공을 위하여 노력 할 의무를 가지는 자를 의미한다. 
+      7. 본 약관에서 정의하지 않은 용어는 서비스 세부 지침(약관) 내지는 관계 법령 등에서 정하는 바에 따르며, 이에 정하지 아니한 것은 사회적 통념상 따르는 관습에 따라 해석한다. 단, 이용자 간의 분쟁에서 명확하게 해석되지 아니하는 용어 및 관습은 운영자 과반 이상의 동의에 따라 해석한다. 
+    
+    제3조(약관의 개정)
+    ⓵ 서비스 제공자는 “약관의 규제에 관한 법률” 및 “정보통신망 이용촉진 및 정보보호 등에 관한 법률” 등 현행법을 위배하지 않는 범위 내에서 본 약관을 개정할 수 있다. 
+    ⓶ 서비스 제공자가 본 약관을 개정할 경우, 적용일자 및 개정 사유를 명시하여 최소 적용일자 30일 전부터 적용일자 전 까지 게시 할 의무를 가진다. 단, 이용자에게 현저하게 불리하게 개정되는 경우 개정의 게시 이외에 전자우편 등의 전자적 수단을 이용하여 별도로 통지 할 의무를 가진다. 
+    ⓷ 이용자는 30일 기간 내에 서비스 탈퇴 및 기타 전자적 수단을 통한 명시적 거부의 의사표시를 하지 아니한 경우, 이용자는 개정된 약관에 동의를 한 것으로 간주한다. 
+    ⓸ 이용자가 개정된 약관에 동의하지 않는 경우, 서비스 제공자는 개정 약관을 해당 이용자에게 적용할 수 없으며, 기존 약관을 적용하기 현저하게 곤란한 사정이 있거나 적용할 수 없는 특별한 사정이 있는 경우, 서비스 제공자는 이용계약을 해지할 수 있다. 
+    
+    제4조(약관의 게시)
+    ⓵ 서비스 제공자는 본 약관을 내용을 이용자들이 쉽게 알 수 있도록 제공 할 의무가 있으며, 이용자는 본 약관을 언제든지 열람 할 권리를 가진다. 
+    ⓶ 약관은 서비스 초기 화면을 통하여 접근할 수 있으며, 서비스 초기 화면에서 제공되는 약관 이외의 약관의 내용은 효력이 없다. 
+    
+    제5조(이용계약의 체결)
+    ⓵ 이용계약은 이용자가 되고자 하는 자(이하 “가입희망자”)가 약관에 대하여 동의를 한 다음 회원가입 신청을 하고, 서비스 제공자가 승낙함으로써 체결된다. 
+    ⓶ 서비스 제공자는 원칙적으로 가입희망자가 적법하게 한 회원가입에 대해서는 승낙한다. 다만, 서비스 제공자는 아래 각 호에 해당하는 신청에 대하여서는 승낙을 거부하거나, 사후 거부 사유가 발견되는 경우 이용계약을 해지할 수 있다. 
+      1. 실명이 아니거나 타인의 명의를 도용하여 가입한 경우
+      2. 14세 미만 아동이 법정대리인의 동의를 얻지 아니한 경우
+      3. 허위 정보 또는 서비스 제공자를 기망하고자 하는 의도를 가지고 서비스 제공자가 제시하는 내용을 기재하지 않은 경우
+      4. 본 약관에서 규정한 제반 사항을 위반한 자로써, 서비스 제공자에 의하여 가입희망자가 그 이용 권한을 영구적으로 박탈당한 경우
+      5. 기타 운영자 과반 이상의 판단에 따라 가입희망자를 승인함으로써 원활한 서비스 제공을 하는데 문제가 있을 것으로 판단되는 사유가 있는 경우
+    ⓷ 이용계약은 서비스 제공자가 회원가입완료를 표시 한 시점으로 한다. 
+    ⓸ 서비스 제공자는 “청소년보호법” 등 기타 법령에 따라 등급 및 연령 준수를 위하여 이용제한이나 등급별 제한을 할 수 있다. 
+    
+    제6조(회원정보)
+    ⓵ 회원정보란 서비스 이용자 개인이 서비스 제공자에게 제공한 이용자의 정보로, 개인정보를 포함하는 정보이다. 
+    ⓶ 이용자는 개인정보 관리 화면을 통하여 언제든지 본인의 정보를 열람하고 수정할 수 있다. 단, 원활한 서비스 관리를 위하여 아이디, 생년월일 등은 수정을 제한할 수 있다. 
+    ⓷ 이용자는 본인의 회원정보를 관리 할 의무를 가지며, 변경이 발생하는 경우 지체없이 서비스 제공자에게 온라인 수정 등을 통하여 통보 하여야 한다. 
+    ⓸ 제3항의 의무를 태만하게 하여 발생한 불이익에 대하여 서비스 제공자는 책임지지 않는다. 
+    
+    제7조(개인정보보호의 의무)
+    ⓵ 서비스 제공자는 “정보통신망법” 등 관계 법령에 정하는 바에 따라 이용자의 개인정보를 보호 할 의무를 가진다.
+    
+    제8조(이용자의 아이디 및 비밀번호 관리 의무)
+    ⓵ 서버에 저장된 개인정보 이외의 개인정보(아이디 및 비밀번호를 포함한다)에 대한 관리책임은 이용자에게 있다. 
+    ⓶ 서비스 제공자 및 운영자는 공공의 질서 및 선량한 사회 풍속을 해칠 염려가 있는 아이디, 또는 운영자로 오인할 염려가 큰 아이디에 대해서 이용을 제한할 수 있다. 
+    제9조(서비스 제공자의 의무)
+    ⓵ 서비스 제공자는 관련 법령과 본 약관이 금지하는 행위, 또는 사회질서 및 선량한 풍속을 해칠 염려가 있는 행위를 하지 않으며, 계속적이고 안정적으로 서비스를 제공하기 위하여 최선의 노력을 다 할 의무를 가진다. 
+    ⓶ 서비스 제공자는 이용자가 안전하게 서비스를 이용할 수 있도록 개인정보를 취급하는데 있어서 적합한 관리를 해야 하며, 개인정보 제공 및 이용에 대한 방침을 공시하고 준주 할 의무를 가진다. 
+    ⓷ 서비스 제공자는 서비스 이용과 관련하여 발생하는 이용자의 불만, 불편, 피해구제요청 및 이용자간의 분쟁을 적절하게 처리 할 수 있도록 필요한 인력 및 시스템을 마련하여야 할 의무를 가진다. 
+    ⓸ 서비스 제공자는 서비스 이용과 관련하여 이용자로부터 제기된 의견이 정당하다고 인정되는 경우 이를 가능한 조속히 처리 할 의무를 가지며, 처리 과정 및 결과를 통보 할 의무를 가진다. 
+    ⓹ 서비스 제공자는 상기 의무를 수행함에 있어서 적합하다고 판단되는 자를 운영자로 선임할 수 있으며, 원활한 서비스 제공을 위하여 적합한 수의 운영자를 선임 할 의무를 가진다. 
+    
+    제10조(이용자의 의무)
+    ⓵ 이용자는 원활한 서비스를 위하여 다음과 각 호의 행위를 해서는 안 된다. 
+      1. 신청 또는 변경 시 허위 정보를 등록하는 행위
+      2. 타인의 정보를 도용하는 행위
+      3. 서비스 제공자의 저작권 등의 산업지식재산권의 침해 행위
+      4. 서비스 제공자의 업무를 방해하는 행위
+      5. 기타 선량한 공공의 질서를 어지럽히는 행위
+      6. 기타 불법적이거나 부당한 행위
+      7. 의도적으로 서비스 이용자들 간의 불화를 일으키는 행위
+      8. 서비스 제공자 및 운영자 과반 이상의 동의에 따라 원활한 서비스 제공을 하는데 곤란한 사유를 발생시키는 행위
+    ⓶ 이용자는 본 약관 및 관련 법령, 서비스 제공자 및 운영자에 의하여 게시된 공지사항 및 통지사항 등을 준수 할 의무를 가진다. 
+    
+    제11조(서비스의 제공)
+    ⓵ 서비스 제공자는 다음 각 호의 서비스를 이용자에게 제공한다. 
+      1. 삼국지 모의전투
+      2. 게시판 커뮤니티
+      3. 삼국지 모의전투 내 채팅
+      4. 기타 서비스 제공자가 추가 개발하거나 제휴/라이센싱 등을 통해 이용자에게 제공하는 서비스
+    ⓶ 서비스 제공자는 서비스 이용가능시간을 별도로 지정할 수 있으며, 해당 시간은 사전에 공지되어야한다. 
+    ⓷ 서비스는 연중무휴, 1일 24시간 제공함을 원칙으로 한다. 
+    ⓸ 서비스 제공자는 서비스 기능개선, 컴퓨터 등 정보통신장비의 유지보수, 점검, 고장, 통신두절, 천재지변 등 운영상 상당한 이유가 있는 경우 서비스의 제공을 일시적으로 중단할 수 있다. 이 경우, 서비스 제공자는 사전에 전자우편, 공지사항 등 적합한 방법으로 이용자들에게 고지 할 의무가 있다. 단, 서비스 제공자가 사전에 통지할 수 없는 부득이한 사유가 있는 경우 그렇지 않다. 
+    
+    제12조(계약해제, 해지 등)
+    ⓵ 이용자는 언제든지 “회원탈퇴”기능을 통하여 이용계약 해지신청을 할 수 있으며, 서비스 제공자는 관련 법령이 정하는 바에 따라 지체 없이 처리하여야 한다. 
+    ⓶ 이용자가 이용계약을 해지할 경우, 개인정보처리방침에 따라 회사가 이용자의 정보를 보유하는 경우를 제외하고는 지체 없이 모든 데이터를 삭제하여야 한다. 
+    ⓷ 이용자가 이용계약을 해지하는 경우, 이용자가 작성한 게시물 중 본인만 조회 가능한 게시물 일체는 삭제된다. 단, 타인에 의하여 스크랩 되거나, 공용게시판, 타인의 쪽지함 등록된 게시물 등 타인에게 노출되는 게시물 등은 삭제되지 않을 수 있다. 
+    ⓸ 이용자가 이용계약을 해제하는 경우, 서비스 제공자는 일정 기간 내 동일한 정보로 회원 가입을 제한할 수 있다. 
+    
+    제13조(이용제한)
+    ⓵ 서비스 제공자는 이용자가 본 약관의 의무를 위반하거나, 서비스의 정상적인 운영을 방해하는 경우 그 경중 및 반복횟수에 따라 경고, 일시정지, 영구정지 등 단계적으로 서비스의 이용을 제한할 수 있다. 
+    ⓶ 서비스 제공자는 제1조에도 불구하고, 아래 각 호의 위반이 발견되는 경우 즉시 영구이용정지를 할 수 있으며, 본 항에 따른 이용정지 시 발생하는 손해에 대해서 서비스 제공자는 책임을 지지 않는다. 
+      1. 정보통신망법 소정의 불법통신, 해킹, 악성프로그램 배포 등 보안에 중대한 위협을 주는 행위
+      2. 주민등록법 소정의 명의도용을 하는 행위
+      3. 저작권법 소정의 불법프로그램의 제공/배포 및 운영방해 행위
+      4. 기타 서비스 제공에 중대한 지장을 주는 것으로 운영자 과반 이상의 동의를 받는 행위
+    
+    제14조(이용제한에 대한 이의신청)
+    ⓵ 이용자는 제13조에 따른 이용제한이 부당하다고 생각되는 경우, 이를 통보받은 날로부터 5일 이내에 서비스 제공자의 이용제한에 대한 불복사유를 기재한 이의신청서를 게시글 또는 전자우편, 혹은 이에 준하는 방법으로 서비스 제공자에게 제출하여야 한다. 
+    ⓶ 제1항의 이의신청서를 접수한 서비스 제공자는 지체 없이 이용자에게 접수에 대한 통보를 하여야 하며, 접수 한 날로부터 5일 이내에 불복 사유에 대하여 게시글에 대한 답글, 전자우편, 또는 이에 준하는 방법으로 답변하여야 한다. 단, 5일 이내에 답변이 현저하게 곤란한 경우 그 사유와 처리예정일정을 통보하여야 한다. 
+    ⓷ 서비스 제공자는 제2항의 답변에 따라 상응하는 조치를 즉시 취하여야 한다. 
+    
+    제15조(서비스 제공자의 책임제한)
+    ⓵ 서비스 제공자는 천재지변, 또는 이에 준하는 불가항력으로 인하여 서비스를 제공할 수 없는 경우 서비스 제공에 대한 책임이 면제된다. 
+    ⓶ 서비스 제공자는 이용자의 귀책사유로 인한 서비스 이용 장애에 대하여서는 책임지지 않는다. 
+    ⓷ 서비스 제공자는 회원이 서비스와 관련하여 게재한 정보에 대해서 그 신뢰성과 정확성에 대해서 책임지지 않으며, 이를 정정 할 의무를 가지지 않는다. 
+    ⓸ 서비스 제공자는 이용자 간 서비스의 내용을 매개로 하여 서비스 제공자가 원본 데이터에 접근할 수 없는 방법으로 거래 등 이에 준하는 행위를 한 경우 그 내용에 대해서 책임지지 않는다. 
+    ⓹ 서비스 제공자는 무료로 제공되는 서비스 이용과 관련하여 관련 법령에 특별한 규정이 없는 한 책임지지 않는다. 
+    ⓺ 서비스 제공자는 기간통신 사업자가 전기통신서비스를 중지하거나, 정상적으로 제공하지 아니하여 이용자에게 유·무형적 손해가 발생한 경우, 서비스 제공자에게 고의 또는 중대한 과실이 없는 한 책임지지 않는다. 
+    ⓻ 서비스 제공자는 사전에 공지된 서비스 중단으로 인하여 장애가 발생한 경우 서비스 제공자의 고의 또는 중대한 과실이 없는 한 책임지지 않는다. 
+    ⓼ 서비스 제공자는 이용자의 서비스 이용 환경(네트워크, PC설정 등)으로 인하여 발생하는 문제에 대해서 책임지지 않는다. 
+    
+    제16조(분쟁조정)
+    ⓵ 서비스 제공자는 서비스 내의 이용자 간의 분쟁에 대해서는 개입하지 않고, 이용자간의 합의를 수용하는 것을 원칙으로 한다. 
+    ⓶ 제1항에도 불구하고, 아래 각 호의 경우에 대해서 서비스 제공자는 이용자 간의 분쟁 조정을 위하여 개입할 수 있다. 
+      1. 분쟁 양 당사자 간의 합의가 이루어지지 않아 양 당사자 모두 서비스 제공자에게 게시물, 전자우편 또는 이에 준하는 방법으로 분쟁조정을 요청하는 경우
+      2. 본 약관 또는 관련 법령을 분쟁 당사자중 일방 또는 양방이 위배하는 경우
+      3. 분쟁이 합리적인 시간 이상 지속되어 원활한 서비스를 방해한다고 판단되는 경우
+      4. 기타 원활하고 쾌적한 서비스를 제공하는데 문제가 될 소지가 있다고 판단되는 경우
+    ⓷ 제2항의 분쟁조정자는 서비스 제공자가 판단하는 경중에 따라서 선임된 1인의 운영자 혹은 운영자 전원합의체에 의하여 분쟁조정을 개시한다. 이 때, 분쟁조정의 결과는 분쟁조정 개시로부터 5일 이내에 게시물에 대한 답글, 공지사항, 전자우편 또는 이에 준하는 공개적인 방법으로 게시되어야 한다. 
+    ⓸ 분쟁조정의 판단 결과는 오직 재심청구에 의해서만 번복될 수 있다. 단, 운영자 전원합의체에서 판단된 분쟁조정은 재심청구 할 수 없다. 
+    ⓹ 분쟁의 당사자는 운영자 1인 이상에게 제척사유가 있다고 판단되는 경우 제2항 제1호 소정의 분쟁조정 신청 시 서비스 제공자에게 제척신청을 하여야 한다. 
+    
+    제17조(분쟁조정 재심청구)
+    ⓵ 이용자는 제16조 소정의 분쟁조정에서 운영자 1인의 분쟁조정이 불합리하거나, 문제가 있다고 판단되는 경우 게시물, 전자우편, 또는 이에 준하는 방법으로 서비스 제공자에게 재심청구를 할 수 있다. 
+    ⓶ 제1항 소정의 재심청구 시, 서비스 제공자는 반드시 운영자 전원합의체를 구성하여야 하며, 3일 이내에 재심에 대한 결과를 이용자에게 통보하여야 한다. 이 때, 분쟁조정에 참여한 운영자 1인은 중대한 문제가 있다고 판단되지 않는 이상 제척대상이 아니다. 
+    ⓷ 재심청구에 대한 판단 결과의 게시는 분쟁조정의 게시를 준용한다. 
+    
+    제18조(운영자 전원합의체)
+    ⓵ 운영자 전원합의체는 서비스 운영에 있어서 중대한 판단을 수행하는 합의체로, 다음과 같이 구성된다.
+      1. 서비스 제공자(의장)
+      2. 서비스 제공자에 의하여 선임된 1인 이상의 운영자
+    ⓶ 운영자 전원합의체는 원활한 서비스 운영을 유지하기 위한 업무를 담당하며, 다음 각 호의 업무를 수행한다. 
+      1. 분쟁조정의 재심청구
+      2. 제16조 제2항 제4호 해당 여부 판단
+      3. 이용자 1인의 제10조 제1항 제3호 내지 제5호, 제7호, 제8호 해당 여부 판단
+      4. 기타 서비스 운영에 있어 서비스 제공자가 중대하다고 판단한 안건에 대한 판단
+    ⓷ 서비스 제공자는 제2호 각호의 사유가 발생한 경우, 지체 없이 운영자 전원합의체를 구성하여 판단을 내려야 한다. 단, 운영자 1인 이상의 부재로 정족수(운영자 전원합의체 구성인원의 2/3 이상)를 만족하지 못 하는 경우, 게시물, 전자우편 또는 이에 준하는 방법으로 소집일을 기재하여 통보하여야 한다. 
+    ⓸ 운영자 전원합의체는 반드시 서비스에서 제공하는 채팅, 또는 서비스 제공자가 공인한 공개적 방법을 통해서 진행해야하며, 전원합의체 종료 시 서비스 제공자는 모든 로그 파일을 이용자에게 공개 할 의무를 가진다. 
+    ⓹ 전원합의체는 만장일치를 원칙으로 한다. 단, 다음 각 호의 경우 의장은 다수결을 진행할 수 있다. 단, 다수결로 진행된 전원합의체 판단은 사후 전원합의체의 만장일치로 파기될 수 있다. 
+      1. 개인 간의 가치판단이 충돌하여 합의에 이르기 불가능하다고 판단되는 경우
+      2. 기타 판단에 시급성을 요하는 경우
+    ⓺ 운영자 전원합의체는 필요하다고 판단되는 경우, 이용자 및 관련자를 증인으로 하여 판단의 참고자료로 이용할 수 있다. 
+    
+    
+    부칙 <2018.4.17.>
+    ⓵ 본 약관은 2018.4.17.부터 적용된다.     
+</pre>
\ No newline at end of file
diff --git a/oauth_kakao/terms.2.html b/oauth_kakao/terms.2.html
new file mode 100644
index 00000000..e8609953
--- /dev/null
+++ b/oauth_kakao/terms.2.html
@@ -0,0 +1,22 @@
+<pre>
+개인정보 제공 및 이용에 대한 동의
+
+0. 아래 내용을 자세히 읽으신 후, 개인정보 제공 및 이용, 그리고 제3자 제공에 대한 동의 여부를 결정하여 주십시오. 
+
+1. HiDCHe서버 서비스(이하 ‘본 서비스’) 이용에 있어, 서비스 이용자(이하 ‘이용자)개인정보를 다음과 같이 전산망 등에 수집·관리 하고 있습니다. 
+  ○ 개인정보의 수집·이용 목적 	: 셧다운제 영향에 따른 이용자 연령 확인, 중복 가입 여부, 개인별 참여 이력 관리 등 서비스 제공에 따른 활용
+  ○ 수집하는 개인정보 항목	: 아이디, 이메일, 생년월일, 전화번호
+  ○ 개인정보의 보유 및 이용기간	: 보유기간은 서비스 이용 기간 및 서비스 탈퇴 후 1개월
+
+2. 원활한 서비스 제공을 위하여, 본 서비스는 위와 같은 개인정보가 필요하며, 「개인정보보호법」에 따라 이용자로부터 제공받는 개인정보를 보호합니다. 
+
+3. 서비스 제공자는 개인정보를 처리 목적에 필요한 범위 내에서 적합하게 관리·이용하고, 그 목적 외의 용도로는 사용하지 않으며, 개인정보를 제공한 이용자는 언제나 자신이 입력한 개인정보의 열람 및 수정을 신청할 수 있습니다. 다만, 기타 법령 및 고시 등 공적인 사유에 의거하여 정보의 보존이 필요하다 판단되거나 강제되는 경우 서비스 제공자는 개인정보의 수정을 거부할 수 있습니다. 
+
+4. 개인정보 3자 제공 내역
+  * 없음
+
+5. 이용자는 개인정보 제공에 대한 동의를 거부할 권리가 있습니다. 그러나 동의를 거부할 경우, 원활한 서비스 제공에 제한을 받을 수 있습니다. 
+
+개인정보 관리자 : 이동수
+연락처 : hided62＠gmail.com
+</pre>
\ No newline at end of file
diff --git a/oauth_kakao/terms.html b/oauth_kakao/terms.html
deleted file mode 100644
index 0f0a471d..00000000
--- a/oauth_kakao/terms.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>개인정보로써 <strong>이메일, 계정명, 닉네임</strong>을 수집하며, 유저 로그인 및 다중 접속 탐지를 위해 사용함. 이메일은 필요에 따라 공지사항 등 본 사이트의 정보를 전파하는데 사용될 수 있음. 위의 언급한 내용 이외의 용도로 개인정보를 사용하지 않음.</p>
-<p>수집된 개인정보는 탈퇴 후 1개월간 보관됨.</p>
-<p>게임 시스템을 오용하거나, 서버에 해킹시도하거나, 분란을 야기하는 경우 경고 처리 후 차단될 수 있으며, 경중에 따라 경고 처리 없이 바로 차단될 수 있음.</p>
-<p>개인정보 관리자 : Hide_D</p>
-<p>문의는 hided62@gmail.com 으로.</p>
\ No newline at end of file
diff --git a/src/sammo/Util.php b/src/sammo/Util.php
index d6aeab9f..ff33e686 100644
--- a/src/sammo/Util.php
+++ b/src/sammo/Util.php
@@ -34,7 +34,7 @@ class Util extends \utilphp\util
 
         if ($type === 'bool') {
             $value = strtolower($value);
-            if ($value === 'false' || $value === 'no' || $value === 'n' || $value === 'x' || $value === 'null') {
+            if ($value === 'off' || $value === 'false' || $value === 'no' || $value === 'n' || $value === 'x' || $value === 'null') {
                 return false;
             }
             return !!$value;

From 2bec3b253ced3fa74a8eb671e57d08b9841375a1 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 20:09:11 +0900
Subject: [PATCH 005/184] proc readonly

---
 hwe/proc.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hwe/proc.php b/hwe/proc.php
index b64ab090..76969abf 100644
--- a/hwe/proc.php
+++ b/hwe/proc.php
@@ -4,6 +4,8 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 
+$session = Session::getInstance()->setReadOnly();
+
 $db = DB::db();
 $connect=$db->get();
 

From a43bbc9f234146037feb4ebbca10f6c50ff1f3fa Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 20:09:35 +0900
Subject: [PATCH 006/184] proc.php

---
 hwe/proc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/proc.php b/hwe/proc.php
index 76969abf..008db50c 100644
--- a/hwe/proc.php
+++ b/hwe/proc.php
@@ -9,5 +9,5 @@ $session = Session::getInstance()->setReadOnly();
 $db = DB::db();
 $connect=$db->get();
 
-increaseRefresh("자동", 2);
+//increaseRefresh("자동", 2);
 checkTurn();

From 12d50fec036f4cd6573716b73579b02d8086bd86 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 20:16:04 +0900
Subject: [PATCH 007/184] =?UTF-8?q?=EC=9E=A5=EC=88=98=20=EB=93=B1=EB=A1=9D?=
 =?UTF-8?q?=20=EC=8B=9C=20scenario=20=EA=B0=92=EA=B3=BC=20show=5Fimg=5Flev?=
 =?UTF-8?q?el=20=EA=B0=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/join_post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/join_post.php b/hwe/join_post.php
index 98e3e536..59dd6885 100644
--- a/hwe/join_post.php
+++ b/hwe/join_post.php
@@ -70,7 +70,7 @@ if (!$member) {
 $db = DB::db();
 ########## 동일 정보 존재여부 확인. ##########
 
-$admin = $db->queryFirstRow('SELECT year,month,maxgeneral,turnterm,genius,npcmode from game limit 1');
+$admin = $db->queryFirstRow('SELECT year,month,maxgeneral,scenario,show_img_level,turnterm,genius,npcmode from game limit 1');
 $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);

From c26add7b043b42eabe9f9b88f3759cfe2bf8100b Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 20:40:56 +0900
Subject: [PATCH 008/184] =?UTF-8?q?29=EB=B2=88=20=EC=8B=9C=EB=82=98?=
 =?UTF-8?q?=EB=A6=AC=EC=98=A4=20=EA=B8=89=EC=A1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/scenario/scenario_29.json | 703 ++++++++++++++++++++++++++++++++++
 1 file changed, 703 insertions(+)
 create mode 100644 hwe/scenario/scenario_29.json

diff --git a/hwe/scenario/scenario_29.json b/hwe/scenario/scenario_29.json
new file mode 100644
index 00000000..c62ae729
--- /dev/null
+++ b/hwe/scenario/scenario_29.json
@@ -0,0 +1,703 @@
+{
+    "title":"【가상모드9】 천인 강림",
+    "life":1,
+    "fiction":1,
+    "nation":[  
+    ],
+    "diplomacy":[
+    ],
+    "general":[
+		[1,	"소제1",	1001,	0,	null,	20,	6,	24,	0,	160,	300,	"유지",	null],		
+		[1,	"헌제",	1002,	0,	null,	17,	7,	31,	0,	160,	300,	"안전",	null],		
+		[999,	"사마휘",	1003,	0,	null,	52,	6,	48,	0,	160,	300,	"은둔",	"신산",	"좋지, 좋아~"],
+		[999,	"우길",	1004,	0,	null,	17,	7,	42,	0,	160,	300,	"은둔",	"신산"],		
+		[999,	"화타",	1005,	0,	null,	45,	13,	35,	0,	160,	300,	"은둔",	"의술",	"아픈 사람들은 모두 내게 오시오. 껄껄껄."],
+		[999,	"길평",	1006,	0,	null,	27,	8,	36,	0,	160,	300,	"은둔",	"의술"],		
+		[29,	"가규",	1007,	0,	null,	46,	28,	37,	0,	160,	300,	"재간",	null],		
+		[136,	"가범",	1008,	0,	null,	47,	24,	37,	0,	160,	300,	"유지",	null],		
+		[49,	"가비능",	1009,	0,	null,	47,	42,	16,	0,	160,	300,	"정복",	null],		
+		[31,	"가충",	1010,	0,	null,	44,	13,	44,	0,	160,	300,	"출세",	null],		
+		[20,	"가후",	1011,	0,	null,	52,	15,	47,	0,	160,	300,	"할거",	"귀병"],		
+		[73,	"간옹",	1012,	0,	null,	31,	17,	35,	0,	160,	300,	"안전",	"경작"],		
+		[129,	"감녕",	1013,	0,	null,	55,	48,	36,	0,	160,	300,	"출세",	"무쌍"],		
+		[127,	"감택",	1014,	0,	null,	49,	22,	40,	0,	160,	300,	"유지",	null],		
+		[60,	"강단",	1015,	0,	null,	40,	37,	22,	0,	160,	300,	"재간",	null],		
+		[73,	"강유",	1016,	0,	null,	62,	45,	47,	0,	160,	300,	"왕좌",	"집중",	"갈고 닦은 무예와 승상께 배운 책략을 발휘해 보이겠다!"],
+		[102,	"고간",	1017,	0,	null,	48,	29,	26,	0,	160,	300,	"유지",	null],		
+		[27,	"고람",	1018,	0,	null,	53,	34,	30,	0,	160,	300,	"출세",	"기병"],		
+		[69,	"고상",	1019,	0,	null,	40,	20,	19,	0,	160,	300,	"재간",	null],		
+		[144,	"고순",	1020,	0,	null,	56,	41,	33,	0,	160,	300,	"의협",	"기병"],		
+		[7,	"고승",	1021,	0,	null,	41,	37,	12,	0,	160,	300,	"출세",	null],		
+		[120,	"고옹",	1022,	0,	null,	47,	11,	40,	0,	160,	300,	"출세",	null],		
+		[63,	"고정",	1023,	0,	null,	51,	33,	28,	0,	160,	300,	"정복",	null],		
+		[53,	"고패",	1024,	0,	null,	45,	28,	14,	0,	160,	300,	"유지",	null],		
+		[74,	"공도",	1025,	0,	null,	26,	37,	10,	0,	160,	300,	"재간",	null],		
+		[142,	"공손강",	1026,	0,	null,	50,	36,	31,	0,	160,	300,	"정복",	null],		
+		[142,	"공손공",	1027,	0,	null,	51,	21,	38,	0,	160,	300,	"정복",	null],		
+		[142,	"공손도",	1028,	0,	null,	49,	36,	21,	0,	160,	300,	"정복",	"기병"],		
+		[65,	"공손범",	1029,	0,	null,	48,	34,	31,	0,	160,	300,	"출세",	null],		
+		[65,	"공손속",	1030,	0,	null,	48,	38,	21,	0,	160,	300,	"정복",	null],		
+		[10,	"공손연",	1031,	0,	null,	54,	40,	32,	0,	160,	300,	"패권",	"돌격"],		
+		[65,	"공손월",	1032,	0,	null,	43,	32,	23,	0,	160,	300,	"정복",	null],		
+		[65,	"공손찬",	1033,	0,	null,	48,	44,	34,	0,	160,	300,	"패권",	"기병"],		
+		[43,	"공융",	1034,	0,	null,	49,	24,	43,	0,	160,	300,	"왕좌",	"경작"],		
+		[35,	"공주",	1035,	0,	null,	50,	18,	39,	0,	160,	300,	"재간",	null],		
+		[83,	"공지",	1036,	0,	null,	47,	27,	32,	0,	160,	300,	"대의",	null],		
+		[26,	"곽가",	1037,	0,	null,	43,	12,	50,	0,	160,	300,	"패권",	"귀모"],		
+		[111,	"곽도",	1038,	0,	null,	49,	34,	41,	0,	160,	300,	"재간",	null],		
+		[2,	"곽사",	1039,	0,	null,	47,	34,	16,	0,	160,	300,	"패권",	null],		
+		[80,	"곽유지",	1040,	0,	null,	37,	11,	36,	0,	160,	300,	"재간",	"상재"],		
+		[67,	"곽익",	1041,	0,	null,	51,	30,	34,	0,	160,	300,	"재간",	null],		
+		[67,	"곽준",	1042,	0,	null,	54,	35,	37,	0,	160,	300,	"출세",	null],		
+		[27,	"곽혁",	1043,	0,	null,	40,	15,	40,	0,	160,	300,	"안전",	null],		
+		[20,	"곽회",	1044,	0,	null,	55,	38,	36,	0,	160,	300,	"정복",	null],		
+		[39,	"관구검",	1045,	0,	null,	53,	34,	39,	0,	160,	300,	"대의",	null],		
+		[76,	"관색",	1046,	0,	null,	52,	43,	34,	0,	160,	300,	"의협",	"징병"],		
+		[76,	"관우",	1047,	0,	null,	62,	49,	40,	0,	160,	300,	"의협",	"위압",	"나의 청룡 언월도를 과연 막아낼 수 있겠소?"],
+		[76,	"관이",	1048,	0,	null,	43,	30,	29,	0,	160,	300,	"안전",	null],		
+		[76,	"관통",	1049,	0,	null,	44,	32,	30,	0,	160,	300,	"대의",	null],		
+		[76,	"관평",	1050,	0,	null,	55,	40,	35,	0,	160,	300,	"의협",	"보병"],		
+		[7,	"관해",	1051,	0,	null,	50,	45,	18,	0,	160,	300,	"출세",	null],		
+		[76,	"관흥",	1052,	0,	null,	52,	42,	36,	0,	160,	300,	"의협",	"돌격"],		
+		[40,	"괴량",	1053,	0,	null,	40,	14,	41,	0,	160,	300,	"안전",	"신중"],		
+		[40,	"괴월",	1054,	0,	null,	26,	15,	42,	0,	160,	300,	"유지",	"귀병"],		
+		[98,	"교모",	1055,	0,	null,	48,	29,	31,	0,	160,	300,	"안전",	null],		
+		[98,	"교현",	1056,	0,	null,	44,	9,	30,	0,	160,	300,	"재간",	null],		
+		[6,	"구역거",	1057,	0,	null,	44,	36,	25,	0,	160,	300,	"안전",	null],		
+		[80,	"극정",	1058,	0,	null,	38,	13,	38,	0,	160,	300,	"유지",	null],		
+		[46,	"금선",	1059,	0,	null,	46,	25,	18,	0,	160,	300,	"할거",	null],		
+		[62,	"금환삼결",	1060,	0,	null,	42,	38,	9,	0,	160,	300,	"출세",	null],		
+		[141,	"기령",	1061,	0,	null,	54,	41,	17,	0,	160,	300,	"대의",	"무쌍"],		
+		[122,	"낙통",	1062,	0,	null,	47,	22,	35,	0,	160,	300,	"유지",	null],		
+		[124,	"노숙1",	1063,	0,	null,	60,	21,	47,	0,	160,	300,	"왕좌",	"상재"],		
+		[75,	"노식",	1064,	0,	null,	60,	27,	40,	0,	160,	300,	"왕좌",	"징병"],		
+		[59,	"뇌동",	1065,	0,	null,	52,	39,	23,	0,	160,	300,	"출세",	"궁병"],		
+		[142,	"뇌박",	1066,	0,	null,	46,	27,	17,	0,	160,	300,	"유지",	null],		
+		[127,	"능조",	1067,	0,	null,	51,	40,	22,	0,	160,	300,	"재간",	"공성"],		
+		[127,	"능통",	1068,	0,	null,	52,	39,	29,	0,	160,	300,	"의협",	"궁병"],		
+		[64,	"단경",	1069,	0,	null,	51,	31,	34,	0,	160,	300,	"정복",	null],		
+		[132,	"담웅",	1070,	0,	null,	45,	39,	10,	0,	160,	300,	"출세",	null],		
+		[99,	"답둔",	1071,	0,	null,	48,	36,	16,	0,	160,	300,	"유지",	null],		
+		[132,	"당자",	1072,	0,	null,	48,	28,	23,	0,	160,	300,	"안전",	null],		
+		[60,	"대래동주",	1073,	0,	null,	40,	33,	12,	0,	160,	300,	"안전",	null],		
+		[82,	"도겸",	1074,	0,	null,	44,	16,	31,	0,	160,	300,	"할거",	"인덕"],		
+		[120,	"도준",	1075,	0,	null,	50,	29,	25,	0,	160,	300,	"안전",	null],		
+		[73,	"동궐",	1076,	0,	null,	50,	25,	38,	0,	160,	300,	"대의",	null],		
+		[62,	"동다나",	1077,	0,	null,	44,	36,	14,	0,	160,	300,	"유지",	null],		
+		[2,	"동민",	1078,	0,	null,	45,	33,	25,	0,	160,	300,	"안전",	null],		
+		[21,	"동소",	1079,	0,	null,	42,	23,	31,	0,	160,	300,	"패권",	null],		
+		[127,	"동습",	1080,	0,	null,	45,	32,	16,	0,	160,	300,	"출세",	null],		
+		[89,	"동승",	1081,	0,	null,	54,	33,	33,	0,	160,	300,	"왕좌",	null],		
+		[78,	"동윤",	1082,	0,	null,	50,	13,	39,	0,	160,	300,	"왕좌",	null],		
+		[2,	"동탁",	1083,	0,	null,	59,	46,	27,	0,	160,	300,	"패권",	"기병"],		
+		[66,	"동화",	1084,	0,	null,	43,	32,	27,	0,	160,	300,	"대의",	null],		
+		[32,	"두예",	1085,	0,	null,	59,	40,	42,	0,	160,	300,	"정복",	null],		
+		[7,	"등무",	1086,	0,	null,	41,	37,	10,	0,	160,	300,	"정복",	null],		
+		[41,	"등애",	1087,	0,	null,	62,	41,	46,	0,	160,	300,	"패권",	"신산"],		
+		[116,	"등윤",	1088,	0,	null,	34,	21,	34,	0,	160,	300,	"안전",	null],		
+		[73,	"등지",	1089,	0,	null,	54,	26,	40,	0,	160,	300,	"할거",	"경작"],		
+		[41,	"등충",	1090,	0,	null,	48,	41,	28,	0,	160,	300,	"출세",	null],		
+		[54,	"등현",	1091,	0,	null,	50,	30,	31,	0,	160,	300,	"출세",	null],		
+		[29,	"마균",	1092,	0,	null,	33,	19,	40,	0,	160,	300,	"안전",	null],		
+		[71,	"마대",	1093,	0,	null,	55,	40,	25,	0,	160,	300,	"대의",	"기병"],		
+		[70,	"마등",	1094,	0,	null,	56,	44,	28,	0,	160,	300,	"왕좌",	"기병"],		
+		[80,	"마속",	1095,	0,	null,	53,	32,	41,	0,	160,	300,	"패권",	"집중"],		
+		[77,	"마량",	1096,	0,	null,	47,	13,	44,	0,	160,	300,	"왕좌",	null],		
+		[48,	"마완",	1097,	0,	null,	44,	32,	13,	0,	160,	300,	"안전",	"기병"],		
+		[19,	"마준",	1098,	0,	null,	42,	32,	31,	0,	160,	300,	"안전",	null],		
+		[71,	"마철",	1099,	0,	null,	52,	30,	16,	0,	160,	300,	"대의",	"기병"],		
+		[70,	"마초",	1100,	0,	null,	55,	49,	20,	0,	160,	300,	"대의",	"기병",	"금마초 나가신닷!"],
+		[131,	"마충1",	1101,	0,	null,	51,	31,	26,	0,	160,	300,	"재간",	null],		
+		[69,	"마충2",	1102,	0,	null,	48,	34,	26,	0,	160,	300,	"출세",	null],		
+		[71,	"마휴",	1103,	0,	null,	52,	30,	16,	0,	160,	300,	"대의",	"기병"],		
+		[116,	"만총",	1104,	0,	null,	56,	20,	39,	0,	160,	300,	"할거",	"신중"],		
+		[51,	"망아장",	1105,	0,	null,	29,	32,	10,	0,	160,	300,	"출세",	null],		
+		[44,	"맹달",	1106,	0,	null,	52,	33,	36,	0,	160,	300,	"할거",	"귀병"],		
+		[60,	"맹우",	1107,	0,	null,	49,	40,	13,	0,	160,	300,	"정복",	null],		
+		[60,	"맹획",	1108,	0,	null,	55,	46,	25,	0,	160,	300,	"왕좌",	"격노"],		
+		[29,	"모개",	1109,	0,	null,	42,	28,	28,	0,	160,	300,	"대의",	null],		
+		[51,	"목록대왕",	1110,	0,	null,	47,	36,	33,	0,	160,	300,	"재간",	"척사"],		
+		[96,	"목순",	1111,	0,	null,	17,	11,	34,	0,	160,	300,	"왕좌",	null],		
+		[43,	"무안국",	1112,	0,	null,	44,	37,	9,	0,	160,	300,	"재간",	null],		
+		[28,	"문빙",	1113,	0,	null,	52,	39,	22,	0,	160,	300,	"유지",	null],		
+		[38,	"문앙",	1114,	0,	null,	52,	46,	23,	0,	160,	300,	"대의",	null],		
+		[102,	"문추",	1115,	0,	null,	53,	47,	13,	0,	160,	300,	"출세",	"무쌍"],		
+		[38,	"문흠",	1116,	0,	null,	54,	39,	22,	0,	160,	300,	"대의",	null],		
+		[49,	"미당대왕",	1117,	0,	null,	50,	38,	16,	0,	160,	300,	"유지",	null],		
+		[108,	"미방",	1118,	0,	null,	47,	33,	19,	0,	160,	300,	"패권",	"징병"],		
+		[77,	"미축",	1119,	0,	null,	26,	15,	33,	0,	160,	300,	"왕좌",	"상재"],		
+		[94,	"반봉",	1120,	0,	null,	48,	38,	9,	0,	160,	300,	"출세",	null],		
+		[44,	"반준",	1121,	0,	null,	40,	11,	34,	0,	160,	300,	"안전",	null],		
+		[65,	"방덕",	1122,	0,	null,	54,	45,	34,	0,	160,	300,	"의협",	"기병"],		
+		[73,	"방통",	1123,	0,	null,	58,	21,	49,	0,	160,	300,	"패권",	"반계"],		
+		[65,	"방회",	1124,	0,	null,	25,	17,	30,	0,	160,	300,	"안전",	null],		
+		[68,	"배원소",	1125,	0,	null,	42,	35,	17,	0,	160,	300,	"재간",	null],		
+		[78,	"번건",	1126,	0,	null,	28,	16,	34,	0,	160,	300,	"대의",	null],		
+		[149,	"번주",	1127,	0,	null,	51,	39,	11,	0,	160,	300,	"할거",	null],		
+		[72,	"법정",	1128,	0,	null,	56,	15,	47,	0,	160,	300,	"패권",	"신산"],		
+		[8,	"변희",	1129,	0,	null,	50,	33,	14,	0,	160,	300,	"안전",	null],		
+		[121,	"보질",	1130,	0,	null,	47,	14,	39,	0,	160,	300,	"유지",	null],		
+		[113,	"복양흥",	1131,	0,	null,	47,	26,	36,	0,	160,	300,	"유지",	null],		
+		[110,	"봉기",	1132,	0,	null,	51,	26,	40,	0,	160,	300,	"패권",	"집중"],		
+		[74,	"부동",	1133,	0,	null,	47,	35,	35,	0,	160,	300,	"대의",	null],		
+		[108,	"부사인",	1134,	0,	null,	46,	30,	26,	0,	160,	300,	"출세",	null],		
+		[38,	"부손",	1135,	0,	null,	24,	22,	34,	0,	160,	300,	"안전",	null],		
+		[74,	"부첨",	1136,	0,	null,	48,	37,	23,	0,	160,	300,	"대의",	null],		
+		[66,	"비시",	1137,	0,	null,	18,	18,	31,	0,	160,	300,	"재간",	null],		
+		[141,	"비연",	1138,	0,	null,	50,	33,	27,	0,	160,	300,	"출세",	null],		
+		[77,	"비위",	1139,	0,	null,	53,	13,	37,	0,	160,	300,	"대의",	null],		
+		[144,	"사광",	1140,	0,	null,	47,	25,	33,	0,	160,	300,	"안전",	null],		
+		[71,	"사마가",	1141,	0,	null,	48,	43,	9,	0,	160,	300,	"정복",	"돌격"],		
+		[20,	"사마랑",	1142,	0,	null,	25,	16,	32,	0,	160,	300,	"대의",	null],		
+		[24,	"사마망",	1143,	0,	null,	52,	31,	33,	0,	160,	300,	"정복",	null],		
+		[24,	"사마부",	1144,	0,	null,	46,	16,	37,	0,	160,	300,	"대의",	null],		
+		[31,	"사마사",	1145,	0,	null,	59,	32,	46,	0,	160,	300,	"정복",	null],		
+		[31,	"사마소",	1146,	0,	null,	61,	32,	42,	0,	160,	300,	"정복",	null],		
+		[31,	"사마염",	1147,	0,	null,	61,	39,	36,	0,	160,	300,	"패권",	null],		
+		[30,	"사마유",	1148,	0,	null,	49,	23,	40,	0,	160,	300,	"왕좌",	null],		
+		[31,	"사마의",	1149,	0,	null,	63,	34,	49,	0,	160,	300,	"패권",	"반계"],		
+		[139,	"사섭",	1150,	0,	null,	49,	31,	36,	0,	160,	300,	"안전",	null],		
+		[139,	"사일",	1151,	0,	null,	48,	22,	34,	0,	160,	300,	"유지",	null],		
+		[132,	"사정",	1152,	0,	null,	51,	36,	10,	0,	160,	300,	"안전",	null],		
+		[146,	"사지",	1153,	0,	null,	48,	25,	35,	0,	160,	300,	"안전",	null],		
+		[144,	"사휘",	1154,	0,	null,	51,	36,	31,	0,	160,	300,	"유지",	null],		
+		[35,	"서막",	1155,	0,	null,	46,	21,	36,	0,	160,	300,	"유지",	null],		
+		[76,	"서서",	1156,	0,	null,	60,	35,	48,	0,	160,	300,	"의협",	"귀병"],		
+		[124,	"서성",	1157,	0,	null,	57,	38,	42,	0,	160,	300,	"대의",	null],		
+		[142,	"서영",	1158,	0,	null,	43,	32,	17,	0,	160,	300,	"안전",	null],		
+		[23,	"서질",	1159,	0,	null,	46,	37,	17,	0,	160,	300,	"재간",	null],		
+		[23,	"서황",	1160,	0,	null,	56,	45,	34,	0,	160,	300,	"의협",	"필살"],		
+		[32,	"석포",	1161,	0,	null,	52,	32,	30,	0,	160,	300,	"정복",	null],		
+		[131,	"설영",	1162,	0,	null,	42,	12,	32,	0,	160,	300,	"유지",	null],		
+		[128,	"설종",	1163,	0,	null,	27,	17,	34,	0,	160,	300,	"유지",	null],		
+		[69,	"성의",	1164,	0,	null,	42,	32,	11,	0,	160,	300,	"재간",	null],		
+		[129,	"소비",	1165,	0,	null,	51,	32,	25,	0,	160,	300,	"대의",	null],		
+		[76,	"손건",	1166,	0,	null,	41,	17,	37,	0,	160,	300,	"대의",	"거상"],		
+		[125,	"손견",	1167,	0,	null,	62,	48,	38,	0,	160,	300,	"왕좌",	"무쌍"],		
+		[126,	"손광",	1168,	0,	null,	49,	27,	29,	0,	160,	300,	"유지",	null],		
+		[125,	"손권",	1169,	0,	null,	60,	39,	42,	0,	160,	300,	"할거",	"수비"],		
+		[126,	"손랑",	1170,	0,	null,	27,	27,	14,	0,	160,	300,	"안전",	null],		
+		[126,	"손등",	1171,	0,	null,	45,	20,	39,	0,	160,	300,	"할거",	null],		
+		[125,	"손량",	1172,	0,	null,	24,	12,	40,	0,	160,	300,	"할거",	null],		
+		[20,	"손례",	1173,	0,	null,	50,	32,	35,	0,	160,	300,	"안전",	null],		
+		[124,	"손소",	1174,	0,	null,	54,	40,	34,	0,	160,	300,	"정복",	null],		
+		[130,	"손수",	1175,	0,	null,	51,	29,	30,	0,	160,	300,	"안전",	null],		
+		[126,	"손유",	1176,	0,	null,	55,	30,	34,	0,	160,	300,	"정복",	null],		
+		[122,	"손이",	1177,	0,	null,	47,	31,	29,	0,	160,	300,	"안전",	null],		
+		[126,	"손정",	1178,	0,	null,	48,	28,	31,	0,	160,	300,	"유지",	null],		
+		[115,	"손준",	1179,	0,	null,	48,	35,	26,	0,	160,	300,	"정복",	null],		
+		[7,	"손중",	1180,	0,	null,	45,	32,	12,	0,	160,	300,	"안전",	null],		
+		[125,	"손책",	1181,	0,	null,	62,	48,	39,	0,	160,	300,	"패권",	"필살",	"소패왕 손책이 나가신다! 길을 비켜라!"],
+		[115,	"손침",	1182,	0,	null,	44,	36,	20,	0,	160,	300,	"패권",	null],		
+		[114,	"손호",	1183,	0,	null,	20,	39,	34,	0,	160,	300,	"패권",	null],		
+		[126,	"손화",	1184,	0,	null,	35,	13,	36,	0,	160,	300,	"왕좌",	null],		
+		[127,	"손환",	1185,	0,	null,	56,	33,	35,	0,	160,	300,	"정복",	null],		
+		[126,	"손휴",	1186,	0,	null,	49,	22,	32,	0,	160,	300,	"정복",	null],		
+		[117,	"손흠",	1187,	0,	null,	50,	32,	17,	0,	160,	300,	"정복",	null],		
+		[147,	"송헌",	1188,	0,	null,	41,	32,	21,	0,	160,	300,	"안전",	null],		
+		[95,	"순우경",	1189,	0,	null,	53,	34,	30,	0,	160,	300,	"할거",	null],		
+		[22,	"순욱1",	1190,	0,	null,	46,	15,	49,	0,	160,	300,	"왕좌",	"집중"],		
+		[22,	"순유",	1191,	0,	null,	53,	21,	45,	0,	160,	300,	"대의",	"신중"],		
+		[29,	"신비",	1192,	0,	null,	43,	14,	37,	0,	160,	300,	"재간",	null],		
+		[37,	"신의",	1193,	0,	null,	46,	31,	26,	0,	160,	300,	"출세",	null],		
+		[37,	"신탐",	1194,	0,	null,	46,	29,	29,	0,	160,	300,	"출세",	null],		
+		[85,	"신평",	1195,	0,	null,	51,	26,	38,	0,	160,	300,	"왕좌",	null],		
+		[102,	"심배",	1196,	0,	null,	54,	33,	34,	0,	160,	300,	"패권",	"귀병"],		
+		[126,	"심영",	1197,	0,	null,	45,	36,	26,	0,	160,	300,	"재간",	null],		
+		[47,	"아하소과",	1198,	0,	null,	45,	38,	8,	0,	160,	300,	"안전",	"척사"],		
+		[62,	"아회남",	1199,	0,	null,	44,	37,	15,	0,	160,	300,	"출세",	"척사"],		
+		[23,	"악진",	1200,	0,	null,	53,	34,	28,	0,	160,	300,	"대의",	"돌격"],		
+		[23,	"악침",	1201,	0,	null,	42,	26,	17,	0,	160,	300,	"대의",	null],		
+		[63,	"악환",	1202,	0,	null,	46,	41,	28,	0,	160,	300,	"재간",	null],		
+		[102,	"안량",	1203,	0,	null,	53,	47,	18,	0,	160,	300,	"출세",	"위압"],		
+		[14,	"양백",	1204,	0,	null,	46,	27,	27,	0,	160,	300,	"안전",	null],		
+		[92,	"양봉1",	1205,	0,	null,	47,	32,	18,	0,	160,	300,	"유지",	null],		
+		[91,	"양봉2",	1206,	0,	null,	49,	39,	31,	0,	160,	300,	"정복",	null],		
+		[13,	"양송",	1207,	0,	null,	15,	18,	17,	0,	160,	300,	"안전",	null],		
+		[43,	"양수",	1208,	0,	null,	18,	16,	46,	0,	160,	300,	"재간",	"귀병"],		
+		[61,	"양의",	1209,	0,	null,	51,	28,	36,	0,	160,	300,	"유지",	null],		
+		[141,	"양조1",	1210,	0,	null,	51,	27,	30,	0,	160,	300,	"출세",	null],		
+		[9,	"양추1",	1211,	0,	null,	44,	34,	8,	0,	160,	300,	"정복",	null],		
+		[31,	"양호",	1212,	0,	null,	60,	35,	40,	0,	160,	300,	"패권",	null],		
+		[53,	"양회",	1213,	0,	null,	48,	34,	20,	0,	160,	300,	"출세",	null],		
+		[141,	"양흥",	1214,	0,	null,	45,	34,	9,	0,	160,	300,	"안전",	null],		
+		[6,	"어부라",	1215,	0,	null,	55,	40,	31,	0,	160,	300,	"정복",	null],		
+		[64,	"엄강",	1216,	0,	null,	47,	33,	22,	0,	160,	300,	"재간",	null],		
+		[10,	"엄백호",	1217,	0,	null,	43,	34,	15,	0,	160,	300,	"할거",	null],		
+		[10,	"엄여",	1218,	0,	null,	35,	33,	12,	0,	160,	300,	"할거",	null],		
+		[69,	"엄안",	1219,	0,	null,	53,	42,	34,	0,	160,	300,	"왕좌",	null],		
+		[7,	"엄정",	1220,	0,	null,	31,	34,	25,	0,	160,	300,	"출세",	null],		
+		[121,	"엄준",	1221,	0,	null,	42,	12,	36,	0,	160,	300,	"재간",	null],		
+		[71,	"여개",	1222,	0,	null,	44,	21,	34,	0,	160,	300,	"유지",	null],		
+		[29,	"여건",	1223,	0,	null,	42,	34,	15,	0,	160,	300,	"출세",	null],		
+		[107,	"여광",	1224,	0,	null,	48,	34,	14,	0,	160,	300,	"유지",	null],		
+		[124,	"여몽",	1225,	0,	null,	61,	39,	47,	0,	160,	300,	"패권",	"궁병"],		
+		[123,	"여범",	1226,	0,	null,	41,	17,	36,	0,	160,	300,	"할거",	null],		
+		[107,	"여상",	1227,	0,	null,	49,	34,	13,	0,	160,	300,	"유지",	null],		
+		[105,	"여위황",	1228,	0,	null,	41,	31,	19,	0,	160,	300,	"정복",	null],		
+		[145,	"여포",	1229,	0,	null,	54,	50,	15,	0,	160,	300,	"패권",	"돌격",	"다 죽여버리겠다! 으하하."],
+		[50,	"염우",	1230,	0,	null,	47,	26,	9,	0,	160,	300,	"출세",	null],		
+		[40,	"염유",	1231,	0,	null,	48,	38,	26,	0,	160,	300,	"출세",	null],		
+		[18,	"염포",	1232,	0,	null,	33,	18,	39,	0,	160,	300,	"유지",	null],		
+		[40,	"예형",	1233,	0,	null,	55,	16,	48,	0,	160,	300,	"은둔",	"통찰"],		
+		[133,	"오강",	1234,	0,	null,	43,	19,	31,	0,	160,	300,	"안전",	null],		
+		[59,	"오란",	1235,	0,	null,	51,	38,	21,	0,	160,	300,	"재간",	null],		
+		[72,	"오반",	1236,	0,	null,	52,	33,	23,	0,	160,	300,	"재간",	null],		
+		[128,	"오언",	1237,	0,	null,	52,	30,	26,	0,	160,	300,	"재간",	null],		
+		[126,	"오연",	1238,	0,	null,	36,	35,	16,	0,	160,	300,	"정복",	null],		
+		[69,	"오의",	1239,	0,	null,	54,	36,	37,	0,	160,	300,	"유지",	null],		
+		[19,	"오질",	1240,	0,	null,	41,	19,	35,	0,	160,	300,	"출세",	null],		
+		[51,	"올돌골",	1241,	0,	null,	55,	46,	8,	0,	160,	300,	"출세",	"척사"],		
+		[52,	"옹개",	1242,	0,	null,	47,	34,	26,	0,	160,	300,	"안전",	null],		
+		[20,	"왕경",	1243,	0,	null,	46,	24,	33,	0,	160,	300,	"재간",	null],		
+		[97,	"왕광",	1244,	0,	null,	53,	34,	27,	0,	160,	300,	"유지",	null],		
+		[30,	"왕기1",	1245,	0,	null,	54,	31,	35,	0,	160,	300,	"유지",	null],		
+		[34,	"왕랑",	1246,	0,	null,	44,	15,	26,	0,	160,	300,	"할거",	null],		
+		[57,	"왕루",	1247,	0,	null,	40,	14,	38,	0,	160,	300,	"유지",	null],		
+		[76,	"왕보",	1248,	0,	null,	43,	17,	38,	0,	160,	300,	"대의",	null],		
+		[86,	"왕수",	1249,	0,	null,	34,	17,	34,	0,	160,	300,	"재간",	null],		
+		[26,	"왕쌍",	1250,	0,	null,	47,	45,	8,	0,	160,	300,	"정복",	"보병"],		
+		[46,	"왕위",	1251,	0,	null,	48,	30,	34,	0,	160,	300,	"안전",	null],		
+		[92,	"왕윤",	1252,	0,	null,	16,	9,	39,	0,	160,	300,	"왕좌",	null],		
+		[40,	"왕융",	1253,	0,	null,	49,	21,	39,	0,	160,	300,	"재간",	null],		
+		[32,	"왕준",	1254,	0,	null,	56,	42,	38,	0,	160,	300,	"대의",	null],		
+		[30,	"왕찬",	1255,	0,	null,	28,	14,	39,	0,	160,	300,	"안전",	null],		
+		[33,	"왕창",	1256,	0,	null,	54,	29,	26,	0,	160,	300,	"정복",	null],		
+		[69,	"왕평",	1257,	0,	null,	55,	38,	36,	0,	160,	300,	"재간",	null],		
+		[71,	"왕항",	1258,	0,	null,	44,	22,	30,	0,	160,	300,	"대의",	null],		
+		[33,	"왕혼",	1259,	0,	null,	52,	16,	30,	0,	160,	300,	"정복",	null],		
+		[71,	"요립",	1260,	0,	null,	50,	21,	42,	0,	160,	300,	"출세",	null],		
+		[74,	"요화",	1261,	0,	null,	51,	29,	30,	0,	160,	300,	"의협",	null],		
+		[22,	"우금1",	1262,	0,	null,	56,	37,	36,	0,	160,	300,	"정복",	null],		
+		[27,	"우금2",	1263,	0,	null,	49,	39,	19,	0,	160,	300,	"대의",	null],		
+		[122,	"우번",	1264,	0,	null,	23,	21,	37,	0,	160,	300,	"유지",	null],		
+		[126,	"우전",	1265,	0,	null,	49,	28,	21,	0,	160,	300,	"안전",	null],		
+		[86,	"원담",	1266,	0,	null,	51,	30,	28,	0,	160,	300,	"왕좌",	null],		
+		[101,	"원상",	1267,	0,	null,	46,	36,	34,	0,	160,	300,	"패권",	null],		
+		[101,	"원소",	1268,	0,	null,	58,	34,	38,	0,	160,	300,	"패권",	"위압"],		
+		[140,	"원술",	1269,	0,	null,	55,	30,	36,	0,	160,	300,	"패권",	"축성"],		
+		[140,	"원윤",	1270,	0,	null,	40,	17,	30,	0,	160,	300,	"패권",	null],		
+		[101,	"원희",	1271,	0,	null,	52,	29,	36,	0,	160,	300,	"할거",	null],		
+		[131,	"위소",	1272,	0,	null,	39,	12,	41,	0,	160,	300,	"재간",	null],		
+		[147,	"위속",	1273,	0,	null,	47,	30,	21,	0,	160,	300,	"안전",	null],		
+		[81,	"위연",	1274,	0,	null,	55,	47,	31,	0,	160,	300,	"패권",	"보병"],		
+		[96,	"위유",	1275,	0,	null,	45,	35,	36,	0,	160,	300,	"재간",	null],		
+		[76,	"유기",	1276,	0,	null,	47,	10,	37,	0,	160,	300,	"왕좌",	null],		
+		[36,	"유대",	1277,	0,	null,	48,	29,	31,	0,	160,	300,	"재간",	null],		
+		[134,	"유도",	1278,	0,	null,	35,	17,	34,	0,	160,	300,	"재간",	null],		
+		[46,	"유벽",	1279,	0,	null,	49,	36,	12,	0,	160,	300,	"출세",	null],		
+		[75,	"유봉",	1280,	0,	null,	48,	33,	31,	0,	160,	300,	"출세",	null],		
+		[75,	"유비",	1281,	0,	null,	58,	38,	35,	0,	160,	300,	"왕좌",	"인덕"],		
+		[75,	"유선1",	1282,	0,	null,	24,	9,	11,	0,	160,	300,	"대의",	null],		
+		[55,	"유순",	1283,	0,	null,	51,	31,	27,	0,	160,	300,	"출세",	null],		
+		[75,	"유심",	1284,	0,	null,	49,	23,	35,	0,	160,	300,	"왕좌",	null],		
+		[129,	"유약",	1285,	0,	null,	51,	32,	31,	0,	160,	300,	"유지",	null],		
+		[55,	"유언",	1286,	0,	null,	48,	20,	37,	0,	160,	300,	"할거",	null],		
+		[27,	"유엽",	1287,	0,	null,	40,	15,	40,	0,	160,	300,	"유지",	null],		
+		[11,	"유요",	1288,	0,	null,	23,	11,	24,	0,	160,	300,	"안전",	"발명"],		
+		[96,	"유우",	1289,	0,	null,	51,	17,	36,	0,	160,	300,	"왕좌",	null],		
+		[55,	"유장",	1290,	0,	null,	38,	16,	32,	0,	160,	300,	"할거",	"수비"],		
+		[45,	"유종",	1291,	0,	null,	22,	13,	31,	0,	160,	300,	"할거",	null],		
+		[56,	"유파",	1292,	0,	null,	43,	16,	35,	0,	160,	300,	"대의",	null],		
+		[45,	"유표1",	1293,	0,	null,	52,	29,	36,	0,	160,	300,	"할거",	null],		
+		[27,	"유표2",	1294,	0,	null,	54,	28,	36,	0,	160,	300,	"안전",	null],		
+		[134,	"유현",	1295,	0,	null,	32,	28,	28,	0,	160,	300,	"안전",	null],		
+		[122,	"육개",	1296,	0,	null,	50,	15,	36,	0,	160,	300,	"재간",	null],		
+		[122,	"육손",	1297,	0,	null,	63,	34,	49,	0,	160,	300,	"왕좌",	"귀병"],		
+		[121,	"육적",	1298,	0,	null,	42,	15,	37,	0,	160,	300,	"안전",	null],		
+		[122,	"육항",	1299,	0,	null,	62,	35,	47,	0,	160,	300,	"왕좌",	null],		
+		[38,	"윤대목",	1300,	0,	null,	49,	25,	35,	0,	160,	300,	"재간",	null],		
+		[80,	"윤묵",	1301,	0,	null,	19,	14,	37,	0,	160,	300,	"대의",	null],		
+		[72,	"윤상",	1302,	0,	null,	30,	16,	21,	0,	160,	300,	"대의",	null],		
+		[136,	"윤직",	1303,	0,	null,	42,	29,	32,	0,	160,	300,	"재간",	null],		
+		[2,	"이각",	1304,	0,	null,	46,	39,	22,	0,	160,	300,	"패권",	null],		
+		[146,	"이숙",	1305,	0,	null,	27,	23,	34,	0,	160,	300,	"재간",	null],		
+		[71,	"이엄",	1306,	0,	null,	56,	42,	41,	0,	160,	300,	"패권",	null],		
+		[2,	"이유",	1307,	0,	null,	50,	11,	45,	0,	160,	300,	"패권",	"귀모"],		
+		[132,	"이이",	1308,	0,	null,	46,	38,	10,	0,	160,	300,	"정복",	null],		
+		[77,	"이적",	1309,	0,	null,	46,	14,	39,	0,	160,	300,	"할거",	null],		
+		[22,	"이전",	1310,	0,	null,	54,	34,	41,	0,	160,	300,	"왕좌",	null],		
+		[71,	"이풍1",	1311,	0,	null,	48,	28,	31,	0,	160,	300,	"재간",	null],		
+		[66,	"이회",	1312,	0,	null,	51,	25,	40,	0,	160,	300,	"유지",	null],		
+		[114,	"잠혼",	1313,	0,	null,	15,	8,	22,	0,	160,	300,	"할거",	null],		
+		[7,	"장각",	1314,	0,	null,	61,	13,	47,	0,	160,	300,	"패권",	"환술"],		
+		[34,	"장간",	1315,	0,	null,	19,	10,	35,	0,	160,	300,	"재간",	null],		
+		[7,	"장개",	1316,	0,	null,	43,	35,	10,	0,	160,	300,	"안전",	null],		
+		[122,	"장굉",	1317,	0,	null,	25,	11,	43,	0,	160,	300,	"왕좌",	null],		
+		[7,	"장량",	1318,	0,	null,	51,	41,	34,	0,	160,	300,	"정복",	"환술"],		
+		[15,	"장로",	1319,	0,	null,	54,	22,	40,	0,	160,	300,	"유지",	"축성"],		
+		[23,	"장료",	1320,	0,	null,	60,	47,	42,	0,	160,	300,	"의협",	"견고"],		
+		[7,	"장보",	1321,	0,	null,	55,	41,	38,	0,	160,	300,	"패권",	"환술"],		
+		[76,	"장비",	1322,	0,	null,	56,	50,	24,	0,	160,	300,	"의협",	"무쌍",	"어쭈. 해보자 이거냐?"],
+		[62,	"장서",	1323,	0,	null,	42,	24,	18,	0,	160,	300,	"출세",	null],		
+		[120,	"장소1",	1324,	0,	null,	41,	12,	46,	0,	160,	300,	"안전",	null],		
+		[78,	"장소2",	1325,	0,	null,	44,	22,	36,	0,	160,	300,	"재간",	null],		
+		[72,	"장송",	1326,	0,	null,	44,	14,	47,	0,	160,	300,	"할거",	"통찰"],		
+		[148,	"장수",	1327,	0,	null,	52,	36,	35,	0,	160,	300,	"할거",	null],		
+		[145,	"장양1",	1328,	0,	null,	49,	33,	33,	0,	160,	300,	"출세",	null],		
+		[8,	"장연",	1329,	0,	null,	55,	33,	24,	0,	160,	300,	"안전",	null],		
+		[11,	"장영",	1330,	0,	null,	46,	33,	20,	0,	160,	300,	"재간",	null],		
+		[118,	"장온",	1331,	0,	null,	21,	15,	35,	0,	160,	300,	"할거",	null],		
+		[78,	"장완",	1332,	0,	null,	52,	28,	43,	0,	160,	300,	"할거",	"상재"],		
+		[15,	"장위",	1333,	0,	null,	50,	35,	15,	0,	160,	300,	"대의",	null],		
+		[36,	"장윤",	1334,	0,	null,	51,	30,	30,	0,	160,	300,	"정복",	null],		
+		[104,	"장의거",	1335,	0,	null,	51,	30,	17,	0,	160,	300,	"대의",	null],		
+		[68,	"장익",	1336,	0,	null,	54,	34,	32,	0,	160,	300,	"유지",	null],		
+		[56,	"장임",	1337,	0,	null,	57,	41,	37,	0,	160,	300,	"대의",	"견고"],		
+		[148,	"장제1",	1338,	0,	null,	52,	33,	30,	0,	160,	300,	"할거",	null],		
+		[32,	"장제2",	1339,	0,	null,	30,	17,	42,	0,	160,	300,	"유지",	null],		
+		[126,	"장제3",	1340,	0,	null,	54,	25,	31,	0,	160,	300,	"할거",	null],		
+		[17,	"장패",	1341,	0,	null,	42,	39,	22,	0,	160,	300,	"할거",	null],		
+		[76,	"장포1",	1342,	0,	null,	52,	43,	25,	0,	160,	300,	"재간",	"징병"],		
+		[113,	"장포2",	1343,	0,	null,	49,	33,	26,	0,	160,	300,	"유지",	null],		
+		[27,	"장합",	1344,	0,	null,	57,	46,	32,	0,	160,	300,	"출세",	"궁병"],		
+		[23,	"장호",	1345,	0,	null,	46,	31,	27,	0,	160,	300,	"정복",	null],		
+		[31,	"장화",	1346,	0,	null,	44,	12,	43,	0,	160,	300,	"유지",	null],		
+		[48,	"장횡",	1347,	0,	null,	45,	34,	13,	0,	160,	300,	"재간",	null],		
+		[141,	"장훈",	1348,	0,	null,	51,	31,	30,	0,	160,	300,	"안전",	null],		
+		[120,	"장휴",	1349,	0,	null,	41,	18,	35,	0,	160,	300,	"재간",	null],		
+		[126,	"장흠",	1350,	0,	null,	50,	33,	34,	0,	160,	300,	"대의",	"저격"],		
+		[96,	"저수",	1351,	0,	null,	57,	27,	44,	0,	160,	300,	"할거",	"반계"],		
+		[130,	"전단",	1352,	0,	null,	50,	37,	31,	0,	160,	300,	"출세",	null],		
+		[42,	"전속",	1353,	0,	null,	50,	29,	25,	0,	160,	300,	"안전",	null],		
+		[26,	"전위1",	1354,	0,	null,	48,	48,	17,	0,	160,	300,	"의협",	"필살"],		
+		[130,	"전위2",	1355,	0,	null,	54,	35,	31,	0,	160,	300,	"출세",	null],		
+		[128,	"전종",	1356,	0,	null,	56,	39,	37,	0,	160,	300,	"패권",	null],		
+		[42,	"전주",	1357,	0,	null,	52,	34,	26,	0,	160,	300,	"의협",	null],		
+		[96,	"전풍",	1358,	0,	null,	56,	21,	48,	0,	160,	300,	"왕좌",	null],		
+		[24,	"정무",	1359,	0,	null,	46,	19,	37,	0,	160,	300,	"출세",	null],		
+		[119,	"정병",	1360,	0,	null,	22,	13,	34,	0,	160,	300,	"유지",	null],		
+		[126,	"정보",	1361,	0,	null,	56,	32,	38,	0,	160,	300,	"패권",	null],		
+		[123,	"정봉1",	1362,	0,	null,	52,	39,	32,	0,	160,	300,	"패권",	null],		
+		[24,	"정욱",	1363,	0,	null,	56,	20,	45,	0,	160,	300,	"패권",	"신중"],		
+		[88,	"정원",	1364,	0,	null,	50,	39,	29,	0,	160,	300,	"왕좌",	"기병"],		
+		[7,	"정원지",	1365,	0,	null,	40,	37,	19,	0,	160,	300,	"출세",	null],		
+		[69,	"정은",	1366,	0,	null,	45,	31,	13,	0,	160,	300,	"재간",	null],		
+		[121,	"제갈각",	1367,	0,	null,	48,	27,	46,	0,	160,	300,	"왕좌",	null],		
+		[76,	"제갈균",	1368,	0,	null,	48,	23,	37,	0,	160,	300,	"안전",	"상재"],		
+		[121,	"제갈근",	1369,	0,	null,	48,	21,	44,	0,	160,	300,	"왕좌",	"경작"],		
+		[76,	"제갈량",	1370,	0,	null,	63,	28,	50,	0,	160,	300,	"왕좌",	"집중",	"슬슬 나의 지모를 발휘해 보겠습니다..."],
+		[76,	"제갈상",	1371,	0,	null,	45,	38,	36,	0,	160,	300,	"대의",	null],		
+		[135,	"제갈정",	1372,	0,	null,	46,	29,	27,	0,	160,	300,	"안전",	null],		
+		[76,	"제갈첨",	1373,	0,	null,	53,	26,	38,	0,	160,	300,	"대의",	null],		
+		[135,	"제갈탄",	1374,	0,	null,	56,	40,	37,	0,	160,	300,	"패권",	null],		
+		[76,	"조광",	1375,	0,	null,	50,	34,	27,	0,	160,	300,	"재간",	null],		
+		[74,	"조루",	1376,	0,	null,	44,	19,	30,	0,	160,	300,	"대의",	null],		
+		[24,	"조모",	1377,	0,	null,	45,	16,	15,	0,	160,	300,	"할거",	null],		
+		[127,	"조무",	1378,	0,	null,	52,	34,	36,	0,	160,	300,	"의협",	null],		
+		[26,	"조방",	1379,	0,	null,	44,	10,	16,	0,	160,	300,	"정복",	null],		
+		[83,	"조범",	1380,	0,	null,	47,	20,	32,	0,	160,	300,	"유지",	null],		
+		[26,	"조비",	1381,	0,	null,	53,	35,	38,	0,	160,	300,	"패권",	"징병"],		
+		[19,	"조상",	1382,	0,	null,	51,	31,	16,	0,	160,	300,	"패권",	null],		
+		[147,	"조성",	1383,	0,	null,	42,	35,	26,	0,	160,	300,	"안전",	null],		
+		[26,	"조순",	1384,	0,	null,	50,	29,	36,	0,	160,	300,	"정복",	null],		
+		[25,	"조식",	1385,	0,	null,	19,	10,	45,	0,	160,	300,	"왕좌",	"귀모"],		
+		[25,	"조앙",	1386,	0,	null,	42,	33,	31,	0,	160,	300,	"왕좌",	null],		
+		[25,	"조예",	1387,	0,	null,	47,	28,	41,	0,	160,	300,	"정복",	null],		
+		[26,	"조우",	1388,	0,	null,	51,	28,	34,	0,	160,	300,	"대의",	null],		
+		[76,	"조운",	1389,	0,	null,	62,	49,	44,	0,	160,	300,	"왕좌",	"무쌍",	"창술의 달인 상산 조자룡 여기 있소!"],
+		[25,	"조웅",	1390,	0,	null,	48,	14,	22,	0,	160,	300,	"안전",	null],		
+		[26,	"조인",	1391,	0,	null,	54,	40,	31,	0,	160,	300,	"패권",	"보병"],		
+		[25,	"조조",	1392,	0,	null,	64,	40,	48,	0,	160,	300,	"패권",	"반계"],		
+		[26,	"조진",	1393,	0,	null,	57,	34,	33,	0,	160,	300,	"정복",	null],		
+		[25,	"조창",	1394,	0,	null,	54,	44,	19,	0,	160,	300,	"정복",	"돌격"],		
+		[76,	"조통",	1395,	0,	null,	50,	32,	28,	0,	160,	300,	"재간",	null],		
+		[84,	"조표",	1396,	0,	null,	34,	35,	8,	0,	160,	300,	"안전",	null],		
+		[7,	"조홍1",	1397,	0,	null,	45,	33,	21,	0,	160,	300,	"유지",	null],		
+		[24,	"조홍2",	1398,	0,	null,	53,	35,	22,	0,	160,	300,	"패권",	null],		
+		[26,	"조환",	1399,	0,	null,	34,	12,	21,	0,	160,	300,	"정복",	null],		
+		[19,	"조훈",	1400,	0,	null,	51,	32,	15,	0,	160,	300,	"출세",	null],		
+		[26,	"조휴",	1401,	0,	null,	54,	36,	35,	0,	160,	300,	"패권",	null],		
+		[19,	"조희",	1402,	0,	null,	50,	29,	36,	0,	160,	300,	"대의",	null],		
+		[22,	"종요",	1403,	0,	null,	16,	10,	37,	0,	160,	300,	"유지",	null],		
+		[20,	"종회",	1404,	0,	null,	58,	29,	47,	0,	160,	300,	"패권",	null],		
+		[128,	"주거",	1405,	0,	null,	53,	36,	36,	0,	160,	300,	"유지",	null],		
+		[118,	"주방",	1406,	0,	null,	46,	18,	38,	0,	160,	300,	"할거",	null],		
+		[126,	"주연",	1407,	0,	null,	53,	36,	26,	0,	160,	300,	"할거",	null],		
+		[126,	"주유",	1408,	0,	null,	63,	37,	49,	0,	160,	300,	"패권",	"신산"],		
+		[128,	"주이",	1409,	0,	null,	48,	28,	31,	0,	160,	300,	"안전",	null],		
+		[88,	"주준",	1410,	0,	null,	57,	38,	33,	0,	160,	300,	"왕좌",	null],		
+		[32,	"주지",	1411,	0,	null,	45,	39,	24,	0,	160,	300,	"안전",	null],		
+		[76,	"주창",	1412,	0,	null,	41,	40,	15,	0,	160,	300,	"의협",	"궁병"],		
+		[126,	"주치",	1413,	0,	null,	47,	28,	28,	0,	160,	300,	"안전",	null],		
+		[41,	"주태1",	1414,	0,	null,	49,	28,	31,	0,	160,	300,	"안전",	null],		
+		[126,	"주태2",	1415,	0,	null,	54,	44,	30,	0,	160,	300,	"정복",	"필살"],		
+		[128,	"주환",	1416,	0,	null,	58,	43,	37,	0,	160,	300,	"정복",	null],		
+		[29,	"진건",	1417,	0,	null,	49,	35,	31,	0,	160,	300,	"정복",	null],		
+		[29,	"진교",	1418,	0,	null,	21,	13,	34,	0,	160,	300,	"유지",	null],		
+		[28,	"진군",	1419,	0,	null,	48,	19,	44,	0,	160,	300,	"대의",	null],		
+		[143,	"진궁",	1420,	0,	null,	55,	26,	45,	0,	160,	300,	"할거",	"신중"],		
+		[79,	"진규",	1421,	0,	null,	22,	10,	36,	0,	160,	300,	"할거",	null],		
+		[72,	"진도",	1422,	0,	null,	52,	43,	35,	0,	160,	300,	"대의",	null],		
+		[79,	"진등",	1423,	0,	null,	50,	31,	36,	0,	160,	300,	"할거",	null],		
+		[37,	"진림",	1424,	0,	null,	44,	14,	41,	0,	160,	300,	"재간",	null],		
+		[124,	"진무",	1425,	0,	null,	49,	37,	30,	0,	160,	300,	"재간",	null],		
+		[66,	"진복",	1426,	0,	null,	36,	14,	38,	0,	160,	300,	"재간",	null],		
+		[50,	"진수",	1427,	0,	null,	25,	15,	42,	0,	160,	300,	"대의",	null],		
+		[81,	"진식",	1428,	0,	null,	43,	34,	26,	0,	160,	300,	"출세",	null],		
+		[79,	"진진",	1429,	0,	null,	47,	19,	32,	0,	160,	300,	"재간",	null],		
+		[28,	"진태",	1430,	0,	null,	56,	38,	35,	0,	160,	300,	"대의",	null],		
+		[11,	"진횡",	1431,	0,	null,	38,	29,	24,	0,	160,	300,	"출세",	null],		
+		[21,	"차주",	1432,	0,	null,	46,	33,	31,	0,	160,	300,	"안전",	null],		
+		[11,	"착융",	1433,	0,	null,	49,	30,	11,	0,	160,	300,	"출세",	null],		
+		[36,	"채모",	1434,	0,	null,	56,	35,	34,	0,	160,	300,	"정복",	"궁병"],		
+		[36,	"채중",	1435,	0,	null,	47,	22,	28,	0,	160,	300,	"출세",	null],		
+		[36,	"채화",	1436,	0,	null,	46,	24,	25,	0,	160,	300,	"안전",	null],		
+		[66,	"초주",	1437,	0,	null,	22,	13,	41,	0,	160,	300,	"대의",	null],		
+		[20,	"최염",	1438,	0,	null,	41,	27,	34,	0,	160,	300,	"대의",	null],		
+		[60,	"축융",	1439,	0,	null,	48,	44,	13,	0,	160,	300,	"정복",	"척사"],		
+		[60,	"타사대왕",	1440,	0,	null,	48,	36,	34,	0,	160,	300,	"출세",	"척사"],		
+		[124,	"태사자",	1441,	0,	null,	52,	49,	33,	0,	160,	300,	"대의",	"무쌍"],		
+		[124,	"태사향",	1442,	0,	null,	44,	35,	25,	0,	160,	300,	"재간",	null],		
+		[12,	"포륭",	1443,	0,	null,	45,	37,	10,	0,	160,	300,	"안전",	null],		
+		[74,	"풍습",	1444,	0,	null,	36,	32,	22,	0,	160,	300,	"재간",	null],		
+		[7,	"하의",	1445,	0,	null,	44,	34,	13,	0,	160,	300,	"출세",	null],		
+		[121,	"하제",	1446,	0,	null,	54,	37,	32,	0,	160,	300,	"재간",	null],		
+		[90,	"하진",	1447,	0,	null,	44,	35,	19,	0,	160,	300,	"왕좌",	null],		
+		[24,	"하후덕",	1448,	0,	null,	51,	32,	20,	0,	160,	300,	"출세",	null],		
+		[26,	"하후돈",	1449,	0,	null,	59,	46,	36,	0,	160,	300,	"의협",	"돌격",	"다 나오거라! 상대해 주마!"],
+		[19,	"하후무",	1450,	0,	null,	38,	17,	19,	0,	160,	300,	"안전",	null],		
+		[24,	"하후상",	1451,	0,	null,	51,	31,	36,	0,	160,	300,	"출세",	null],		
+		[26,	"하후연",	1452,	0,	null,	56,	45,	29,	0,	160,	300,	"패권",	"궁병",	"궁술로 날 당해낼 자가 있을까? 후후."],
+		[26,	"하후위",	1453,	0,	null,	53,	38,	36,	0,	160,	300,	"정복",	null],		
+		[26,	"하후은",	1454,	0,	null,	44,	26,	20,	0,	160,	300,	"안전",	null],		
+		[23,	"하후패",	1455,	0,	null,	55,	44,	35,	0,	160,	300,	"대의",	null],		
+		[20,	"하후현",	1456,	0,	null,	47,	12,	38,	0,	160,	300,	"유지",	null],		
+		[26,	"하후혜",	1457,	0,	null,	54,	33,	39,	0,	160,	300,	"정복",	null],		
+		[26,	"하후화",	1458,	0,	null,	55,	31,	40,	0,	160,	300,	"정복",	null],		
+		[22,	"학소",	1459,	0,	null,	60,	41,	43,	0,	160,	300,	"대의",	"견고"],		
+		[126,	"한당",	1460,	0,	null,	51,	34,	32,	0,	160,	300,	"할거",	null],		
+		[93,	"한복",	1461,	0,	null,	50,	30,	21,	0,	160,	300,	"안전",	null],		
+		[8,	"한섬",	1462,	0,	null,	39,	31,	18,	0,	160,	300,	"출세",	null],		
+		[48,	"한수",	1463,	0,	null,	50,	38,	39,	0,	160,	300,	"대의",	"기병"],		
+		[40,	"한숭",	1464,	0,	null,	21,	13,	35,	0,	160,	300,	"재간",	null],		
+		[7,	"한충",	1465,	0,	null,	40,	33,	15,	0,	160,	300,	"안전",	null],		
+		[9,	"한현",	1466,	0,	null,	41,	31,	10,	0,	160,	300,	"유지",	null],		
+		[27,	"한호",	1467,	0,	null,	48,	37,	23,	0,	160,	300,	"유지",	null],		
+		[79,	"향랑",	1468,	0,	null,	44,	11,	39,	0,	160,	300,	"대의",	null],		
+		[79,	"향총",	1469,	0,	null,	54,	21,	37,	0,	160,	300,	"왕좌",	null],		
+		[139,	"허공",	1470,	0,	null,	50,	32,	30,	0,	160,	300,	"유지",	null],		
+		[21,	"허유",	1471,	0,	null,	43,	24,	29,	0,	160,	300,	"재간",	null],		
+		[23,	"허의",	1472,	0,	null,	31,	37,	24,	0,	160,	300,	"출세",	null],		
+		[26,	"허저",	1473,	0,	null,	47,	49,	14,	0,	160,	300,	"정복",	"무쌍"],		
+		[87,	"허정",	1474,	0,	null,	18,	15,	37,	0,	160,	300,	"재간",	null],		
+		[12,	"형도영",	1475,	0,	null,	44,	39,	12,	0,	160,	300,	"출세",	null],		
+		[148,	"호거아",	1476,	0,	null,	35,	38,	31,	0,	160,	300,	"안전",	null],		
+		[76,	"호반",	1477,	0,	null,	48,	29,	23,	0,	160,	300,	"재간",	null],		
+		[20,	"호분",	1478,	0,	null,	52,	30,	31,	0,	160,	300,	"할거",	null],		
+		[27,	"호주천",	1479,	0,	null,	55,	38,	33,	0,	160,	300,	"정복",	null],		
+		[20,	"호준",	1480,	0,	null,	51,	30,	23,	0,	160,	300,	"재간",	null],		
+		[2,	"화웅",	1481,	0,	null,	51,	44,	12,	0,	160,	300,	"출세",	"돌격"],		
+		[131,	"화핵",	1482,	0,	null,	37,	14,	38,	0,	160,	300,	"안전",	null],		
+		[10,	"화흠",	1483,	0,	null,	18,	22,	38,	0,	160,	300,	"출세",	null],		
+		[21,	"환범",	1484,	0,	null,	20,	13,	41,	0,	160,	300,	"유지",	null],		
+		[127,	"황개",	1485,	0,	null,	55,	43,	35,	0,	160,	300,	"왕좌",	"징병"],		
+		[56,	"황권",	1486,	0,	null,	54,	23,	39,	0,	160,	300,	"대의",	null],		
+		[41,	"황란",	1487,	0,	null,	29,	35,	13,	0,	160,	300,	"재간",	null],		
+		[88,	"황보숭",	1488,	0,	null,	57,	32,	37,	0,	160,	300,	"왕좌",	null],		
+		[72,	"황충",	1489,	0,	null,	58,	47,	34,	0,	160,	300,	"왕좌",	"궁병"],		
+		[50,	"황호",	1490,	0,	null,	15,	9,	24,	0,	160,	300,	"안전",	null],		
+		[147,	"후성",	1491,	0,	null,	46,	31,	17,	0,	160,	300,	"정복",	null]			
+	],																											
+	"general_ex":[																											
+		[123,	"가화",	1492,	0,	null,	44,	33,	20,	0,	160,	300,	null,	null],		
+		[999,	"건석",	1493,	0,	null,	21,	6,	31,	0,	160,	300,	null,	null],		
+		[999,	"견씨",	1494,	0,	null,	35,	12,	29,	0,	160,	300,	null,	null],		
+		[40,	"견홍",	1495,	0,	null,	54,	36,	33,	0,	160,	300,	null,	null],		
+		[120,	"고담",	1496,	0,	null,	33,	11,	35,	0,	160,	300,	null,	null],		
+		[101,	"고유",	1497,	0,	null,	46,	22,	37,	0,	160,	300,	null,	null],		
+		[132,	"곽마",	1498,	0,	null,	51,	36,	25,	0,	160,	300,	null,	null],		
+		[39,	"관구수",	1499,	0,	null,	47,	32,	18,	0,	160,	300,	null,	null],		
+		[39,	"관구전",	1500,	0,	null,	49,	29,	34,	0,	160,	300,	null,	null],		
+		[999,	"관로",	1501,	0,	null,	49,	11,	38,	0,	160,	300,	null,	null],		
+		[65,	"관정",	1502,	0,	null,	35,	25,	37,	0,	160,	300,	null,	null],		
+		[137,	"교수",	1503,	0,	null,	51,	35,	20,	0,	160,	300,	null,	null],		
+		[33,	"구건",	1504,	0,	null,	41,	28,	35,	0,	160,	300,	null,	null],		
+		[41,	"구본",	1505,	0,	null,	45,	21,	35,	0,	160,	300,	null,	null],		
+		[12,	"구성",	1506,	0,	null,	46,	36,	16,	0,	160,	300,	null,	null],		
+		[21,	"국연",	1507,	0,	null,	45,	11,	36,	0,	160,	300,	null,	null],		
+		[99,	"국의",	1508,	0,	null,	57,	40,	25,	0,	160,	300,	null,	null],		
+		[34,	"금의",	1509,	0,	null,	18,	20,	32,	0,	160,	300,	null,	null],		
+		[76,	"나헌",	1510,	0,	null,	58,	34,	38,	0,	160,	300,	null,	null],		
+		[999,	"남두",	1511,	0,	null,	35,	13,	27,	0,	160,	300,	null,	null],		
+		[54,	"냉포",	1512,	0,	null,	52,	41,	35,	0,	160,	300,	null,	null],		
+		[124,	"노숙2",	1513,	0,	null,	52,	28,	38,	0,	160,	300,	null,	null],		
+		[42,	"누규",	1514,	0,	null,	46,	10,	44,	0,	160,	300,	null,	null],		
+		[6,	"누반",	1515,	0,	null,	50,	38,	20,	0,	160,	300,	null,	null],		
+		[130,	"누현",	1516,	0,	null,	23,	10,	34,	0,	160,	300,	null,	null],		
+		[40,	"당균",	1517,	0,	null,	33,	10,	41,	0,	160,	300,	null,	null],		
+		[32,	"당빈",	1518,	0,	null,	52,	37,	31,	0,	160,	300,	null,	null],		
+		[999,	"대교",	1519,	0,	null,	41,	5,	27,	0,	160,	300,	null,	null],		
+		[28,	"대릉",	1520,	0,	null,	50,	38,	23,	0,	160,	300,	null,	null],		
+		[129,	"동조",	1521,	0,	null,	16,	8,	26,	0,	160,	300,	null,	null],		
+		[114,	"등수",	1522,	0,	null,	35,	10,	22,	0,	160,	300,	null,	null],		
+		[50,	"마막",	1523,	0,	null,	22,	9,	3,	0,	160,	300,	null,	null],		
+		[116,	"만욱",	1524,	0,	null,	20,	9,	33,	0,	160,	300,	null,	null],		
+		[120,	"맹종",	1525,	0,	null,	43,	24,	34,	0,	160,	300,	null,	null],		
+		[38,	"문호",	1526,	0,	null,	50,	37,	23,	0,	160,	300,	null,	null],		
+		[999,	"미씨",	1527,	0,	null,	48,	8,	34,	0,	160,	300,	null,	null],		
+		[39,	"반림",	1528,	0,	null,	50,	40,	4,	0,	160,	300,	null,	null],		
+		[129,	"반장",	1529,	0,	null,	55,	39,	35,	0,	160,	300,	null,	null],		
+		[94,	"방열",	1530,	0,	null,	47,	41,	14,	0,	160,	300,	null,	null],		
+		[55,	"방희",	1531,	0,	null,	48,	19,	35,	0,	160,	300,	null,	null],		
+		[30,	"배수",	1532,	0,	null,	10,	6,	39,	0,	160,	300,	null,	null],		
+		[8,	"번능",	1533,	0,	null,	52,	31,	24,	0,	160,	300,	null,	null],		
+		[999,	"번씨",	1534,	0,	null,	32,	9,	23,	0,	160,	300,	null,	null],		
+		[49,	"보도근",	1535,	0,	null,	50,	37,	25,	0,	160,	300,	null,	null],		
+		[129,	"보천",	1536,	0,	null,	51,	30,	36,	0,	160,	300,	null,	null],		
+		[121,	"보협",	1537,	0,	null,	53,	27,	38,	0,	160,	300,	null,	null],		
+		[28,	"부하",	1538,	0,	null,	42,	18,	43,	0,	160,	300,	null,	null],		
+		[26,	"비요",	1539,	0,	null,	52,	33,	37,	0,	160,	300,	null,	null],		
+		[31,	"사마주",	1540,	0,	null,	49,	27,	31,	0,	160,	300,	null,	null],		
+		[41,	"사찬",	1541,	0,	null,	48,	36,	27,	0,	160,	300,	null,	null],		
+		[128,	"설후",	1542,	0,	null,	16,	7,	36,	0,	160,	300,	null,	null],		
+		[36,	"성공영",	1543,	0,	null,	53,	29,	40,	0,	160,	300,	null,	null],		
+		[126,	"성만",	1544,	0,	null,	48,	35,	33,	0,	160,	300,	null,	null],		
+		[999,	"소교",	1545,	0,	null,	47,	12,	33,	0,	160,	300,	null,	null],		
+		[46,	"소유",	1546,	0,	null,	44,	31,	24,	0,	160,	300,	null,	null],		
+		[31,	"소제2",	1547,	0,	null,	22,	8,	39,	0,	160,	300,	null,	null],		
+		[126,	"손교",	1548,	0,	null,	55,	30,	35,	0,	160,	300,	null,	null],		
+		[116,	"손기",	1549,	0,	null,	49,	33,	26,	0,	160,	300,	null,	null],		
+		[999,	"손상향",	1550,	0,	null,	53,	31,	21,	0,	160,	300,	null,	null],		
+		[125,	"손익",	1551,	0,	null,	52,	38,	13,	0,	160,	300,	null,	null],		
+		[125,	"손진",	1552,	0,	null,	50,	36,	24,	0,	160,	300,	null,	null],		
+		[123,	"송겸",	1553,	0,	null,	48,	24,	22,	0,	160,	300,	null,	null],		
+		[85,	"순심",	1554,	0,	null,	20,	11,	40,	0,	160,	300,	null,	null],		
+		[31,	"순욱2",	1555,	0,	null,	10,	8,	39,	0,	160,	300,	null,	null],		
+		[31,	"순의",	1556,	0,	null,	16,	6,	37,	0,	160,	300,	null,	null],		
+		[129,	"시삭",	1557,	0,	null,	36,	33,	22,	0,	160,	300,	null,	null],		
+		[29,	"신창",	1558,	0,	null,	44,	15,	23,	0,	160,	300,	null,	null],		
+		[999,	"악신",	1559,	0,	null,	45,	6,	23,	0,	160,	300,	null,	null],		
+		[138,	"악취",	1560,	0,	null,	46,	34,	29,	0,	160,	300,	null,	null],		
+		[138,	"양강",	1561,	0,	null,	49,	35,	21,	0,	160,	300,	null,	null],		
+		[21,	"양부",	1562,	0,	null,	51,	28,	43,	0,	160,	300,	null,	null],		
+		[72,	"양서",	1563,	0,	null,	46,	31,	33,	0,	160,	300,	null,	null],		
+		[34,	"양습",	1564,	0,	null,	51,	25,	37,	0,	160,	300,	null,	null],		
+		[16,	"양앙",	1565,	0,	null,	50,	35,	20,	0,	160,	300,	null,	null],		
+		[17,	"양임",	1566,	0,	null,	52,	39,	28,	0,	160,	300,	null,	null],		
+		[32,	"양제",	1567,	0,	null,	52,	32,	36,	0,	160,	300,	null,	null],		
+		[33,	"양조2",	1568,	0,	null,	50,	31,	34,	0,	160,	300,	null,	null],		
+		[48,	"양추2",	1569,	0,	null,	50,	34,	31,	0,	160,	300,	null,	null],		
+		[140,	"양홍",	1570,	0,	null,	19,	9,	38,	0,	160,	300,	null,	null],		
+		[31,	"양혼",	1571,	0,	null,	48,	34,	32,	0,	160,	300,	null,	null],		
+		[123,	"여거",	1572,	0,	null,	52,	29,	35,	0,	160,	300,	null,	null],		
+		[130,	"여대",	1573,	0,	null,	57,	36,	35,	0,	160,	300,	null,	null],		
+		[136,	"염상",	1574,	0,	null,	29,	14,	35,	0,	160,	300,	null,	null],		
+		[36,	"염행",	1575,	0,	null,	52,	43,	19,	0,	160,	300,	null,	null],		
+		[73,	"영수",	1576,	0,	null,	52,	35,	37,	0,	160,	300,	null,	null],		
+		[39,	"오거",	1577,	0,	null,	44,	32,	16,	0,	160,	300,	null,	null],		
+		[126,	"오경",	1578,	0,	null,	53,	30,	29,	0,	160,	300,	null,	null],		
+		[999,	"오국태",	1579,	0,	null,	31,	6,	30,	0,	160,	300,	null,	null],		
+		[126,	"오찬",	1580,	0,	null,	52,	21,	39,	0,	160,	300,	null,	null],		
+		[23,	"온회",	1581,	0,	null,	41,	20,	39,	0,	160,	300,	null,	null],		
+		[21,	"왕기2",	1582,	0,	null,	52,	33,	32,	0,	160,	300,	null,	null],		
+		[32,	"왕도",	1583,	0,	null,	43,	22,	35,	0,	160,	300,	null,	null],		
+		[123,	"왕돈",	1584,	0,	null,	48,	33,	21,	0,	160,	300,	null,	null],		
+		[34,	"왕릉",	1585,	0,	null,	53,	30,	36,	0,	160,	300,	null,	null],		
+		[63,	"왕문",	1586,	0,	null,	50,	34,	16,	0,	160,	300,	null,	null],		
+		[32,	"왕상",	1587,	0,	null,	25,	10,	33,	0,	160,	300,	null,	null],		
+		[34,	"왕숙",	1588,	0,	null,	35,	11,	40,	0,	160,	300,	null,	null],		
+		[33,	"왕업",	1589,	0,	null,	32,	3,	23,	0,	160,	300,	null,	null],		
+		[35,	"왕충",	1590,	0,	null,	41,	29,	11,	0,	160,	300,	null,	null],		
+		[1,	"우보",	1591,	0,	null,	41,	32,	6,	0,	160,	300,	null,	null],		
+		[122,	"우사",	1592,	0,	null,	52,	17,	40,	0,	160,	300,	null,	null],		
+		[138,	"원요",	1593,	0,	null,	42,	21,	23,	0,	160,	300,	null,	null],		
+		[95,	"원유",	1594,	0,	null,	47,	19,	37,	0,	160,	300,	null,	null],		
+		[31,	"위관",	1595,	0,	null,	52,	23,	41,	0,	160,	300,	null,	null],		
+		[129,	"위막",	1596,	0,	null,	47,	31,	30,	0,	160,	300,	null,	null],		
+		[55,	"유괴",	1597,	0,	null,	54,	36,	33,	0,	160,	300,	null,	null],		
+		[129,	"유략",	1598,	0,	null,	53,	34,	30,	0,	160,	300,	null,	null],		
+		[45,	"유반",	1599,	0,	null,	54,	40,	24,	0,	160,	300,	null,	null],		
+		[29,	"유복",	1600,	0,	null,	46,	25,	37,	0,	160,	300,	null,	null],		
+		[78,	"유선2",	1601,	0,	null,	9,	11,	20,	0,	160,	300,	null,	null],		
+		[139,	"유섭",	1602,	0,	null,	49,	40,	13,	0,	160,	300,	null,	null],		
+		[28,	"유소",	1603,	0,	null,	50,	26,	37,	0,	160,	300,	null,	null],		
+		[128,	"유승",	1604,	0,	null,	42,	35,	15,	0,	160,	300,	null,	null],		
+		[129,	"유찬",	1605,	0,	null,	54,	38,	33,	0,	160,	300,	null,	null],		
+		[129,	"유평",	1606,	0,	null,	50,	35,	34,	0,	160,	300,	null,	null],		
+		[138,	"유훈",	1607,	0,	null,	44,	32,	25,	0,	160,	300,	null,	null],		
+		[48,	"이감",	1608,	0,	null,	48,	34,	17,	0,	160,	300,	null,	null],		
+		[19,	"이승",	1609,	0,	null,	13,	13,	16,	0,	160,	300,	null,	null],		
+		[22,	"이통",	1610,	0,	null,	54,	42,	26,	0,	160,	300,	null,	null],		
+		[138,	"이풍2",	1611,	0,	null,	53,	39,	25,	0,	160,	300,	null,	null],		
+		[20,	"이풍3",	1612,	0,	null,	23,	13,	36,	0,	160,	300,	null,	null],		
+		[29,	"장구",	1613,	0,	null,	52,	36,	24,	0,	160,	300,	null,	null],		
+		[21,	"장기",	1614,	0,	null,	55,	18,	40,	0,	160,	300,	null,	null],		
+		[74,	"장남",	1615,	0,	null,	52,	32,	19,	0,	160,	300,	null,	null],		
+		[100,	"장막",	1616,	0,	null,	45,	26,	35,	0,	160,	300,	null,	null],		
+		[7,	"장만성",	1617,	0,	null,	53,	42,	24,	0,	160,	300,	null,	null],		
+		[135,	"장반",	1618,	0,	null,	46,	37,	33,	0,	160,	300,	null,	null],		
+		[78,	"장빈",	1619,	0,	null,	30,	14,	34,	0,	160,	300,	null,	null],		
+		[124,	"장승",	1620,	0,	null,	54,	34,	38,	0,	160,	300,	null,	null],		
+		[999,	"장양2",	1621,	0,	null,	47,	25,	24,	0,	160,	300,	null,	null],		
+		[68,	"장억",	1622,	0,	null,	57,	40,	27,	0,	160,	300,	null,	null],		
+		[75,	"장준",	1623,	0,	null,	50,	34,	33,	0,	160,	300,	null,	null],		
+		[20,	"장집",	1624,	0,	null,	31,	14,	37,	0,	160,	300,	null,	null],		
+		[39,	"장특",	1625,	0,	null,	52,	27,	37,	0,	160,	300,	null,	null],		
+		[96,	"저곡",	1626,	0,	null,	47,	27,	34,	0,	160,	300,	null,	null],		
+		[128,	"전기",	1627,	0,	null,	44,	35,	28,	0,	160,	300,	null,	null],		
+		[23,	"전만",	1628,	0,	null,	45,	37,	19,	0,	160,	300,	null,	null],		
+		[128,	"전상",	1629,	0,	null,	5,	3,	6,	0,	160,	300,	null,	null],		
+		[130,	"전역",	1630,	0,	null,	48,	31,	19,	0,	160,	300,	null,	null],		
+		[75,	"전예",	1631,	0,	null,	56,	31,	42,	0,	160,	300,	null,	null],		
+		[64,	"전해",	1632,	0,	null,	52,	32,	29,	0,	160,	300,	null,	null],		
+		[123,	"정봉2",	1633,	0,	null,	51,	34,	26,	0,	160,	300,	null,	null],		
+		[22,	"정의",	1634,	0,	null,	17,	2,	33,	0,	160,	300,	null,	null],		
+		[81,	"제갈교",	1635,	0,	null,	46,	9,	39,	0,	160,	300,	null,	null],		
+		[40,	"제갈서",	1636,	0,	null,	42,	22,	14,	0,	160,	300,	null,	null],		
+		[25,	"조충",	1637,	0,	null,	14,	4,	40,	0,	160,	300,	null,	null],		
+		[121,	"종리목",	1638,	0,	null,	58,	34,	38,	0,	160,	300,	null,	null],		
+		[22,	"종육",	1639,	0,	null,	27,	6,	36,	0,	160,	300,	null,	null],		
+		[122,	"좌혁",	1640,	0,	null,	48,	33,	26,	0,	160,	300,	null,	null],		
+		[36,	"주령",	1641,	0,	null,	55,	35,	35,	0,	160,	300,	null,	null],		
+		[115,	"주앙",	1642,	0,	null,	54,	32,	32,	0,	160,	300,	null,	null],		
+		[52,	"주포",	1643,	0,	null,	48,	36,	6,	0,	160,	300,	null,	null],		
+		[11,	"주흔",	1644,	0,	null,	51,	27,	39,	0,	160,	300,	null,	null],		
+		[140,	"진기",	1645,	0,	null,	47,	34,	23,	0,	160,	300,	null,	null],		
+		[142,	"진란",	1646,	0,	null,	50,	35,	22,	0,	160,	300,	null,	null],		
+		[25,	"진랑",	1647,	0,	null,	47,	35,	19,	0,	160,	300,	null,	null],		
+		[12,	"진응",	1648,	0,	null,	49,	35,	25,	0,	160,	300,	null,	null],		
+		[124,	"진표",	1649,	0,	null,	49,	25,	37,	0,	160,	300,	null,	null],		
+		[999,	"채염",	1650,	0,	null,	40,	11,	32,	0,	160,	300,	null,	null],		
+		[999,	"초선",	1651,	0,	null,	50,	8,	36,	0,	160,	300,	null,	null],		
+		[135,	"초이",	1652,	0,	null,	46,	33,	28,	0,	160,	300,	null,	null],		
+		[65,	"추단",	1653,	0,	null,	49,	36,	18,	0,	160,	300,	null,	null],		
+		[999,	"추씨",	1654,	0,	null,	36,	7,	27,	0,	160,	300,	null,	null],		
+		[71,	"추정",	1655,	0,	null,	51,	33,	33,	0,	160,	300,	null,	null],		
+		[145,	"파재",	1656,	0,	null,	52,	38,	26,	0,	160,	300,	null,	null],		
+		[22,	"포신",	1657,	0,	null,	55,	30,	42,	0,	160,	300,	null,	null],		
+		[114,	"하식",	1658,	0,	null,	18,	19,	15,	0,	160,	300,	null,	null],		
+		[36,	"하안",	1659,	0,	null,	6,	14,	36,	0,	160,	300,	null,	null],		
+		[999,	"하후씨",	1660,	0,	null,	29,	8,	24,	0,	160,	300,	null,	null],		
+		[5,	"학맹",	1661,	0,	null,	47,	33,	21,	0,	160,	300,	null,	null],		
+		[98,	"한거자",	1662,	0,	null,	45,	30,	15,	0,	160,	300,	null,	null],		
+		[19,	"한덕",	1663,	0,	null,	49,	40,	12,	0,	160,	300,	null,	null],		
+		[140,	"한윤",	1664,	0,	null,	27,	12,	34,	0,	160,	300,	null,	null],		
+		[999,	"허소",	1665,	0,	null,	45,	14,	30,	0,	160,	300,	null,	null],		
+		[30,	"호열",	1666,	0,	null,	55,	35,	38,	0,	160,	300,	null,	null],		
+		[76,	"호제",	1667,	0,	null,	47,	21,	34,	0,	160,	300,	null,	null],		
+		[149,	"호진",	1668,	0,	null,	50,	39,	7,	0,	160,	300,	null,	null],		
+		[29,	"호질",	1669,	0,	null,	53,	25,	38,	0,	160,	300,	null,	null],		
+		[7,	"환계",	1670,	0,	null,	12,	13,	34,	0,	160,	300,	null,	null],		
+		[56,	"황숭",	1671,	0,	null,	51,	32,	37,	0,	160,	300,	null,	null],		
+		[999,	"황승언",	1672,	0,	null,	51,	9,	41,	0,	160,	300,	null,	null],		
+		[999,	"황월영",	1673,	0,	null,	47,	7,	38,	0,	160,	300,	null,	null],		
+		[45,	"황조",	1674,	0,	null,	54,	33,	29,	0,	160,	300,	null,	null],		
+		[48,	"후선",	1675,	0,	null,	46,	33,	18,	0,	160,	300,	null,	null],		
+		[8,	"휴고",	1676,	0,	null,	48,	36,	20,	0,	160,	300,	null,	null],		
+		[98,	"휴원진",	1677,	0,	null,	45,	32,	19,	0,	160,	300,	null,	null],		
+		[22,	"희지재",	1678,	0,	null,	24,	3,	43,	0,	160,	300,	null,	null]			
+    ],
+    "cities":[
+
+    ],
+    "history":[
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>당대의 대표 세력들이 등장합니다."
+    ],
+    "initialEvents":[
+
+    ],
+    "events":[
+
+    ]
+}
\ No newline at end of file

From 3e6523002c1ca9f528253c13c1a23c3dce9d566e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 20:43:18 +0900
Subject: [PATCH 009/184] =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EB=A9=94?=
 =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/scenario/scenario_29.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/scenario/scenario_29.json b/hwe/scenario/scenario_29.json
index c62ae729..eed84293 100644
--- a/hwe/scenario/scenario_29.json
+++ b/hwe/scenario/scenario_29.json
@@ -692,7 +692,7 @@
 
     ],
     "history":[
-        "<C>●</>180년 1월:<L><b>【이벤트】</b></>당대의 대표 세력들이 등장합니다."
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>차원이 다른 존재들이 나타납니다."
     ],
     "initialEvents":[
 

From 6961298e53556c32304378127da0a6579b269abd Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 20:48:49 +0900
Subject: [PATCH 010/184] =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=AA=BB?=
 =?UTF-8?q?=20=EB=B6=88=EB=9F=AC=EC=98=A4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/join_post.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/join_post.php b/hwe/join_post.php
index 59dd6885..85001276 100644
--- a/hwe/join_post.php
+++ b/hwe/join_post.php
@@ -59,7 +59,7 @@ extractMissingPostToGlobals();
 
 $rootDB = RootDB::db();
 //회원 테이블에서 정보확인
-$member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name` FROM member WHERE no=%i', $userID);
+$member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr FROM member WHERE no=%i', $userID);
 
 if (!$member) {
     MessageBox("잘못된 접근입니다!!!");

From 067df49914df4e92d7342679f90c8f015f560cad Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 20:59:16 +0900
Subject: [PATCH 011/184] =?UTF-8?q?29=EB=B2=88=20=EB=8A=A5=EB=A0=A5?=
 =?UTF-8?q?=EC=B9=98=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/scenario/scenario_29.json | 1362 ++++++++++++++++-----------------
 1 file changed, 681 insertions(+), 681 deletions(-)

diff --git a/hwe/scenario/scenario_29.json b/hwe/scenario/scenario_29.json
index eed84293..ea8d0352 100644
--- a/hwe/scenario/scenario_29.json
+++ b/hwe/scenario/scenario_29.json
@@ -6,687 +6,687 @@
     ],
     "diplomacy":[
     ],
-    "general":[
-		[1,	"소제1",	1001,	0,	null,	20,	6,	24,	0,	160,	300,	"유지",	null],		
-		[1,	"헌제",	1002,	0,	null,	17,	7,	31,	0,	160,	300,	"안전",	null],		
-		[999,	"사마휘",	1003,	0,	null,	52,	6,	48,	0,	160,	300,	"은둔",	"신산",	"좋지, 좋아~"],
-		[999,	"우길",	1004,	0,	null,	17,	7,	42,	0,	160,	300,	"은둔",	"신산"],		
-		[999,	"화타",	1005,	0,	null,	45,	13,	35,	0,	160,	300,	"은둔",	"의술",	"아픈 사람들은 모두 내게 오시오. 껄껄껄."],
-		[999,	"길평",	1006,	0,	null,	27,	8,	36,	0,	160,	300,	"은둔",	"의술"],		
-		[29,	"가규",	1007,	0,	null,	46,	28,	37,	0,	160,	300,	"재간",	null],		
-		[136,	"가범",	1008,	0,	null,	47,	24,	37,	0,	160,	300,	"유지",	null],		
-		[49,	"가비능",	1009,	0,	null,	47,	42,	16,	0,	160,	300,	"정복",	null],		
-		[31,	"가충",	1010,	0,	null,	44,	13,	44,	0,	160,	300,	"출세",	null],		
-		[20,	"가후",	1011,	0,	null,	52,	15,	47,	0,	160,	300,	"할거",	"귀병"],		
-		[73,	"간옹",	1012,	0,	null,	31,	17,	35,	0,	160,	300,	"안전",	"경작"],		
-		[129,	"감녕",	1013,	0,	null,	55,	48,	36,	0,	160,	300,	"출세",	"무쌍"],		
-		[127,	"감택",	1014,	0,	null,	49,	22,	40,	0,	160,	300,	"유지",	null],		
-		[60,	"강단",	1015,	0,	null,	40,	37,	22,	0,	160,	300,	"재간",	null],		
-		[73,	"강유",	1016,	0,	null,	62,	45,	47,	0,	160,	300,	"왕좌",	"집중",	"갈고 닦은 무예와 승상께 배운 책략을 발휘해 보이겠다!"],
-		[102,	"고간",	1017,	0,	null,	48,	29,	26,	0,	160,	300,	"유지",	null],		
-		[27,	"고람",	1018,	0,	null,	53,	34,	30,	0,	160,	300,	"출세",	"기병"],		
-		[69,	"고상",	1019,	0,	null,	40,	20,	19,	0,	160,	300,	"재간",	null],		
-		[144,	"고순",	1020,	0,	null,	56,	41,	33,	0,	160,	300,	"의협",	"기병"],		
-		[7,	"고승",	1021,	0,	null,	41,	37,	12,	0,	160,	300,	"출세",	null],		
-		[120,	"고옹",	1022,	0,	null,	47,	11,	40,	0,	160,	300,	"출세",	null],		
-		[63,	"고정",	1023,	0,	null,	51,	33,	28,	0,	160,	300,	"정복",	null],		
-		[53,	"고패",	1024,	0,	null,	45,	28,	14,	0,	160,	300,	"유지",	null],		
-		[74,	"공도",	1025,	0,	null,	26,	37,	10,	0,	160,	300,	"재간",	null],		
-		[142,	"공손강",	1026,	0,	null,	50,	36,	31,	0,	160,	300,	"정복",	null],		
-		[142,	"공손공",	1027,	0,	null,	51,	21,	38,	0,	160,	300,	"정복",	null],		
-		[142,	"공손도",	1028,	0,	null,	49,	36,	21,	0,	160,	300,	"정복",	"기병"],		
-		[65,	"공손범",	1029,	0,	null,	48,	34,	31,	0,	160,	300,	"출세",	null],		
-		[65,	"공손속",	1030,	0,	null,	48,	38,	21,	0,	160,	300,	"정복",	null],		
-		[10,	"공손연",	1031,	0,	null,	54,	40,	32,	0,	160,	300,	"패권",	"돌격"],		
-		[65,	"공손월",	1032,	0,	null,	43,	32,	23,	0,	160,	300,	"정복",	null],		
-		[65,	"공손찬",	1033,	0,	null,	48,	44,	34,	0,	160,	300,	"패권",	"기병"],		
-		[43,	"공융",	1034,	0,	null,	49,	24,	43,	0,	160,	300,	"왕좌",	"경작"],		
-		[35,	"공주",	1035,	0,	null,	50,	18,	39,	0,	160,	300,	"재간",	null],		
-		[83,	"공지",	1036,	0,	null,	47,	27,	32,	0,	160,	300,	"대의",	null],		
-		[26,	"곽가",	1037,	0,	null,	43,	12,	50,	0,	160,	300,	"패권",	"귀모"],		
-		[111,	"곽도",	1038,	0,	null,	49,	34,	41,	0,	160,	300,	"재간",	null],		
-		[2,	"곽사",	1039,	0,	null,	47,	34,	16,	0,	160,	300,	"패권",	null],		
-		[80,	"곽유지",	1040,	0,	null,	37,	11,	36,	0,	160,	300,	"재간",	"상재"],		
-		[67,	"곽익",	1041,	0,	null,	51,	30,	34,	0,	160,	300,	"재간",	null],		
-		[67,	"곽준",	1042,	0,	null,	54,	35,	37,	0,	160,	300,	"출세",	null],		
-		[27,	"곽혁",	1043,	0,	null,	40,	15,	40,	0,	160,	300,	"안전",	null],		
-		[20,	"곽회",	1044,	0,	null,	55,	38,	36,	0,	160,	300,	"정복",	null],		
-		[39,	"관구검",	1045,	0,	null,	53,	34,	39,	0,	160,	300,	"대의",	null],		
-		[76,	"관색",	1046,	0,	null,	52,	43,	34,	0,	160,	300,	"의협",	"징병"],		
-		[76,	"관우",	1047,	0,	null,	62,	49,	40,	0,	160,	300,	"의협",	"위압",	"나의 청룡 언월도를 과연 막아낼 수 있겠소?"],
-		[76,	"관이",	1048,	0,	null,	43,	30,	29,	0,	160,	300,	"안전",	null],		
-		[76,	"관통",	1049,	0,	null,	44,	32,	30,	0,	160,	300,	"대의",	null],		
-		[76,	"관평",	1050,	0,	null,	55,	40,	35,	0,	160,	300,	"의협",	"보병"],		
-		[7,	"관해",	1051,	0,	null,	50,	45,	18,	0,	160,	300,	"출세",	null],		
-		[76,	"관흥",	1052,	0,	null,	52,	42,	36,	0,	160,	300,	"의협",	"돌격"],		
-		[40,	"괴량",	1053,	0,	null,	40,	14,	41,	0,	160,	300,	"안전",	"신중"],		
-		[40,	"괴월",	1054,	0,	null,	26,	15,	42,	0,	160,	300,	"유지",	"귀병"],		
-		[98,	"교모",	1055,	0,	null,	48,	29,	31,	0,	160,	300,	"안전",	null],		
-		[98,	"교현",	1056,	0,	null,	44,	9,	30,	0,	160,	300,	"재간",	null],		
-		[6,	"구역거",	1057,	0,	null,	44,	36,	25,	0,	160,	300,	"안전",	null],		
-		[80,	"극정",	1058,	0,	null,	38,	13,	38,	0,	160,	300,	"유지",	null],		
-		[46,	"금선",	1059,	0,	null,	46,	25,	18,	0,	160,	300,	"할거",	null],		
-		[62,	"금환삼결",	1060,	0,	null,	42,	38,	9,	0,	160,	300,	"출세",	null],		
-		[141,	"기령",	1061,	0,	null,	54,	41,	17,	0,	160,	300,	"대의",	"무쌍"],		
-		[122,	"낙통",	1062,	0,	null,	47,	22,	35,	0,	160,	300,	"유지",	null],		
-		[124,	"노숙1",	1063,	0,	null,	60,	21,	47,	0,	160,	300,	"왕좌",	"상재"],		
-		[75,	"노식",	1064,	0,	null,	60,	27,	40,	0,	160,	300,	"왕좌",	"징병"],		
-		[59,	"뇌동",	1065,	0,	null,	52,	39,	23,	0,	160,	300,	"출세",	"궁병"],		
-		[142,	"뇌박",	1066,	0,	null,	46,	27,	17,	0,	160,	300,	"유지",	null],		
-		[127,	"능조",	1067,	0,	null,	51,	40,	22,	0,	160,	300,	"재간",	"공성"],		
-		[127,	"능통",	1068,	0,	null,	52,	39,	29,	0,	160,	300,	"의협",	"궁병"],		
-		[64,	"단경",	1069,	0,	null,	51,	31,	34,	0,	160,	300,	"정복",	null],		
-		[132,	"담웅",	1070,	0,	null,	45,	39,	10,	0,	160,	300,	"출세",	null],		
-		[99,	"답둔",	1071,	0,	null,	48,	36,	16,	0,	160,	300,	"유지",	null],		
-		[132,	"당자",	1072,	0,	null,	48,	28,	23,	0,	160,	300,	"안전",	null],		
-		[60,	"대래동주",	1073,	0,	null,	40,	33,	12,	0,	160,	300,	"안전",	null],		
-		[82,	"도겸",	1074,	0,	null,	44,	16,	31,	0,	160,	300,	"할거",	"인덕"],		
-		[120,	"도준",	1075,	0,	null,	50,	29,	25,	0,	160,	300,	"안전",	null],		
-		[73,	"동궐",	1076,	0,	null,	50,	25,	38,	0,	160,	300,	"대의",	null],		
-		[62,	"동다나",	1077,	0,	null,	44,	36,	14,	0,	160,	300,	"유지",	null],		
-		[2,	"동민",	1078,	0,	null,	45,	33,	25,	0,	160,	300,	"안전",	null],		
-		[21,	"동소",	1079,	0,	null,	42,	23,	31,	0,	160,	300,	"패권",	null],		
-		[127,	"동습",	1080,	0,	null,	45,	32,	16,	0,	160,	300,	"출세",	null],		
-		[89,	"동승",	1081,	0,	null,	54,	33,	33,	0,	160,	300,	"왕좌",	null],		
-		[78,	"동윤",	1082,	0,	null,	50,	13,	39,	0,	160,	300,	"왕좌",	null],		
-		[2,	"동탁",	1083,	0,	null,	59,	46,	27,	0,	160,	300,	"패권",	"기병"],		
-		[66,	"동화",	1084,	0,	null,	43,	32,	27,	0,	160,	300,	"대의",	null],		
-		[32,	"두예",	1085,	0,	null,	59,	40,	42,	0,	160,	300,	"정복",	null],		
-		[7,	"등무",	1086,	0,	null,	41,	37,	10,	0,	160,	300,	"정복",	null],		
-		[41,	"등애",	1087,	0,	null,	62,	41,	46,	0,	160,	300,	"패권",	"신산"],		
-		[116,	"등윤",	1088,	0,	null,	34,	21,	34,	0,	160,	300,	"안전",	null],		
-		[73,	"등지",	1089,	0,	null,	54,	26,	40,	0,	160,	300,	"할거",	"경작"],		
-		[41,	"등충",	1090,	0,	null,	48,	41,	28,	0,	160,	300,	"출세",	null],		
-		[54,	"등현",	1091,	0,	null,	50,	30,	31,	0,	160,	300,	"출세",	null],		
-		[29,	"마균",	1092,	0,	null,	33,	19,	40,	0,	160,	300,	"안전",	null],		
-		[71,	"마대",	1093,	0,	null,	55,	40,	25,	0,	160,	300,	"대의",	"기병"],		
-		[70,	"마등",	1094,	0,	null,	56,	44,	28,	0,	160,	300,	"왕좌",	"기병"],		
-		[80,	"마속",	1095,	0,	null,	53,	32,	41,	0,	160,	300,	"패권",	"집중"],		
-		[77,	"마량",	1096,	0,	null,	47,	13,	44,	0,	160,	300,	"왕좌",	null],		
-		[48,	"마완",	1097,	0,	null,	44,	32,	13,	0,	160,	300,	"안전",	"기병"],		
-		[19,	"마준",	1098,	0,	null,	42,	32,	31,	0,	160,	300,	"안전",	null],		
-		[71,	"마철",	1099,	0,	null,	52,	30,	16,	0,	160,	300,	"대의",	"기병"],		
-		[70,	"마초",	1100,	0,	null,	55,	49,	20,	0,	160,	300,	"대의",	"기병",	"금마초 나가신닷!"],
-		[131,	"마충1",	1101,	0,	null,	51,	31,	26,	0,	160,	300,	"재간",	null],		
-		[69,	"마충2",	1102,	0,	null,	48,	34,	26,	0,	160,	300,	"출세",	null],		
-		[71,	"마휴",	1103,	0,	null,	52,	30,	16,	0,	160,	300,	"대의",	"기병"],		
-		[116,	"만총",	1104,	0,	null,	56,	20,	39,	0,	160,	300,	"할거",	"신중"],		
-		[51,	"망아장",	1105,	0,	null,	29,	32,	10,	0,	160,	300,	"출세",	null],		
-		[44,	"맹달",	1106,	0,	null,	52,	33,	36,	0,	160,	300,	"할거",	"귀병"],		
-		[60,	"맹우",	1107,	0,	null,	49,	40,	13,	0,	160,	300,	"정복",	null],		
-		[60,	"맹획",	1108,	0,	null,	55,	46,	25,	0,	160,	300,	"왕좌",	"격노"],		
-		[29,	"모개",	1109,	0,	null,	42,	28,	28,	0,	160,	300,	"대의",	null],		
-		[51,	"목록대왕",	1110,	0,	null,	47,	36,	33,	0,	160,	300,	"재간",	"척사"],		
-		[96,	"목순",	1111,	0,	null,	17,	11,	34,	0,	160,	300,	"왕좌",	null],		
-		[43,	"무안국",	1112,	0,	null,	44,	37,	9,	0,	160,	300,	"재간",	null],		
-		[28,	"문빙",	1113,	0,	null,	52,	39,	22,	0,	160,	300,	"유지",	null],		
-		[38,	"문앙",	1114,	0,	null,	52,	46,	23,	0,	160,	300,	"대의",	null],		
-		[102,	"문추",	1115,	0,	null,	53,	47,	13,	0,	160,	300,	"출세",	"무쌍"],		
-		[38,	"문흠",	1116,	0,	null,	54,	39,	22,	0,	160,	300,	"대의",	null],		
-		[49,	"미당대왕",	1117,	0,	null,	50,	38,	16,	0,	160,	300,	"유지",	null],		
-		[108,	"미방",	1118,	0,	null,	47,	33,	19,	0,	160,	300,	"패권",	"징병"],		
-		[77,	"미축",	1119,	0,	null,	26,	15,	33,	0,	160,	300,	"왕좌",	"상재"],		
-		[94,	"반봉",	1120,	0,	null,	48,	38,	9,	0,	160,	300,	"출세",	null],		
-		[44,	"반준",	1121,	0,	null,	40,	11,	34,	0,	160,	300,	"안전",	null],		
-		[65,	"방덕",	1122,	0,	null,	54,	45,	34,	0,	160,	300,	"의협",	"기병"],		
-		[73,	"방통",	1123,	0,	null,	58,	21,	49,	0,	160,	300,	"패권",	"반계"],		
-		[65,	"방회",	1124,	0,	null,	25,	17,	30,	0,	160,	300,	"안전",	null],		
-		[68,	"배원소",	1125,	0,	null,	42,	35,	17,	0,	160,	300,	"재간",	null],		
-		[78,	"번건",	1126,	0,	null,	28,	16,	34,	0,	160,	300,	"대의",	null],		
-		[149,	"번주",	1127,	0,	null,	51,	39,	11,	0,	160,	300,	"할거",	null],		
-		[72,	"법정",	1128,	0,	null,	56,	15,	47,	0,	160,	300,	"패권",	"신산"],		
-		[8,	"변희",	1129,	0,	null,	50,	33,	14,	0,	160,	300,	"안전",	null],		
-		[121,	"보질",	1130,	0,	null,	47,	14,	39,	0,	160,	300,	"유지",	null],		
-		[113,	"복양흥",	1131,	0,	null,	47,	26,	36,	0,	160,	300,	"유지",	null],		
-		[110,	"봉기",	1132,	0,	null,	51,	26,	40,	0,	160,	300,	"패권",	"집중"],		
-		[74,	"부동",	1133,	0,	null,	47,	35,	35,	0,	160,	300,	"대의",	null],		
-		[108,	"부사인",	1134,	0,	null,	46,	30,	26,	0,	160,	300,	"출세",	null],		
-		[38,	"부손",	1135,	0,	null,	24,	22,	34,	0,	160,	300,	"안전",	null],		
-		[74,	"부첨",	1136,	0,	null,	48,	37,	23,	0,	160,	300,	"대의",	null],		
-		[66,	"비시",	1137,	0,	null,	18,	18,	31,	0,	160,	300,	"재간",	null],		
-		[141,	"비연",	1138,	0,	null,	50,	33,	27,	0,	160,	300,	"출세",	null],		
-		[77,	"비위",	1139,	0,	null,	53,	13,	37,	0,	160,	300,	"대의",	null],		
-		[144,	"사광",	1140,	0,	null,	47,	25,	33,	0,	160,	300,	"안전",	null],		
-		[71,	"사마가",	1141,	0,	null,	48,	43,	9,	0,	160,	300,	"정복",	"돌격"],		
-		[20,	"사마랑",	1142,	0,	null,	25,	16,	32,	0,	160,	300,	"대의",	null],		
-		[24,	"사마망",	1143,	0,	null,	52,	31,	33,	0,	160,	300,	"정복",	null],		
-		[24,	"사마부",	1144,	0,	null,	46,	16,	37,	0,	160,	300,	"대의",	null],		
-		[31,	"사마사",	1145,	0,	null,	59,	32,	46,	0,	160,	300,	"정복",	null],		
-		[31,	"사마소",	1146,	0,	null,	61,	32,	42,	0,	160,	300,	"정복",	null],		
-		[31,	"사마염",	1147,	0,	null,	61,	39,	36,	0,	160,	300,	"패권",	null],		
-		[30,	"사마유",	1148,	0,	null,	49,	23,	40,	0,	160,	300,	"왕좌",	null],		
-		[31,	"사마의",	1149,	0,	null,	63,	34,	49,	0,	160,	300,	"패권",	"반계"],		
-		[139,	"사섭",	1150,	0,	null,	49,	31,	36,	0,	160,	300,	"안전",	null],		
-		[139,	"사일",	1151,	0,	null,	48,	22,	34,	0,	160,	300,	"유지",	null],		
-		[132,	"사정",	1152,	0,	null,	51,	36,	10,	0,	160,	300,	"안전",	null],		
-		[146,	"사지",	1153,	0,	null,	48,	25,	35,	0,	160,	300,	"안전",	null],		
-		[144,	"사휘",	1154,	0,	null,	51,	36,	31,	0,	160,	300,	"유지",	null],		
-		[35,	"서막",	1155,	0,	null,	46,	21,	36,	0,	160,	300,	"유지",	null],		
-		[76,	"서서",	1156,	0,	null,	60,	35,	48,	0,	160,	300,	"의협",	"귀병"],		
-		[124,	"서성",	1157,	0,	null,	57,	38,	42,	0,	160,	300,	"대의",	null],		
-		[142,	"서영",	1158,	0,	null,	43,	32,	17,	0,	160,	300,	"안전",	null],		
-		[23,	"서질",	1159,	0,	null,	46,	37,	17,	0,	160,	300,	"재간",	null],		
-		[23,	"서황",	1160,	0,	null,	56,	45,	34,	0,	160,	300,	"의협",	"필살"],		
-		[32,	"석포",	1161,	0,	null,	52,	32,	30,	0,	160,	300,	"정복",	null],		
-		[131,	"설영",	1162,	0,	null,	42,	12,	32,	0,	160,	300,	"유지",	null],		
-		[128,	"설종",	1163,	0,	null,	27,	17,	34,	0,	160,	300,	"유지",	null],		
-		[69,	"성의",	1164,	0,	null,	42,	32,	11,	0,	160,	300,	"재간",	null],		
-		[129,	"소비",	1165,	0,	null,	51,	32,	25,	0,	160,	300,	"대의",	null],		
-		[76,	"손건",	1166,	0,	null,	41,	17,	37,	0,	160,	300,	"대의",	"거상"],		
-		[125,	"손견",	1167,	0,	null,	62,	48,	38,	0,	160,	300,	"왕좌",	"무쌍"],		
-		[126,	"손광",	1168,	0,	null,	49,	27,	29,	0,	160,	300,	"유지",	null],		
-		[125,	"손권",	1169,	0,	null,	60,	39,	42,	0,	160,	300,	"할거",	"수비"],		
-		[126,	"손랑",	1170,	0,	null,	27,	27,	14,	0,	160,	300,	"안전",	null],		
-		[126,	"손등",	1171,	0,	null,	45,	20,	39,	0,	160,	300,	"할거",	null],		
-		[125,	"손량",	1172,	0,	null,	24,	12,	40,	0,	160,	300,	"할거",	null],		
-		[20,	"손례",	1173,	0,	null,	50,	32,	35,	0,	160,	300,	"안전",	null],		
-		[124,	"손소",	1174,	0,	null,	54,	40,	34,	0,	160,	300,	"정복",	null],		
-		[130,	"손수",	1175,	0,	null,	51,	29,	30,	0,	160,	300,	"안전",	null],		
-		[126,	"손유",	1176,	0,	null,	55,	30,	34,	0,	160,	300,	"정복",	null],		
-		[122,	"손이",	1177,	0,	null,	47,	31,	29,	0,	160,	300,	"안전",	null],		
-		[126,	"손정",	1178,	0,	null,	48,	28,	31,	0,	160,	300,	"유지",	null],		
-		[115,	"손준",	1179,	0,	null,	48,	35,	26,	0,	160,	300,	"정복",	null],		
-		[7,	"손중",	1180,	0,	null,	45,	32,	12,	0,	160,	300,	"안전",	null],		
-		[125,	"손책",	1181,	0,	null,	62,	48,	39,	0,	160,	300,	"패권",	"필살",	"소패왕 손책이 나가신다! 길을 비켜라!"],
-		[115,	"손침",	1182,	0,	null,	44,	36,	20,	0,	160,	300,	"패권",	null],		
-		[114,	"손호",	1183,	0,	null,	20,	39,	34,	0,	160,	300,	"패권",	null],		
-		[126,	"손화",	1184,	0,	null,	35,	13,	36,	0,	160,	300,	"왕좌",	null],		
-		[127,	"손환",	1185,	0,	null,	56,	33,	35,	0,	160,	300,	"정복",	null],		
-		[126,	"손휴",	1186,	0,	null,	49,	22,	32,	0,	160,	300,	"정복",	null],		
-		[117,	"손흠",	1187,	0,	null,	50,	32,	17,	0,	160,	300,	"정복",	null],		
-		[147,	"송헌",	1188,	0,	null,	41,	32,	21,	0,	160,	300,	"안전",	null],		
-		[95,	"순우경",	1189,	0,	null,	53,	34,	30,	0,	160,	300,	"할거",	null],		
-		[22,	"순욱1",	1190,	0,	null,	46,	15,	49,	0,	160,	300,	"왕좌",	"집중"],		
-		[22,	"순유",	1191,	0,	null,	53,	21,	45,	0,	160,	300,	"대의",	"신중"],		
-		[29,	"신비",	1192,	0,	null,	43,	14,	37,	0,	160,	300,	"재간",	null],		
-		[37,	"신의",	1193,	0,	null,	46,	31,	26,	0,	160,	300,	"출세",	null],		
-		[37,	"신탐",	1194,	0,	null,	46,	29,	29,	0,	160,	300,	"출세",	null],		
-		[85,	"신평",	1195,	0,	null,	51,	26,	38,	0,	160,	300,	"왕좌",	null],		
-		[102,	"심배",	1196,	0,	null,	54,	33,	34,	0,	160,	300,	"패권",	"귀병"],		
-		[126,	"심영",	1197,	0,	null,	45,	36,	26,	0,	160,	300,	"재간",	null],		
-		[47,	"아하소과",	1198,	0,	null,	45,	38,	8,	0,	160,	300,	"안전",	"척사"],		
-		[62,	"아회남",	1199,	0,	null,	44,	37,	15,	0,	160,	300,	"출세",	"척사"],		
-		[23,	"악진",	1200,	0,	null,	53,	34,	28,	0,	160,	300,	"대의",	"돌격"],		
-		[23,	"악침",	1201,	0,	null,	42,	26,	17,	0,	160,	300,	"대의",	null],		
-		[63,	"악환",	1202,	0,	null,	46,	41,	28,	0,	160,	300,	"재간",	null],		
-		[102,	"안량",	1203,	0,	null,	53,	47,	18,	0,	160,	300,	"출세",	"위압"],		
-		[14,	"양백",	1204,	0,	null,	46,	27,	27,	0,	160,	300,	"안전",	null],		
-		[92,	"양봉1",	1205,	0,	null,	47,	32,	18,	0,	160,	300,	"유지",	null],		
-		[91,	"양봉2",	1206,	0,	null,	49,	39,	31,	0,	160,	300,	"정복",	null],		
-		[13,	"양송",	1207,	0,	null,	15,	18,	17,	0,	160,	300,	"안전",	null],		
-		[43,	"양수",	1208,	0,	null,	18,	16,	46,	0,	160,	300,	"재간",	"귀병"],		
-		[61,	"양의",	1209,	0,	null,	51,	28,	36,	0,	160,	300,	"유지",	null],		
-		[141,	"양조1",	1210,	0,	null,	51,	27,	30,	0,	160,	300,	"출세",	null],		
-		[9,	"양추1",	1211,	0,	null,	44,	34,	8,	0,	160,	300,	"정복",	null],		
-		[31,	"양호",	1212,	0,	null,	60,	35,	40,	0,	160,	300,	"패권",	null],		
-		[53,	"양회",	1213,	0,	null,	48,	34,	20,	0,	160,	300,	"출세",	null],		
-		[141,	"양흥",	1214,	0,	null,	45,	34,	9,	0,	160,	300,	"안전",	null],		
-		[6,	"어부라",	1215,	0,	null,	55,	40,	31,	0,	160,	300,	"정복",	null],		
-		[64,	"엄강",	1216,	0,	null,	47,	33,	22,	0,	160,	300,	"재간",	null],		
-		[10,	"엄백호",	1217,	0,	null,	43,	34,	15,	0,	160,	300,	"할거",	null],		
-		[10,	"엄여",	1218,	0,	null,	35,	33,	12,	0,	160,	300,	"할거",	null],		
-		[69,	"엄안",	1219,	0,	null,	53,	42,	34,	0,	160,	300,	"왕좌",	null],		
-		[7,	"엄정",	1220,	0,	null,	31,	34,	25,	0,	160,	300,	"출세",	null],		
-		[121,	"엄준",	1221,	0,	null,	42,	12,	36,	0,	160,	300,	"재간",	null],		
-		[71,	"여개",	1222,	0,	null,	44,	21,	34,	0,	160,	300,	"유지",	null],		
-		[29,	"여건",	1223,	0,	null,	42,	34,	15,	0,	160,	300,	"출세",	null],		
-		[107,	"여광",	1224,	0,	null,	48,	34,	14,	0,	160,	300,	"유지",	null],		
-		[124,	"여몽",	1225,	0,	null,	61,	39,	47,	0,	160,	300,	"패권",	"궁병"],		
-		[123,	"여범",	1226,	0,	null,	41,	17,	36,	0,	160,	300,	"할거",	null],		
-		[107,	"여상",	1227,	0,	null,	49,	34,	13,	0,	160,	300,	"유지",	null],		
-		[105,	"여위황",	1228,	0,	null,	41,	31,	19,	0,	160,	300,	"정복",	null],		
-		[145,	"여포",	1229,	0,	null,	54,	50,	15,	0,	160,	300,	"패권",	"돌격",	"다 죽여버리겠다! 으하하."],
-		[50,	"염우",	1230,	0,	null,	47,	26,	9,	0,	160,	300,	"출세",	null],		
-		[40,	"염유",	1231,	0,	null,	48,	38,	26,	0,	160,	300,	"출세",	null],		
-		[18,	"염포",	1232,	0,	null,	33,	18,	39,	0,	160,	300,	"유지",	null],		
-		[40,	"예형",	1233,	0,	null,	55,	16,	48,	0,	160,	300,	"은둔",	"통찰"],		
-		[133,	"오강",	1234,	0,	null,	43,	19,	31,	0,	160,	300,	"안전",	null],		
-		[59,	"오란",	1235,	0,	null,	51,	38,	21,	0,	160,	300,	"재간",	null],		
-		[72,	"오반",	1236,	0,	null,	52,	33,	23,	0,	160,	300,	"재간",	null],		
-		[128,	"오언",	1237,	0,	null,	52,	30,	26,	0,	160,	300,	"재간",	null],		
-		[126,	"오연",	1238,	0,	null,	36,	35,	16,	0,	160,	300,	"정복",	null],		
-		[69,	"오의",	1239,	0,	null,	54,	36,	37,	0,	160,	300,	"유지",	null],		
-		[19,	"오질",	1240,	0,	null,	41,	19,	35,	0,	160,	300,	"출세",	null],		
-		[51,	"올돌골",	1241,	0,	null,	55,	46,	8,	0,	160,	300,	"출세",	"척사"],		
-		[52,	"옹개",	1242,	0,	null,	47,	34,	26,	0,	160,	300,	"안전",	null],		
-		[20,	"왕경",	1243,	0,	null,	46,	24,	33,	0,	160,	300,	"재간",	null],		
-		[97,	"왕광",	1244,	0,	null,	53,	34,	27,	0,	160,	300,	"유지",	null],		
-		[30,	"왕기1",	1245,	0,	null,	54,	31,	35,	0,	160,	300,	"유지",	null],		
-		[34,	"왕랑",	1246,	0,	null,	44,	15,	26,	0,	160,	300,	"할거",	null],		
-		[57,	"왕루",	1247,	0,	null,	40,	14,	38,	0,	160,	300,	"유지",	null],		
-		[76,	"왕보",	1248,	0,	null,	43,	17,	38,	0,	160,	300,	"대의",	null],		
-		[86,	"왕수",	1249,	0,	null,	34,	17,	34,	0,	160,	300,	"재간",	null],		
-		[26,	"왕쌍",	1250,	0,	null,	47,	45,	8,	0,	160,	300,	"정복",	"보병"],		
-		[46,	"왕위",	1251,	0,	null,	48,	30,	34,	0,	160,	300,	"안전",	null],		
-		[92,	"왕윤",	1252,	0,	null,	16,	9,	39,	0,	160,	300,	"왕좌",	null],		
-		[40,	"왕융",	1253,	0,	null,	49,	21,	39,	0,	160,	300,	"재간",	null],		
-		[32,	"왕준",	1254,	0,	null,	56,	42,	38,	0,	160,	300,	"대의",	null],		
-		[30,	"왕찬",	1255,	0,	null,	28,	14,	39,	0,	160,	300,	"안전",	null],		
-		[33,	"왕창",	1256,	0,	null,	54,	29,	26,	0,	160,	300,	"정복",	null],		
-		[69,	"왕평",	1257,	0,	null,	55,	38,	36,	0,	160,	300,	"재간",	null],		
-		[71,	"왕항",	1258,	0,	null,	44,	22,	30,	0,	160,	300,	"대의",	null],		
-		[33,	"왕혼",	1259,	0,	null,	52,	16,	30,	0,	160,	300,	"정복",	null],		
-		[71,	"요립",	1260,	0,	null,	50,	21,	42,	0,	160,	300,	"출세",	null],		
-		[74,	"요화",	1261,	0,	null,	51,	29,	30,	0,	160,	300,	"의협",	null],		
-		[22,	"우금1",	1262,	0,	null,	56,	37,	36,	0,	160,	300,	"정복",	null],		
-		[27,	"우금2",	1263,	0,	null,	49,	39,	19,	0,	160,	300,	"대의",	null],		
-		[122,	"우번",	1264,	0,	null,	23,	21,	37,	0,	160,	300,	"유지",	null],		
-		[126,	"우전",	1265,	0,	null,	49,	28,	21,	0,	160,	300,	"안전",	null],		
-		[86,	"원담",	1266,	0,	null,	51,	30,	28,	0,	160,	300,	"왕좌",	null],		
-		[101,	"원상",	1267,	0,	null,	46,	36,	34,	0,	160,	300,	"패권",	null],		
-		[101,	"원소",	1268,	0,	null,	58,	34,	38,	0,	160,	300,	"패권",	"위압"],		
-		[140,	"원술",	1269,	0,	null,	55,	30,	36,	0,	160,	300,	"패권",	"축성"],		
-		[140,	"원윤",	1270,	0,	null,	40,	17,	30,	0,	160,	300,	"패권",	null],		
-		[101,	"원희",	1271,	0,	null,	52,	29,	36,	0,	160,	300,	"할거",	null],		
-		[131,	"위소",	1272,	0,	null,	39,	12,	41,	0,	160,	300,	"재간",	null],		
-		[147,	"위속",	1273,	0,	null,	47,	30,	21,	0,	160,	300,	"안전",	null],		
-		[81,	"위연",	1274,	0,	null,	55,	47,	31,	0,	160,	300,	"패권",	"보병"],		
-		[96,	"위유",	1275,	0,	null,	45,	35,	36,	0,	160,	300,	"재간",	null],		
-		[76,	"유기",	1276,	0,	null,	47,	10,	37,	0,	160,	300,	"왕좌",	null],		
-		[36,	"유대",	1277,	0,	null,	48,	29,	31,	0,	160,	300,	"재간",	null],		
-		[134,	"유도",	1278,	0,	null,	35,	17,	34,	0,	160,	300,	"재간",	null],		
-		[46,	"유벽",	1279,	0,	null,	49,	36,	12,	0,	160,	300,	"출세",	null],		
-		[75,	"유봉",	1280,	0,	null,	48,	33,	31,	0,	160,	300,	"출세",	null],		
-		[75,	"유비",	1281,	0,	null,	58,	38,	35,	0,	160,	300,	"왕좌",	"인덕"],		
-		[75,	"유선1",	1282,	0,	null,	24,	9,	11,	0,	160,	300,	"대의",	null],		
-		[55,	"유순",	1283,	0,	null,	51,	31,	27,	0,	160,	300,	"출세",	null],		
-		[75,	"유심",	1284,	0,	null,	49,	23,	35,	0,	160,	300,	"왕좌",	null],		
-		[129,	"유약",	1285,	0,	null,	51,	32,	31,	0,	160,	300,	"유지",	null],		
-		[55,	"유언",	1286,	0,	null,	48,	20,	37,	0,	160,	300,	"할거",	null],		
-		[27,	"유엽",	1287,	0,	null,	40,	15,	40,	0,	160,	300,	"유지",	null],		
-		[11,	"유요",	1288,	0,	null,	23,	11,	24,	0,	160,	300,	"안전",	"발명"],		
-		[96,	"유우",	1289,	0,	null,	51,	17,	36,	0,	160,	300,	"왕좌",	null],		
-		[55,	"유장",	1290,	0,	null,	38,	16,	32,	0,	160,	300,	"할거",	"수비"],		
-		[45,	"유종",	1291,	0,	null,	22,	13,	31,	0,	160,	300,	"할거",	null],		
-		[56,	"유파",	1292,	0,	null,	43,	16,	35,	0,	160,	300,	"대의",	null],		
-		[45,	"유표1",	1293,	0,	null,	52,	29,	36,	0,	160,	300,	"할거",	null],		
-		[27,	"유표2",	1294,	0,	null,	54,	28,	36,	0,	160,	300,	"안전",	null],		
-		[134,	"유현",	1295,	0,	null,	32,	28,	28,	0,	160,	300,	"안전",	null],		
-		[122,	"육개",	1296,	0,	null,	50,	15,	36,	0,	160,	300,	"재간",	null],		
-		[122,	"육손",	1297,	0,	null,	63,	34,	49,	0,	160,	300,	"왕좌",	"귀병"],		
-		[121,	"육적",	1298,	0,	null,	42,	15,	37,	0,	160,	300,	"안전",	null],		
-		[122,	"육항",	1299,	0,	null,	62,	35,	47,	0,	160,	300,	"왕좌",	null],		
-		[38,	"윤대목",	1300,	0,	null,	49,	25,	35,	0,	160,	300,	"재간",	null],		
-		[80,	"윤묵",	1301,	0,	null,	19,	14,	37,	0,	160,	300,	"대의",	null],		
-		[72,	"윤상",	1302,	0,	null,	30,	16,	21,	0,	160,	300,	"대의",	null],		
-		[136,	"윤직",	1303,	0,	null,	42,	29,	32,	0,	160,	300,	"재간",	null],		
-		[2,	"이각",	1304,	0,	null,	46,	39,	22,	0,	160,	300,	"패권",	null],		
-		[146,	"이숙",	1305,	0,	null,	27,	23,	34,	0,	160,	300,	"재간",	null],		
-		[71,	"이엄",	1306,	0,	null,	56,	42,	41,	0,	160,	300,	"패권",	null],		
-		[2,	"이유",	1307,	0,	null,	50,	11,	45,	0,	160,	300,	"패권",	"귀모"],		
-		[132,	"이이",	1308,	0,	null,	46,	38,	10,	0,	160,	300,	"정복",	null],		
-		[77,	"이적",	1309,	0,	null,	46,	14,	39,	0,	160,	300,	"할거",	null],		
-		[22,	"이전",	1310,	0,	null,	54,	34,	41,	0,	160,	300,	"왕좌",	null],		
-		[71,	"이풍1",	1311,	0,	null,	48,	28,	31,	0,	160,	300,	"재간",	null],		
-		[66,	"이회",	1312,	0,	null,	51,	25,	40,	0,	160,	300,	"유지",	null],		
-		[114,	"잠혼",	1313,	0,	null,	15,	8,	22,	0,	160,	300,	"할거",	null],		
-		[7,	"장각",	1314,	0,	null,	61,	13,	47,	0,	160,	300,	"패권",	"환술"],		
-		[34,	"장간",	1315,	0,	null,	19,	10,	35,	0,	160,	300,	"재간",	null],		
-		[7,	"장개",	1316,	0,	null,	43,	35,	10,	0,	160,	300,	"안전",	null],		
-		[122,	"장굉",	1317,	0,	null,	25,	11,	43,	0,	160,	300,	"왕좌",	null],		
-		[7,	"장량",	1318,	0,	null,	51,	41,	34,	0,	160,	300,	"정복",	"환술"],		
-		[15,	"장로",	1319,	0,	null,	54,	22,	40,	0,	160,	300,	"유지",	"축성"],		
-		[23,	"장료",	1320,	0,	null,	60,	47,	42,	0,	160,	300,	"의협",	"견고"],		
-		[7,	"장보",	1321,	0,	null,	55,	41,	38,	0,	160,	300,	"패권",	"환술"],		
-		[76,	"장비",	1322,	0,	null,	56,	50,	24,	0,	160,	300,	"의협",	"무쌍",	"어쭈. 해보자 이거냐?"],
-		[62,	"장서",	1323,	0,	null,	42,	24,	18,	0,	160,	300,	"출세",	null],		
-		[120,	"장소1",	1324,	0,	null,	41,	12,	46,	0,	160,	300,	"안전",	null],		
-		[78,	"장소2",	1325,	0,	null,	44,	22,	36,	0,	160,	300,	"재간",	null],		
-		[72,	"장송",	1326,	0,	null,	44,	14,	47,	0,	160,	300,	"할거",	"통찰"],		
-		[148,	"장수",	1327,	0,	null,	52,	36,	35,	0,	160,	300,	"할거",	null],		
-		[145,	"장양1",	1328,	0,	null,	49,	33,	33,	0,	160,	300,	"출세",	null],		
-		[8,	"장연",	1329,	0,	null,	55,	33,	24,	0,	160,	300,	"안전",	null],		
-		[11,	"장영",	1330,	0,	null,	46,	33,	20,	0,	160,	300,	"재간",	null],		
-		[118,	"장온",	1331,	0,	null,	21,	15,	35,	0,	160,	300,	"할거",	null],		
-		[78,	"장완",	1332,	0,	null,	52,	28,	43,	0,	160,	300,	"할거",	"상재"],		
-		[15,	"장위",	1333,	0,	null,	50,	35,	15,	0,	160,	300,	"대의",	null],		
-		[36,	"장윤",	1334,	0,	null,	51,	30,	30,	0,	160,	300,	"정복",	null],		
-		[104,	"장의거",	1335,	0,	null,	51,	30,	17,	0,	160,	300,	"대의",	null],		
-		[68,	"장익",	1336,	0,	null,	54,	34,	32,	0,	160,	300,	"유지",	null],		
-		[56,	"장임",	1337,	0,	null,	57,	41,	37,	0,	160,	300,	"대의",	"견고"],		
-		[148,	"장제1",	1338,	0,	null,	52,	33,	30,	0,	160,	300,	"할거",	null],		
-		[32,	"장제2",	1339,	0,	null,	30,	17,	42,	0,	160,	300,	"유지",	null],		
-		[126,	"장제3",	1340,	0,	null,	54,	25,	31,	0,	160,	300,	"할거",	null],		
-		[17,	"장패",	1341,	0,	null,	42,	39,	22,	0,	160,	300,	"할거",	null],		
-		[76,	"장포1",	1342,	0,	null,	52,	43,	25,	0,	160,	300,	"재간",	"징병"],		
-		[113,	"장포2",	1343,	0,	null,	49,	33,	26,	0,	160,	300,	"유지",	null],		
-		[27,	"장합",	1344,	0,	null,	57,	46,	32,	0,	160,	300,	"출세",	"궁병"],		
-		[23,	"장호",	1345,	0,	null,	46,	31,	27,	0,	160,	300,	"정복",	null],		
-		[31,	"장화",	1346,	0,	null,	44,	12,	43,	0,	160,	300,	"유지",	null],		
-		[48,	"장횡",	1347,	0,	null,	45,	34,	13,	0,	160,	300,	"재간",	null],		
-		[141,	"장훈",	1348,	0,	null,	51,	31,	30,	0,	160,	300,	"안전",	null],		
-		[120,	"장휴",	1349,	0,	null,	41,	18,	35,	0,	160,	300,	"재간",	null],		
-		[126,	"장흠",	1350,	0,	null,	50,	33,	34,	0,	160,	300,	"대의",	"저격"],		
-		[96,	"저수",	1351,	0,	null,	57,	27,	44,	0,	160,	300,	"할거",	"반계"],		
-		[130,	"전단",	1352,	0,	null,	50,	37,	31,	0,	160,	300,	"출세",	null],		
-		[42,	"전속",	1353,	0,	null,	50,	29,	25,	0,	160,	300,	"안전",	null],		
-		[26,	"전위1",	1354,	0,	null,	48,	48,	17,	0,	160,	300,	"의협",	"필살"],		
-		[130,	"전위2",	1355,	0,	null,	54,	35,	31,	0,	160,	300,	"출세",	null],		
-		[128,	"전종",	1356,	0,	null,	56,	39,	37,	0,	160,	300,	"패권",	null],		
-		[42,	"전주",	1357,	0,	null,	52,	34,	26,	0,	160,	300,	"의협",	null],		
-		[96,	"전풍",	1358,	0,	null,	56,	21,	48,	0,	160,	300,	"왕좌",	null],		
-		[24,	"정무",	1359,	0,	null,	46,	19,	37,	0,	160,	300,	"출세",	null],		
-		[119,	"정병",	1360,	0,	null,	22,	13,	34,	0,	160,	300,	"유지",	null],		
-		[126,	"정보",	1361,	0,	null,	56,	32,	38,	0,	160,	300,	"패권",	null],		
-		[123,	"정봉1",	1362,	0,	null,	52,	39,	32,	0,	160,	300,	"패권",	null],		
-		[24,	"정욱",	1363,	0,	null,	56,	20,	45,	0,	160,	300,	"패권",	"신중"],		
-		[88,	"정원",	1364,	0,	null,	50,	39,	29,	0,	160,	300,	"왕좌",	"기병"],		
-		[7,	"정원지",	1365,	0,	null,	40,	37,	19,	0,	160,	300,	"출세",	null],		
-		[69,	"정은",	1366,	0,	null,	45,	31,	13,	0,	160,	300,	"재간",	null],		
-		[121,	"제갈각",	1367,	0,	null,	48,	27,	46,	0,	160,	300,	"왕좌",	null],		
-		[76,	"제갈균",	1368,	0,	null,	48,	23,	37,	0,	160,	300,	"안전",	"상재"],		
-		[121,	"제갈근",	1369,	0,	null,	48,	21,	44,	0,	160,	300,	"왕좌",	"경작"],		
-		[76,	"제갈량",	1370,	0,	null,	63,	28,	50,	0,	160,	300,	"왕좌",	"집중",	"슬슬 나의 지모를 발휘해 보겠습니다..."],
-		[76,	"제갈상",	1371,	0,	null,	45,	38,	36,	0,	160,	300,	"대의",	null],		
-		[135,	"제갈정",	1372,	0,	null,	46,	29,	27,	0,	160,	300,	"안전",	null],		
-		[76,	"제갈첨",	1373,	0,	null,	53,	26,	38,	0,	160,	300,	"대의",	null],		
-		[135,	"제갈탄",	1374,	0,	null,	56,	40,	37,	0,	160,	300,	"패권",	null],		
-		[76,	"조광",	1375,	0,	null,	50,	34,	27,	0,	160,	300,	"재간",	null],		
-		[74,	"조루",	1376,	0,	null,	44,	19,	30,	0,	160,	300,	"대의",	null],		
-		[24,	"조모",	1377,	0,	null,	45,	16,	15,	0,	160,	300,	"할거",	null],		
-		[127,	"조무",	1378,	0,	null,	52,	34,	36,	0,	160,	300,	"의협",	null],		
-		[26,	"조방",	1379,	0,	null,	44,	10,	16,	0,	160,	300,	"정복",	null],		
-		[83,	"조범",	1380,	0,	null,	47,	20,	32,	0,	160,	300,	"유지",	null],		
-		[26,	"조비",	1381,	0,	null,	53,	35,	38,	0,	160,	300,	"패권",	"징병"],		
-		[19,	"조상",	1382,	0,	null,	51,	31,	16,	0,	160,	300,	"패권",	null],		
-		[147,	"조성",	1383,	0,	null,	42,	35,	26,	0,	160,	300,	"안전",	null],		
-		[26,	"조순",	1384,	0,	null,	50,	29,	36,	0,	160,	300,	"정복",	null],		
-		[25,	"조식",	1385,	0,	null,	19,	10,	45,	0,	160,	300,	"왕좌",	"귀모"],		
-		[25,	"조앙",	1386,	0,	null,	42,	33,	31,	0,	160,	300,	"왕좌",	null],		
-		[25,	"조예",	1387,	0,	null,	47,	28,	41,	0,	160,	300,	"정복",	null],		
-		[26,	"조우",	1388,	0,	null,	51,	28,	34,	0,	160,	300,	"대의",	null],		
-		[76,	"조운",	1389,	0,	null,	62,	49,	44,	0,	160,	300,	"왕좌",	"무쌍",	"창술의 달인 상산 조자룡 여기 있소!"],
-		[25,	"조웅",	1390,	0,	null,	48,	14,	22,	0,	160,	300,	"안전",	null],		
-		[26,	"조인",	1391,	0,	null,	54,	40,	31,	0,	160,	300,	"패권",	"보병"],		
-		[25,	"조조",	1392,	0,	null,	64,	40,	48,	0,	160,	300,	"패권",	"반계"],		
-		[26,	"조진",	1393,	0,	null,	57,	34,	33,	0,	160,	300,	"정복",	null],		
-		[25,	"조창",	1394,	0,	null,	54,	44,	19,	0,	160,	300,	"정복",	"돌격"],		
-		[76,	"조통",	1395,	0,	null,	50,	32,	28,	0,	160,	300,	"재간",	null],		
-		[84,	"조표",	1396,	0,	null,	34,	35,	8,	0,	160,	300,	"안전",	null],		
-		[7,	"조홍1",	1397,	0,	null,	45,	33,	21,	0,	160,	300,	"유지",	null],		
-		[24,	"조홍2",	1398,	0,	null,	53,	35,	22,	0,	160,	300,	"패권",	null],		
-		[26,	"조환",	1399,	0,	null,	34,	12,	21,	0,	160,	300,	"정복",	null],		
-		[19,	"조훈",	1400,	0,	null,	51,	32,	15,	0,	160,	300,	"출세",	null],		
-		[26,	"조휴",	1401,	0,	null,	54,	36,	35,	0,	160,	300,	"패권",	null],		
-		[19,	"조희",	1402,	0,	null,	50,	29,	36,	0,	160,	300,	"대의",	null],		
-		[22,	"종요",	1403,	0,	null,	16,	10,	37,	0,	160,	300,	"유지",	null],		
-		[20,	"종회",	1404,	0,	null,	58,	29,	47,	0,	160,	300,	"패권",	null],		
-		[128,	"주거",	1405,	0,	null,	53,	36,	36,	0,	160,	300,	"유지",	null],		
-		[118,	"주방",	1406,	0,	null,	46,	18,	38,	0,	160,	300,	"할거",	null],		
-		[126,	"주연",	1407,	0,	null,	53,	36,	26,	0,	160,	300,	"할거",	null],		
-		[126,	"주유",	1408,	0,	null,	63,	37,	49,	0,	160,	300,	"패권",	"신산"],		
-		[128,	"주이",	1409,	0,	null,	48,	28,	31,	0,	160,	300,	"안전",	null],		
-		[88,	"주준",	1410,	0,	null,	57,	38,	33,	0,	160,	300,	"왕좌",	null],		
-		[32,	"주지",	1411,	0,	null,	45,	39,	24,	0,	160,	300,	"안전",	null],		
-		[76,	"주창",	1412,	0,	null,	41,	40,	15,	0,	160,	300,	"의협",	"궁병"],		
-		[126,	"주치",	1413,	0,	null,	47,	28,	28,	0,	160,	300,	"안전",	null],		
-		[41,	"주태1",	1414,	0,	null,	49,	28,	31,	0,	160,	300,	"안전",	null],		
-		[126,	"주태2",	1415,	0,	null,	54,	44,	30,	0,	160,	300,	"정복",	"필살"],		
-		[128,	"주환",	1416,	0,	null,	58,	43,	37,	0,	160,	300,	"정복",	null],		
-		[29,	"진건",	1417,	0,	null,	49,	35,	31,	0,	160,	300,	"정복",	null],		
-		[29,	"진교",	1418,	0,	null,	21,	13,	34,	0,	160,	300,	"유지",	null],		
-		[28,	"진군",	1419,	0,	null,	48,	19,	44,	0,	160,	300,	"대의",	null],		
-		[143,	"진궁",	1420,	0,	null,	55,	26,	45,	0,	160,	300,	"할거",	"신중"],		
-		[79,	"진규",	1421,	0,	null,	22,	10,	36,	0,	160,	300,	"할거",	null],		
-		[72,	"진도",	1422,	0,	null,	52,	43,	35,	0,	160,	300,	"대의",	null],		
-		[79,	"진등",	1423,	0,	null,	50,	31,	36,	0,	160,	300,	"할거",	null],		
-		[37,	"진림",	1424,	0,	null,	44,	14,	41,	0,	160,	300,	"재간",	null],		
-		[124,	"진무",	1425,	0,	null,	49,	37,	30,	0,	160,	300,	"재간",	null],		
-		[66,	"진복",	1426,	0,	null,	36,	14,	38,	0,	160,	300,	"재간",	null],		
-		[50,	"진수",	1427,	0,	null,	25,	15,	42,	0,	160,	300,	"대의",	null],		
-		[81,	"진식",	1428,	0,	null,	43,	34,	26,	0,	160,	300,	"출세",	null],		
-		[79,	"진진",	1429,	0,	null,	47,	19,	32,	0,	160,	300,	"재간",	null],		
-		[28,	"진태",	1430,	0,	null,	56,	38,	35,	0,	160,	300,	"대의",	null],		
-		[11,	"진횡",	1431,	0,	null,	38,	29,	24,	0,	160,	300,	"출세",	null],		
-		[21,	"차주",	1432,	0,	null,	46,	33,	31,	0,	160,	300,	"안전",	null],		
-		[11,	"착융",	1433,	0,	null,	49,	30,	11,	0,	160,	300,	"출세",	null],		
-		[36,	"채모",	1434,	0,	null,	56,	35,	34,	0,	160,	300,	"정복",	"궁병"],		
-		[36,	"채중",	1435,	0,	null,	47,	22,	28,	0,	160,	300,	"출세",	null],		
-		[36,	"채화",	1436,	0,	null,	46,	24,	25,	0,	160,	300,	"안전",	null],		
-		[66,	"초주",	1437,	0,	null,	22,	13,	41,	0,	160,	300,	"대의",	null],		
-		[20,	"최염",	1438,	0,	null,	41,	27,	34,	0,	160,	300,	"대의",	null],		
-		[60,	"축융",	1439,	0,	null,	48,	44,	13,	0,	160,	300,	"정복",	"척사"],		
-		[60,	"타사대왕",	1440,	0,	null,	48,	36,	34,	0,	160,	300,	"출세",	"척사"],		
-		[124,	"태사자",	1441,	0,	null,	52,	49,	33,	0,	160,	300,	"대의",	"무쌍"],		
-		[124,	"태사향",	1442,	0,	null,	44,	35,	25,	0,	160,	300,	"재간",	null],		
-		[12,	"포륭",	1443,	0,	null,	45,	37,	10,	0,	160,	300,	"안전",	null],		
-		[74,	"풍습",	1444,	0,	null,	36,	32,	22,	0,	160,	300,	"재간",	null],		
-		[7,	"하의",	1445,	0,	null,	44,	34,	13,	0,	160,	300,	"출세",	null],		
-		[121,	"하제",	1446,	0,	null,	54,	37,	32,	0,	160,	300,	"재간",	null],		
-		[90,	"하진",	1447,	0,	null,	44,	35,	19,	0,	160,	300,	"왕좌",	null],		
-		[24,	"하후덕",	1448,	0,	null,	51,	32,	20,	0,	160,	300,	"출세",	null],		
-		[26,	"하후돈",	1449,	0,	null,	59,	46,	36,	0,	160,	300,	"의협",	"돌격",	"다 나오거라! 상대해 주마!"],
-		[19,	"하후무",	1450,	0,	null,	38,	17,	19,	0,	160,	300,	"안전",	null],		
-		[24,	"하후상",	1451,	0,	null,	51,	31,	36,	0,	160,	300,	"출세",	null],		
-		[26,	"하후연",	1452,	0,	null,	56,	45,	29,	0,	160,	300,	"패권",	"궁병",	"궁술로 날 당해낼 자가 있을까? 후후."],
-		[26,	"하후위",	1453,	0,	null,	53,	38,	36,	0,	160,	300,	"정복",	null],		
-		[26,	"하후은",	1454,	0,	null,	44,	26,	20,	0,	160,	300,	"안전",	null],		
-		[23,	"하후패",	1455,	0,	null,	55,	44,	35,	0,	160,	300,	"대의",	null],		
-		[20,	"하후현",	1456,	0,	null,	47,	12,	38,	0,	160,	300,	"유지",	null],		
-		[26,	"하후혜",	1457,	0,	null,	54,	33,	39,	0,	160,	300,	"정복",	null],		
-		[26,	"하후화",	1458,	0,	null,	55,	31,	40,	0,	160,	300,	"정복",	null],		
-		[22,	"학소",	1459,	0,	null,	60,	41,	43,	0,	160,	300,	"대의",	"견고"],		
-		[126,	"한당",	1460,	0,	null,	51,	34,	32,	0,	160,	300,	"할거",	null],		
-		[93,	"한복",	1461,	0,	null,	50,	30,	21,	0,	160,	300,	"안전",	null],		
-		[8,	"한섬",	1462,	0,	null,	39,	31,	18,	0,	160,	300,	"출세",	null],		
-		[48,	"한수",	1463,	0,	null,	50,	38,	39,	0,	160,	300,	"대의",	"기병"],		
-		[40,	"한숭",	1464,	0,	null,	21,	13,	35,	0,	160,	300,	"재간",	null],		
-		[7,	"한충",	1465,	0,	null,	40,	33,	15,	0,	160,	300,	"안전",	null],		
-		[9,	"한현",	1466,	0,	null,	41,	31,	10,	0,	160,	300,	"유지",	null],		
-		[27,	"한호",	1467,	0,	null,	48,	37,	23,	0,	160,	300,	"유지",	null],		
-		[79,	"향랑",	1468,	0,	null,	44,	11,	39,	0,	160,	300,	"대의",	null],		
-		[79,	"향총",	1469,	0,	null,	54,	21,	37,	0,	160,	300,	"왕좌",	null],		
-		[139,	"허공",	1470,	0,	null,	50,	32,	30,	0,	160,	300,	"유지",	null],		
-		[21,	"허유",	1471,	0,	null,	43,	24,	29,	0,	160,	300,	"재간",	null],		
-		[23,	"허의",	1472,	0,	null,	31,	37,	24,	0,	160,	300,	"출세",	null],		
-		[26,	"허저",	1473,	0,	null,	47,	49,	14,	0,	160,	300,	"정복",	"무쌍"],		
-		[87,	"허정",	1474,	0,	null,	18,	15,	37,	0,	160,	300,	"재간",	null],		
-		[12,	"형도영",	1475,	0,	null,	44,	39,	12,	0,	160,	300,	"출세",	null],		
-		[148,	"호거아",	1476,	0,	null,	35,	38,	31,	0,	160,	300,	"안전",	null],		
-		[76,	"호반",	1477,	0,	null,	48,	29,	23,	0,	160,	300,	"재간",	null],		
-		[20,	"호분",	1478,	0,	null,	52,	30,	31,	0,	160,	300,	"할거",	null],		
-		[27,	"호주천",	1479,	0,	null,	55,	38,	33,	0,	160,	300,	"정복",	null],		
-		[20,	"호준",	1480,	0,	null,	51,	30,	23,	0,	160,	300,	"재간",	null],		
-		[2,	"화웅",	1481,	0,	null,	51,	44,	12,	0,	160,	300,	"출세",	"돌격"],		
-		[131,	"화핵",	1482,	0,	null,	37,	14,	38,	0,	160,	300,	"안전",	null],		
-		[10,	"화흠",	1483,	0,	null,	18,	22,	38,	0,	160,	300,	"출세",	null],		
-		[21,	"환범",	1484,	0,	null,	20,	13,	41,	0,	160,	300,	"유지",	null],		
-		[127,	"황개",	1485,	0,	null,	55,	43,	35,	0,	160,	300,	"왕좌",	"징병"],		
-		[56,	"황권",	1486,	0,	null,	54,	23,	39,	0,	160,	300,	"대의",	null],		
-		[41,	"황란",	1487,	0,	null,	29,	35,	13,	0,	160,	300,	"재간",	null],		
-		[88,	"황보숭",	1488,	0,	null,	57,	32,	37,	0,	160,	300,	"왕좌",	null],		
-		[72,	"황충",	1489,	0,	null,	58,	47,	34,	0,	160,	300,	"왕좌",	"궁병"],		
-		[50,	"황호",	1490,	0,	null,	15,	9,	24,	0,	160,	300,	"안전",	null],		
-		[147,	"후성",	1491,	0,	null,	46,	31,	17,	0,	160,	300,	"정복",	null]			
-	],																											
-	"general_ex":[																											
-		[123,	"가화",	1492,	0,	null,	44,	33,	20,	0,	160,	300,	null,	null],		
-		[999,	"건석",	1493,	0,	null,	21,	6,	31,	0,	160,	300,	null,	null],		
-		[999,	"견씨",	1494,	0,	null,	35,	12,	29,	0,	160,	300,	null,	null],		
-		[40,	"견홍",	1495,	0,	null,	54,	36,	33,	0,	160,	300,	null,	null],		
-		[120,	"고담",	1496,	0,	null,	33,	11,	35,	0,	160,	300,	null,	null],		
-		[101,	"고유",	1497,	0,	null,	46,	22,	37,	0,	160,	300,	null,	null],		
-		[132,	"곽마",	1498,	0,	null,	51,	36,	25,	0,	160,	300,	null,	null],		
-		[39,	"관구수",	1499,	0,	null,	47,	32,	18,	0,	160,	300,	null,	null],		
-		[39,	"관구전",	1500,	0,	null,	49,	29,	34,	0,	160,	300,	null,	null],		
-		[999,	"관로",	1501,	0,	null,	49,	11,	38,	0,	160,	300,	null,	null],		
-		[65,	"관정",	1502,	0,	null,	35,	25,	37,	0,	160,	300,	null,	null],		
-		[137,	"교수",	1503,	0,	null,	51,	35,	20,	0,	160,	300,	null,	null],		
-		[33,	"구건",	1504,	0,	null,	41,	28,	35,	0,	160,	300,	null,	null],		
-		[41,	"구본",	1505,	0,	null,	45,	21,	35,	0,	160,	300,	null,	null],		
-		[12,	"구성",	1506,	0,	null,	46,	36,	16,	0,	160,	300,	null,	null],		
-		[21,	"국연",	1507,	0,	null,	45,	11,	36,	0,	160,	300,	null,	null],		
-		[99,	"국의",	1508,	0,	null,	57,	40,	25,	0,	160,	300,	null,	null],		
-		[34,	"금의",	1509,	0,	null,	18,	20,	32,	0,	160,	300,	null,	null],		
-		[76,	"나헌",	1510,	0,	null,	58,	34,	38,	0,	160,	300,	null,	null],		
-		[999,	"남두",	1511,	0,	null,	35,	13,	27,	0,	160,	300,	null,	null],		
-		[54,	"냉포",	1512,	0,	null,	52,	41,	35,	0,	160,	300,	null,	null],		
-		[124,	"노숙2",	1513,	0,	null,	52,	28,	38,	0,	160,	300,	null,	null],		
-		[42,	"누규",	1514,	0,	null,	46,	10,	44,	0,	160,	300,	null,	null],		
-		[6,	"누반",	1515,	0,	null,	50,	38,	20,	0,	160,	300,	null,	null],		
-		[130,	"누현",	1516,	0,	null,	23,	10,	34,	0,	160,	300,	null,	null],		
-		[40,	"당균",	1517,	0,	null,	33,	10,	41,	0,	160,	300,	null,	null],		
-		[32,	"당빈",	1518,	0,	null,	52,	37,	31,	0,	160,	300,	null,	null],		
-		[999,	"대교",	1519,	0,	null,	41,	5,	27,	0,	160,	300,	null,	null],		
-		[28,	"대릉",	1520,	0,	null,	50,	38,	23,	0,	160,	300,	null,	null],		
-		[129,	"동조",	1521,	0,	null,	16,	8,	26,	0,	160,	300,	null,	null],		
-		[114,	"등수",	1522,	0,	null,	35,	10,	22,	0,	160,	300,	null,	null],		
-		[50,	"마막",	1523,	0,	null,	22,	9,	3,	0,	160,	300,	null,	null],		
-		[116,	"만욱",	1524,	0,	null,	20,	9,	33,	0,	160,	300,	null,	null],		
-		[120,	"맹종",	1525,	0,	null,	43,	24,	34,	0,	160,	300,	null,	null],		
-		[38,	"문호",	1526,	0,	null,	50,	37,	23,	0,	160,	300,	null,	null],		
-		[999,	"미씨",	1527,	0,	null,	48,	8,	34,	0,	160,	300,	null,	null],		
-		[39,	"반림",	1528,	0,	null,	50,	40,	4,	0,	160,	300,	null,	null],		
-		[129,	"반장",	1529,	0,	null,	55,	39,	35,	0,	160,	300,	null,	null],		
-		[94,	"방열",	1530,	0,	null,	47,	41,	14,	0,	160,	300,	null,	null],		
-		[55,	"방희",	1531,	0,	null,	48,	19,	35,	0,	160,	300,	null,	null],		
-		[30,	"배수",	1532,	0,	null,	10,	6,	39,	0,	160,	300,	null,	null],		
-		[8,	"번능",	1533,	0,	null,	52,	31,	24,	0,	160,	300,	null,	null],		
-		[999,	"번씨",	1534,	0,	null,	32,	9,	23,	0,	160,	300,	null,	null],		
-		[49,	"보도근",	1535,	0,	null,	50,	37,	25,	0,	160,	300,	null,	null],		
-		[129,	"보천",	1536,	0,	null,	51,	30,	36,	0,	160,	300,	null,	null],		
-		[121,	"보협",	1537,	0,	null,	53,	27,	38,	0,	160,	300,	null,	null],		
-		[28,	"부하",	1538,	0,	null,	42,	18,	43,	0,	160,	300,	null,	null],		
-		[26,	"비요",	1539,	0,	null,	52,	33,	37,	0,	160,	300,	null,	null],		
-		[31,	"사마주",	1540,	0,	null,	49,	27,	31,	0,	160,	300,	null,	null],		
-		[41,	"사찬",	1541,	0,	null,	48,	36,	27,	0,	160,	300,	null,	null],		
-		[128,	"설후",	1542,	0,	null,	16,	7,	36,	0,	160,	300,	null,	null],		
-		[36,	"성공영",	1543,	0,	null,	53,	29,	40,	0,	160,	300,	null,	null],		
-		[126,	"성만",	1544,	0,	null,	48,	35,	33,	0,	160,	300,	null,	null],		
-		[999,	"소교",	1545,	0,	null,	47,	12,	33,	0,	160,	300,	null,	null],		
-		[46,	"소유",	1546,	0,	null,	44,	31,	24,	0,	160,	300,	null,	null],		
-		[31,	"소제2",	1547,	0,	null,	22,	8,	39,	0,	160,	300,	null,	null],		
-		[126,	"손교",	1548,	0,	null,	55,	30,	35,	0,	160,	300,	null,	null],		
-		[116,	"손기",	1549,	0,	null,	49,	33,	26,	0,	160,	300,	null,	null],		
-		[999,	"손상향",	1550,	0,	null,	53,	31,	21,	0,	160,	300,	null,	null],		
-		[125,	"손익",	1551,	0,	null,	52,	38,	13,	0,	160,	300,	null,	null],		
-		[125,	"손진",	1552,	0,	null,	50,	36,	24,	0,	160,	300,	null,	null],		
-		[123,	"송겸",	1553,	0,	null,	48,	24,	22,	0,	160,	300,	null,	null],		
-		[85,	"순심",	1554,	0,	null,	20,	11,	40,	0,	160,	300,	null,	null],		
-		[31,	"순욱2",	1555,	0,	null,	10,	8,	39,	0,	160,	300,	null,	null],		
-		[31,	"순의",	1556,	0,	null,	16,	6,	37,	0,	160,	300,	null,	null],		
-		[129,	"시삭",	1557,	0,	null,	36,	33,	22,	0,	160,	300,	null,	null],		
-		[29,	"신창",	1558,	0,	null,	44,	15,	23,	0,	160,	300,	null,	null],		
-		[999,	"악신",	1559,	0,	null,	45,	6,	23,	0,	160,	300,	null,	null],		
-		[138,	"악취",	1560,	0,	null,	46,	34,	29,	0,	160,	300,	null,	null],		
-		[138,	"양강",	1561,	0,	null,	49,	35,	21,	0,	160,	300,	null,	null],		
-		[21,	"양부",	1562,	0,	null,	51,	28,	43,	0,	160,	300,	null,	null],		
-		[72,	"양서",	1563,	0,	null,	46,	31,	33,	0,	160,	300,	null,	null],		
-		[34,	"양습",	1564,	0,	null,	51,	25,	37,	0,	160,	300,	null,	null],		
-		[16,	"양앙",	1565,	0,	null,	50,	35,	20,	0,	160,	300,	null,	null],		
-		[17,	"양임",	1566,	0,	null,	52,	39,	28,	0,	160,	300,	null,	null],		
-		[32,	"양제",	1567,	0,	null,	52,	32,	36,	0,	160,	300,	null,	null],		
-		[33,	"양조2",	1568,	0,	null,	50,	31,	34,	0,	160,	300,	null,	null],		
-		[48,	"양추2",	1569,	0,	null,	50,	34,	31,	0,	160,	300,	null,	null],		
-		[140,	"양홍",	1570,	0,	null,	19,	9,	38,	0,	160,	300,	null,	null],		
-		[31,	"양혼",	1571,	0,	null,	48,	34,	32,	0,	160,	300,	null,	null],		
-		[123,	"여거",	1572,	0,	null,	52,	29,	35,	0,	160,	300,	null,	null],		
-		[130,	"여대",	1573,	0,	null,	57,	36,	35,	0,	160,	300,	null,	null],		
-		[136,	"염상",	1574,	0,	null,	29,	14,	35,	0,	160,	300,	null,	null],		
-		[36,	"염행",	1575,	0,	null,	52,	43,	19,	0,	160,	300,	null,	null],		
-		[73,	"영수",	1576,	0,	null,	52,	35,	37,	0,	160,	300,	null,	null],		
-		[39,	"오거",	1577,	0,	null,	44,	32,	16,	0,	160,	300,	null,	null],		
-		[126,	"오경",	1578,	0,	null,	53,	30,	29,	0,	160,	300,	null,	null],		
-		[999,	"오국태",	1579,	0,	null,	31,	6,	30,	0,	160,	300,	null,	null],		
-		[126,	"오찬",	1580,	0,	null,	52,	21,	39,	0,	160,	300,	null,	null],		
-		[23,	"온회",	1581,	0,	null,	41,	20,	39,	0,	160,	300,	null,	null],		
-		[21,	"왕기2",	1582,	0,	null,	52,	33,	32,	0,	160,	300,	null,	null],		
-		[32,	"왕도",	1583,	0,	null,	43,	22,	35,	0,	160,	300,	null,	null],		
-		[123,	"왕돈",	1584,	0,	null,	48,	33,	21,	0,	160,	300,	null,	null],		
-		[34,	"왕릉",	1585,	0,	null,	53,	30,	36,	0,	160,	300,	null,	null],		
-		[63,	"왕문",	1586,	0,	null,	50,	34,	16,	0,	160,	300,	null,	null],		
-		[32,	"왕상",	1587,	0,	null,	25,	10,	33,	0,	160,	300,	null,	null],		
-		[34,	"왕숙",	1588,	0,	null,	35,	11,	40,	0,	160,	300,	null,	null],		
-		[33,	"왕업",	1589,	0,	null,	32,	3,	23,	0,	160,	300,	null,	null],		
-		[35,	"왕충",	1590,	0,	null,	41,	29,	11,	0,	160,	300,	null,	null],		
-		[1,	"우보",	1591,	0,	null,	41,	32,	6,	0,	160,	300,	null,	null],		
-		[122,	"우사",	1592,	0,	null,	52,	17,	40,	0,	160,	300,	null,	null],		
-		[138,	"원요",	1593,	0,	null,	42,	21,	23,	0,	160,	300,	null,	null],		
-		[95,	"원유",	1594,	0,	null,	47,	19,	37,	0,	160,	300,	null,	null],		
-		[31,	"위관",	1595,	0,	null,	52,	23,	41,	0,	160,	300,	null,	null],		
-		[129,	"위막",	1596,	0,	null,	47,	31,	30,	0,	160,	300,	null,	null],		
-		[55,	"유괴",	1597,	0,	null,	54,	36,	33,	0,	160,	300,	null,	null],		
-		[129,	"유략",	1598,	0,	null,	53,	34,	30,	0,	160,	300,	null,	null],		
-		[45,	"유반",	1599,	0,	null,	54,	40,	24,	0,	160,	300,	null,	null],		
-		[29,	"유복",	1600,	0,	null,	46,	25,	37,	0,	160,	300,	null,	null],		
-		[78,	"유선2",	1601,	0,	null,	9,	11,	20,	0,	160,	300,	null,	null],		
-		[139,	"유섭",	1602,	0,	null,	49,	40,	13,	0,	160,	300,	null,	null],		
-		[28,	"유소",	1603,	0,	null,	50,	26,	37,	0,	160,	300,	null,	null],		
-		[128,	"유승",	1604,	0,	null,	42,	35,	15,	0,	160,	300,	null,	null],		
-		[129,	"유찬",	1605,	0,	null,	54,	38,	33,	0,	160,	300,	null,	null],		
-		[129,	"유평",	1606,	0,	null,	50,	35,	34,	0,	160,	300,	null,	null],		
-		[138,	"유훈",	1607,	0,	null,	44,	32,	25,	0,	160,	300,	null,	null],		
-		[48,	"이감",	1608,	0,	null,	48,	34,	17,	0,	160,	300,	null,	null],		
-		[19,	"이승",	1609,	0,	null,	13,	13,	16,	0,	160,	300,	null,	null],		
-		[22,	"이통",	1610,	0,	null,	54,	42,	26,	0,	160,	300,	null,	null],		
-		[138,	"이풍2",	1611,	0,	null,	53,	39,	25,	0,	160,	300,	null,	null],		
-		[20,	"이풍3",	1612,	0,	null,	23,	13,	36,	0,	160,	300,	null,	null],		
-		[29,	"장구",	1613,	0,	null,	52,	36,	24,	0,	160,	300,	null,	null],		
-		[21,	"장기",	1614,	0,	null,	55,	18,	40,	0,	160,	300,	null,	null],		
-		[74,	"장남",	1615,	0,	null,	52,	32,	19,	0,	160,	300,	null,	null],		
-		[100,	"장막",	1616,	0,	null,	45,	26,	35,	0,	160,	300,	null,	null],		
-		[7,	"장만성",	1617,	0,	null,	53,	42,	24,	0,	160,	300,	null,	null],		
-		[135,	"장반",	1618,	0,	null,	46,	37,	33,	0,	160,	300,	null,	null],		
-		[78,	"장빈",	1619,	0,	null,	30,	14,	34,	0,	160,	300,	null,	null],		
-		[124,	"장승",	1620,	0,	null,	54,	34,	38,	0,	160,	300,	null,	null],		
-		[999,	"장양2",	1621,	0,	null,	47,	25,	24,	0,	160,	300,	null,	null],		
-		[68,	"장억",	1622,	0,	null,	57,	40,	27,	0,	160,	300,	null,	null],		
-		[75,	"장준",	1623,	0,	null,	50,	34,	33,	0,	160,	300,	null,	null],		
-		[20,	"장집",	1624,	0,	null,	31,	14,	37,	0,	160,	300,	null,	null],		
-		[39,	"장특",	1625,	0,	null,	52,	27,	37,	0,	160,	300,	null,	null],		
-		[96,	"저곡",	1626,	0,	null,	47,	27,	34,	0,	160,	300,	null,	null],		
-		[128,	"전기",	1627,	0,	null,	44,	35,	28,	0,	160,	300,	null,	null],		
-		[23,	"전만",	1628,	0,	null,	45,	37,	19,	0,	160,	300,	null,	null],		
-		[128,	"전상",	1629,	0,	null,	5,	3,	6,	0,	160,	300,	null,	null],		
-		[130,	"전역",	1630,	0,	null,	48,	31,	19,	0,	160,	300,	null,	null],		
-		[75,	"전예",	1631,	0,	null,	56,	31,	42,	0,	160,	300,	null,	null],		
-		[64,	"전해",	1632,	0,	null,	52,	32,	29,	0,	160,	300,	null,	null],		
-		[123,	"정봉2",	1633,	0,	null,	51,	34,	26,	0,	160,	300,	null,	null],		
-		[22,	"정의",	1634,	0,	null,	17,	2,	33,	0,	160,	300,	null,	null],		
-		[81,	"제갈교",	1635,	0,	null,	46,	9,	39,	0,	160,	300,	null,	null],		
-		[40,	"제갈서",	1636,	0,	null,	42,	22,	14,	0,	160,	300,	null,	null],		
-		[25,	"조충",	1637,	0,	null,	14,	4,	40,	0,	160,	300,	null,	null],		
-		[121,	"종리목",	1638,	0,	null,	58,	34,	38,	0,	160,	300,	null,	null],		
-		[22,	"종육",	1639,	0,	null,	27,	6,	36,	0,	160,	300,	null,	null],		
-		[122,	"좌혁",	1640,	0,	null,	48,	33,	26,	0,	160,	300,	null,	null],		
-		[36,	"주령",	1641,	0,	null,	55,	35,	35,	0,	160,	300,	null,	null],		
-		[115,	"주앙",	1642,	0,	null,	54,	32,	32,	0,	160,	300,	null,	null],		
-		[52,	"주포",	1643,	0,	null,	48,	36,	6,	0,	160,	300,	null,	null],		
-		[11,	"주흔",	1644,	0,	null,	51,	27,	39,	0,	160,	300,	null,	null],		
-		[140,	"진기",	1645,	0,	null,	47,	34,	23,	0,	160,	300,	null,	null],		
-		[142,	"진란",	1646,	0,	null,	50,	35,	22,	0,	160,	300,	null,	null],		
-		[25,	"진랑",	1647,	0,	null,	47,	35,	19,	0,	160,	300,	null,	null],		
-		[12,	"진응",	1648,	0,	null,	49,	35,	25,	0,	160,	300,	null,	null],		
-		[124,	"진표",	1649,	0,	null,	49,	25,	37,	0,	160,	300,	null,	null],		
-		[999,	"채염",	1650,	0,	null,	40,	11,	32,	0,	160,	300,	null,	null],		
-		[999,	"초선",	1651,	0,	null,	50,	8,	36,	0,	160,	300,	null,	null],		
-		[135,	"초이",	1652,	0,	null,	46,	33,	28,	0,	160,	300,	null,	null],		
-		[65,	"추단",	1653,	0,	null,	49,	36,	18,	0,	160,	300,	null,	null],		
-		[999,	"추씨",	1654,	0,	null,	36,	7,	27,	0,	160,	300,	null,	null],		
-		[71,	"추정",	1655,	0,	null,	51,	33,	33,	0,	160,	300,	null,	null],		
-		[145,	"파재",	1656,	0,	null,	52,	38,	26,	0,	160,	300,	null,	null],		
-		[22,	"포신",	1657,	0,	null,	55,	30,	42,	0,	160,	300,	null,	null],		
-		[114,	"하식",	1658,	0,	null,	18,	19,	15,	0,	160,	300,	null,	null],		
-		[36,	"하안",	1659,	0,	null,	6,	14,	36,	0,	160,	300,	null,	null],		
-		[999,	"하후씨",	1660,	0,	null,	29,	8,	24,	0,	160,	300,	null,	null],		
-		[5,	"학맹",	1661,	0,	null,	47,	33,	21,	0,	160,	300,	null,	null],		
-		[98,	"한거자",	1662,	0,	null,	45,	30,	15,	0,	160,	300,	null,	null],		
-		[19,	"한덕",	1663,	0,	null,	49,	40,	12,	0,	160,	300,	null,	null],		
-		[140,	"한윤",	1664,	0,	null,	27,	12,	34,	0,	160,	300,	null,	null],		
-		[999,	"허소",	1665,	0,	null,	45,	14,	30,	0,	160,	300,	null,	null],		
-		[30,	"호열",	1666,	0,	null,	55,	35,	38,	0,	160,	300,	null,	null],		
-		[76,	"호제",	1667,	0,	null,	47,	21,	34,	0,	160,	300,	null,	null],		
-		[149,	"호진",	1668,	0,	null,	50,	39,	7,	0,	160,	300,	null,	null],		
-		[29,	"호질",	1669,	0,	null,	53,	25,	38,	0,	160,	300,	null,	null],		
-		[7,	"환계",	1670,	0,	null,	12,	13,	34,	0,	160,	300,	null,	null],		
-		[56,	"황숭",	1671,	0,	null,	51,	32,	37,	0,	160,	300,	null,	null],		
-		[999,	"황승언",	1672,	0,	null,	51,	9,	41,	0,	160,	300,	null,	null],		
-		[999,	"황월영",	1673,	0,	null,	47,	7,	38,	0,	160,	300,	null,	null],		
-		[45,	"황조",	1674,	0,	null,	54,	33,	29,	0,	160,	300,	null,	null],		
-		[48,	"후선",	1675,	0,	null,	46,	33,	18,	0,	160,	300,	null,	null],		
-		[8,	"휴고",	1676,	0,	null,	48,	36,	20,	0,	160,	300,	null,	null],		
-		[98,	"휴원진",	1677,	0,	null,	45,	32,	19,	0,	160,	300,	null,	null],		
-		[22,	"희지재",	1678,	0,	null,	24,	3,	43,	0,	160,	300,	null,	null]			
+    "general":[																												
+		[1,	"소제1",	1001,	0,	null,	20,	11,	42,	0,	160,	300,	"유지",	null],		
+		[1,	"헌제",	1002,	0,	null,	17,	13,	51,	0,	160,	300,	"안전",	null],		
+		[999,	"사마휘",	1003,	0,	null,	52,	11,	74,	0,	160,	300,	"은둔",	"신산",	"좋지, 좋아~"],
+		[999,	"우길",	1004,	0,	null,	17,	13,	65,	0,	160,	300,	"은둔",	"신산"],		
+		[999,	"화타",	1005,	0,	null,	45,	25,	57,	0,	160,	300,	"은둔",	"의술",	"아픈 사람들은 모두 내게 오시오. 껄껄껄."],
+		[999,	"길평",	1006,	0,	null,	27,	15,	58,	0,	160,	300,	"은둔",	"의술"],		
+		[29,	"가규",	1007,	0,	null,	46,	47,	59,	0,	160,	300,	"재간",	null],		
+		[136,	"가범",	1008,	0,	null,	47,	42,	59,	0,	160,	300,	"유지",	null],		
+		[49,	"가비능",	1009,	0,	null,	47,	65,	31,	0,	160,	300,	"정복",	null],		
+		[31,	"가충",	1010,	0,	null,	44,	25,	68,	0,	160,	300,	"출세",	null],		
+		[20,	"가후",	1011,	0,	null,	52,	30,	73,	0,	160,	300,	"할거",	"귀병"],		
+		[73,	"간옹",	1012,	0,	null,	31,	32,	57,	0,	160,	300,	"안전",	"경작"],		
+		[129,	"감녕",	1013,	0,	null,	55,	73,	57,	0,	160,	300,	"출세",	"무쌍"],		
+		[127,	"감택",	1014,	0,	null,	49,	39,	63,	0,	160,	300,	"유지",	null],		
+		[60,	"강단",	1015,	0,	null,	40,	59,	39,	0,	160,	300,	"재간",	null],		
+		[73,	"강유",	1016,	0,	null,	62,	70,	73,	0,	160,	300,	"왕좌",	"집중",	"갈고 닦은 무예와 승상께 배운 책략을 발휘해 보이겠다!"],
+		[102,	"고간",	1017,	0,	null,	48,	48,	44,	0,	160,	300,	"유지",	null],		
+		[27,	"고람",	1018,	0,	null,	53,	55,	49,	0,	160,	300,	"출세",	"기병"],		
+		[69,	"고상",	1019,	0,	null,	40,	37,	35,	0,	160,	300,	"재간",	null],		
+		[144,	"고순",	1020,	0,	null,	56,	65,	53,	0,	160,	300,	"의협",	"기병"],		
+		[7,	"고승",	1021,	0,	null,	41,	59,	24,	0,	160,	300,	"출세",	null],		
+		[120,	"고옹",	1022,	0,	null,	47,	21,	63,	0,	160,	300,	"출세",	null],		
+		[63,	"고정",	1023,	0,	null,	51,	53,	47,	0,	160,	300,	"정복",	null],		
+		[53,	"고패",	1024,	0,	null,	45,	47,	28,	0,	160,	300,	"유지",	null],		
+		[74,	"공도",	1025,	0,	null,	26,	59,	19,	0,	160,	300,	"재간",	null],		
+		[142,	"공손강",	1026,	0,	null,	50,	58,	51,	0,	160,	300,	"정복",	null],		
+		[142,	"공손공",	1027,	0,	null,	51,	37,	60,	0,	160,	300,	"정복",	null],		
+		[142,	"공손도",	1028,	0,	null,	49,	58,	37,	0,	160,	300,	"정복",	"기병"],		
+		[65,	"공손범",	1029,	0,	null,	48,	55,	51,	0,	160,	300,	"출세",	null],		
+		[65,	"공손속",	1030,	0,	null,	48,	61,	37,	0,	160,	300,	"정복",	null],		
+		[10,	"공손연",	1031,	0,	null,	54,	63,	53,	0,	160,	300,	"패권",	"돌격"],		
+		[65,	"공손월",	1032,	0,	null,	43,	52,	41,	0,	160,	300,	"정복",	null],		
+		[65,	"공손찬",	1033,	0,	null,	48,	68,	55,	0,	160,	300,	"패권",	"기병"],		
+		[43,	"공융",	1034,	0,	null,	49,	42,	67,	0,	160,	300,	"왕좌",	"경작"],		
+		[35,	"공주",	1035,	0,	null,	50,	33,	62,	0,	160,	300,	"재간",	null],		
+		[83,	"공지",	1036,	0,	null,	47,	46,	53,	0,	160,	300,	"대의",	null],		
+		[26,	"곽가",	1037,	0,	null,	43,	23,	76,	0,	160,	300,	"패권",	"귀모"],		
+		[111,	"곽도",	1038,	0,	null,	49,	55,	64,	0,	160,	300,	"재간",	null],		
+		[2,	"곽사",	1039,	0,	null,	47,	55,	31,	0,	160,	300,	"패권",	null],		
+		[80,	"곽유지",	1040,	0,	null,	37,	22,	57,	0,	160,	300,	"재간",	"상재"],		
+		[67,	"곽익",	1041,	0,	null,	51,	50,	55,	0,	160,	300,	"재간",	null],		
+		[67,	"곽준",	1042,	0,	null,	54,	56,	59,	0,	160,	300,	"출세",	null],		
+		[27,	"곽혁",	1043,	0,	null,	40,	29,	63,	0,	160,	300,	"안전",	null],		
+		[20,	"곽회",	1044,	0,	null,	55,	60,	57,	0,	160,	300,	"정복",	null],		
+		[39,	"관구검",	1045,	0,	null,	53,	55,	61,	0,	160,	300,	"대의",	null],		
+		[76,	"관색",	1046,	0,	null,	52,	67,	55,	0,	160,	300,	"의협",	"징병"],		
+		[76,	"관우",	1047,	0,	null,	62,	75,	63,	0,	160,	300,	"의협",	"위압",	"나의 청룡 언월도를 과연 막아낼 수 있겠소?"],
+		[76,	"관이",	1048,	0,	null,	43,	50,	49,	0,	160,	300,	"안전",	null],		
+		[76,	"관통",	1049,	0,	null,	44,	52,	50,	0,	160,	300,	"대의",	null],		
+		[76,	"관평",	1050,	0,	null,	55,	63,	57,	0,	160,	300,	"의협",	"보병"],		
+		[7,	"관해",	1051,	0,	null,	50,	70,	33,	0,	160,	300,	"출세",	null],		
+		[76,	"관흥",	1052,	0,	null,	52,	66,	58,	0,	160,	300,	"의협",	"돌격"],		
+		[40,	"괴량",	1053,	0,	null,	40,	28,	64,	0,	160,	300,	"안전",	"신중"],		
+		[40,	"괴월",	1054,	0,	null,	26,	30,	66,	0,	160,	300,	"유지",	"귀병"],		
+		[98,	"교모",	1055,	0,	null,	48,	49,	51,	0,	160,	300,	"안전",	null],		
+		[98,	"교현",	1056,	0,	null,	44,	18,	50,	0,	160,	300,	"재간",	null],		
+		[6,	"구역거",	1057,	0,	null,	44,	58,	43,	0,	160,	300,	"안전",	null],		
+		[80,	"극정",	1058,	0,	null,	38,	25,	60,	0,	160,	300,	"유지",	null],		
+		[46,	"금선",	1059,	0,	null,	46,	43,	34,	0,	160,	300,	"할거",	null],		
+		[62,	"금환삼결",	1060,	0,	null,	42,	61,	17,	0,	160,	300,	"출세",	null],		
+		[141,	"기령",	1061,	0,	null,	54,	64,	32,	0,	160,	300,	"대의",	"무쌍"],		
+		[122,	"낙통",	1062,	0,	null,	47,	39,	56,	0,	160,	300,	"유지",	null],		
+		[124,	"노숙1",	1063,	0,	null,	60,	38,	73,	0,	160,	300,	"왕좌",	"상재"],		
+		[75,	"노식",	1064,	0,	null,	60,	46,	63,	0,	160,	300,	"왕좌",	"징병"],		
+		[59,	"뇌동",	1065,	0,	null,	52,	61,	40,	0,	160,	300,	"출세",	"궁병"],		
+		[142,	"뇌박",	1066,	0,	null,	46,	46,	32,	0,	160,	300,	"유지",	null],		
+		[127,	"능조",	1067,	0,	null,	51,	63,	39,	0,	160,	300,	"재간",	"공성"],		
+		[127,	"능통",	1068,	0,	null,	52,	62,	49,	0,	160,	300,	"의협",	"궁병"],		
+		[64,	"단경",	1069,	0,	null,	51,	51,	55,	0,	160,	300,	"정복",	null],		
+		[132,	"담웅",	1070,	0,	null,	45,	61,	19,	0,	160,	300,	"출세",	null],		
+		[99,	"답둔",	1071,	0,	null,	48,	57,	31,	0,	160,	300,	"유지",	null],		
+		[132,	"당자",	1072,	0,	null,	48,	47,	40,	0,	160,	300,	"안전",	null],		
+		[60,	"대래동주",	1073,	0,	null,	40,	53,	24,	0,	160,	300,	"안전",	null],		
+		[82,	"도겸",	1074,	0,	null,	44,	31,	51,	0,	160,	300,	"할거",	"인덕"],		
+		[120,	"도준",	1075,	0,	null,	50,	48,	43,	0,	160,	300,	"안전",	null],		
+		[73,	"동궐",	1076,	0,	null,	50,	43,	61,	0,	160,	300,	"대의",	null],		
+		[62,	"동다나",	1077,	0,	null,	44,	57,	27,	0,	160,	300,	"유지",	null],		
+		[2,	"동민",	1078,	0,	null,	45,	53,	43,	0,	160,	300,	"안전",	null],		
+		[21,	"동소",	1079,	0,	null,	42,	41,	51,	0,	160,	300,	"패권",	null],		
+		[127,	"동습",	1080,	0,	null,	45,	53,	31,	0,	160,	300,	"출세",	null],		
+		[89,	"동승",	1081,	0,	null,	54,	54,	53,	0,	160,	300,	"왕좌",	null],		
+		[78,	"동윤",	1082,	0,	null,	50,	26,	62,	0,	160,	300,	"왕좌",	null],		
+		[2,	"동탁",	1083,	0,	null,	59,	71,	46,	0,	160,	300,	"패권",	"기병"],		
+		[66,	"동화",	1084,	0,	null,	43,	53,	45,	0,	160,	300,	"대의",	null],		
+		[32,	"두예",	1085,	0,	null,	59,	63,	66,	0,	160,	300,	"정복",	null],		
+		[7,	"등무",	1086,	0,	null,	41,	59,	19,	0,	160,	300,	"정복",	null],		
+		[41,	"등애",	1087,	0,	null,	62,	65,	71,	0,	160,	300,	"패권",	"신산"],		
+		[116,	"등윤",	1088,	0,	null,	34,	38,	55,	0,	160,	300,	"안전",	null],		
+		[73,	"등지",	1089,	0,	null,	54,	44,	63,	0,	160,	300,	"할거",	"경작"],		
+		[41,	"등충",	1090,	0,	null,	48,	65,	47,	0,	160,	300,	"출세",	null],		
+		[54,	"등현",	1091,	0,	null,	50,	49,	51,	0,	160,	300,	"출세",	null],		
+		[29,	"마균",	1092,	0,	null,	33,	35,	63,	0,	160,	300,	"안전",	null],		
+		[71,	"마대",	1093,	0,	null,	55,	63,	43,	0,	160,	300,	"대의",	"기병"],		
+		[70,	"마등",	1094,	0,	null,	56,	68,	47,	0,	160,	300,	"왕좌",	"기병"],		
+		[80,	"마속",	1095,	0,	null,	53,	53,	65,	0,	160,	300,	"패권",	"집중"],		
+		[77,	"마량",	1096,	0,	null,	47,	25,	68,	0,	160,	300,	"왕좌",	null],		
+		[48,	"마완",	1097,	0,	null,	44,	53,	26,	0,	160,	300,	"안전",	"기병"],		
+		[19,	"마준",	1098,	0,	null,	42,	52,	51,	0,	160,	300,	"안전",	null],		
+		[71,	"마철",	1099,	0,	null,	52,	50,	31,	0,	160,	300,	"대의",	"기병"],		
+		[70,	"마초",	1100,	0,	null,	55,	75,	37,	0,	160,	300,	"대의",	"기병",	"금마초 나가신닷!"],
+		[131,	"마충1",	1101,	0,	null,	51,	51,	44,	0,	160,	300,	"재간",	null],		
+		[69,	"마충2",	1102,	0,	null,	48,	55,	44,	0,	160,	300,	"출세",	null],		
+		[71,	"마휴",	1103,	0,	null,	52,	50,	31,	0,	160,	300,	"대의",	"기병"],		
+		[116,	"만총",	1104,	0,	null,	56,	37,	62,	0,	160,	300,	"할거",	"신중"],		
+		[51,	"망아장",	1105,	0,	null,	29,	53,	20,	0,	160,	300,	"출세",	null],		
+		[44,	"맹달",	1106,	0,	null,	52,	54,	58,	0,	160,	300,	"할거",	"귀병"],		
+		[60,	"맹우",	1107,	0,	null,	49,	63,	26,	0,	160,	300,	"정복",	null],		
+		[60,	"맹획",	1108,	0,	null,	55,	71,	43,	0,	160,	300,	"왕좌",	"격노"],		
+		[29,	"모개",	1109,	0,	null,	42,	47,	47,	0,	160,	300,	"대의",	null],		
+		[51,	"목록대왕",	1110,	0,	null,	47,	57,	53,	0,	160,	300,	"재간",	"척사"],		
+		[96,	"목순",	1111,	0,	null,	17,	21,	55,	0,	160,	300,	"왕좌",	null],		
+		[43,	"무안국",	1112,	0,	null,	44,	59,	18,	0,	160,	300,	"재간",	null],		
+		[28,	"문빙",	1113,	0,	null,	52,	61,	39,	0,	160,	300,	"유지",	null],		
+		[38,	"문앙",	1114,	0,	null,	52,	71,	41,	0,	160,	300,	"대의",	null],		
+		[102,	"문추",	1115,	0,	null,	53,	73,	25,	0,	160,	300,	"출세",	"무쌍"],		
+		[38,	"문흠",	1116,	0,	null,	54,	61,	39,	0,	160,	300,	"대의",	null],		
+		[49,	"미당대왕",	1117,	0,	null,	50,	60,	31,	0,	160,	300,	"유지",	null],		
+		[108,	"미방",	1118,	0,	null,	47,	53,	35,	0,	160,	300,	"패권",	"징병"],		
+		[77,	"미축",	1119,	0,	null,	26,	30,	53,	0,	160,	300,	"왕좌",	"상재"],		
+		[94,	"반봉",	1120,	0,	null,	48,	60,	17,	0,	160,	300,	"출세",	null],		
+		[44,	"반준",	1121,	0,	null,	40,	21,	55,	0,	160,	300,	"안전",	null],		
+		[65,	"방덕",	1122,	0,	null,	54,	70,	55,	0,	160,	300,	"의협",	"기병"],		
+		[73,	"방통",	1123,	0,	null,	58,	37,	75,	0,	160,	300,	"패권",	"반계"],		
+		[65,	"방회",	1124,	0,	null,	25,	32,	49,	0,	160,	300,	"안전",	null],		
+		[68,	"배원소",	1125,	0,	null,	42,	56,	32,	0,	160,	300,	"재간",	null],		
+		[78,	"번건",	1126,	0,	null,	28,	31,	55,	0,	160,	300,	"대의",	null],		
+		[149,	"번주",	1127,	0,	null,	51,	61,	21,	0,	160,	300,	"할거",	null],		
+		[72,	"법정",	1128,	0,	null,	56,	29,	72,	0,	160,	300,	"패권",	"신산"],		
+		[8,	"변희",	1129,	0,	null,	50,	53,	27,	0,	160,	300,	"안전",	null],		
+		[121,	"보질",	1130,	0,	null,	47,	28,	61,	0,	160,	300,	"유지",	null],		
+		[113,	"복양흥",	1131,	0,	null,	47,	44,	57,	0,	160,	300,	"유지",	null],		
+		[110,	"봉기",	1132,	0,	null,	51,	45,	63,	0,	160,	300,	"패권",	"집중"],		
+		[74,	"부동",	1133,	0,	null,	47,	56,	56,	0,	160,	300,	"대의",	null],		
+		[108,	"부사인",	1134,	0,	null,	46,	49,	44,	0,	160,	300,	"출세",	null],		
+		[38,	"부손",	1135,	0,	null,	24,	39,	55,	0,	160,	300,	"안전",	null],		
+		[74,	"부첨",	1136,	0,	null,	48,	59,	40,	0,	160,	300,	"대의",	null],		
+		[66,	"비시",	1137,	0,	null,	18,	34,	51,	0,	160,	300,	"재간",	null],		
+		[141,	"비연",	1138,	0,	null,	50,	53,	45,	0,	160,	300,	"출세",	null],		
+		[77,	"비위",	1139,	0,	null,	53,	26,	59,	0,	160,	300,	"대의",	null],		
+		[144,	"사광",	1140,	0,	null,	47,	43,	54,	0,	160,	300,	"안전",	null],		
+		[71,	"사마가",	1141,	0,	null,	48,	67,	18,	0,	160,	300,	"정복",	"돌격"],		
+		[20,	"사마랑",	1142,	0,	null,	25,	31,	52,	0,	160,	300,	"대의",	null],		
+		[24,	"사마망",	1143,	0,	null,	52,	51,	53,	0,	160,	300,	"정복",	null],		
+		[24,	"사마부",	1144,	0,	null,	46,	31,	59,	0,	160,	300,	"대의",	null],		
+		[31,	"사마사",	1145,	0,	null,	59,	53,	71,	0,	160,	300,	"정복",	null],		
+		[31,	"사마소",	1146,	0,	null,	61,	52,	66,	0,	160,	300,	"정복",	null],		
+		[31,	"사마염",	1147,	0,	null,	61,	62,	58,	0,	160,	300,	"패권",	null],		
+		[30,	"사마유",	1148,	0,	null,	49,	40,	63,	0,	160,	300,	"왕좌",	null],		
+		[31,	"사마의",	1149,	0,	null,	63,	55,	75,	0,	160,	300,	"패권",	"반계"],		
+		[139,	"사섭",	1150,	0,	null,	49,	51,	57,	0,	160,	300,	"안전",	null],		
+		[139,	"사일",	1151,	0,	null,	48,	39,	55,	0,	160,	300,	"유지",	null],		
+		[132,	"사정",	1152,	0,	null,	51,	57,	20,	0,	160,	300,	"안전",	null],		
+		[146,	"사지",	1153,	0,	null,	48,	43,	57,	0,	160,	300,	"안전",	null],		
+		[144,	"사휘",	1154,	0,	null,	51,	57,	51,	0,	160,	300,	"유지",	null],		
+		[35,	"서막",	1155,	0,	null,	46,	37,	58,	0,	160,	300,	"유지",	null],		
+		[76,	"서서",	1156,	0,	null,	60,	57,	74,	0,	160,	300,	"의협",	"귀병"],		
+		[124,	"서성",	1157,	0,	null,	57,	61,	65,	0,	160,	300,	"대의",	null],		
+		[142,	"서영",	1158,	0,	null,	43,	52,	32,	0,	160,	300,	"안전",	null],		
+		[23,	"서질",	1159,	0,	null,	46,	59,	33,	0,	160,	300,	"재간",	null],		
+		[23,	"서황",	1160,	0,	null,	56,	69,	55,	0,	160,	300,	"의협",	"필살"],		
+		[32,	"석포",	1161,	0,	null,	52,	52,	49,	0,	160,	300,	"정복",	null],		
+		[131,	"설영",	1162,	0,	null,	42,	23,	53,	0,	160,	300,	"유지",	null],		
+		[128,	"설종",	1163,	0,	null,	27,	32,	55,	0,	160,	300,	"유지",	null],		
+		[69,	"성의",	1164,	0,	null,	42,	53,	22,	0,	160,	300,	"재간",	null],		
+		[129,	"소비",	1165,	0,	null,	51,	52,	43,	0,	160,	300,	"대의",	null],		
+		[76,	"손건",	1166,	0,	null,	41,	32,	59,	0,	160,	300,	"대의",	"거상"],		
+		[125,	"손견",	1167,	0,	null,	62,	73,	61,	0,	160,	300,	"왕좌",	"무쌍"],		
+		[126,	"손광",	1168,	0,	null,	49,	46,	49,	0,	160,	300,	"유지",	null],		
+		[125,	"손권",	1169,	0,	null,	60,	61,	65,	0,	160,	300,	"할거",	"수비"],		
+		[126,	"손랑",	1170,	0,	null,	27,	46,	28,	0,	160,	300,	"안전",	null],		
+		[126,	"손등",	1171,	0,	null,	45,	36,	61,	0,	160,	300,	"할거",	null],		
+		[125,	"손량",	1172,	0,	null,	24,	23,	63,	0,	160,	300,	"할거",	null],		
+		[20,	"손례",	1173,	0,	null,	50,	53,	56,	0,	160,	300,	"안전",	null],		
+		[124,	"손소",	1174,	0,	null,	54,	63,	55,	0,	160,	300,	"정복",	null],		
+		[130,	"손수",	1175,	0,	null,	51,	48,	49,	0,	160,	300,	"안전",	null],		
+		[126,	"손유",	1176,	0,	null,	55,	50,	55,	0,	160,	300,	"정복",	null],		
+		[122,	"손이",	1177,	0,	null,	47,	51,	48,	0,	160,	300,	"안전",	null],		
+		[126,	"손정",	1178,	0,	null,	48,	47,	51,	0,	160,	300,	"유지",	null],		
+		[115,	"손준",	1179,	0,	null,	48,	56,	44,	0,	160,	300,	"정복",	null],		
+		[7,	"손중",	1180,	0,	null,	45,	52,	24,	0,	160,	300,	"안전",	null],		
+		[125,	"손책",	1181,	0,	null,	62,	74,	62,	0,	160,	300,	"패권",	"필살",	"소패왕 손책이 나가신다! 길을 비켜라!"],
+		[115,	"손침",	1182,	0,	null,	44,	57,	37,	0,	160,	300,	"패권",	null],		
+		[114,	"손호",	1183,	0,	null,	20,	62,	55,	0,	160,	300,	"패권",	null],		
+		[126,	"손화",	1184,	0,	null,	35,	25,	57,	0,	160,	300,	"왕좌",	null],		
+		[127,	"손환",	1185,	0,	null,	56,	53,	57,	0,	160,	300,	"정복",	null],		
+		[126,	"손휴",	1186,	0,	null,	49,	39,	53,	0,	160,	300,	"정복",	null],		
+		[117,	"손흠",	1187,	0,	null,	50,	52,	32,	0,	160,	300,	"정복",	null],		
+		[147,	"송헌",	1188,	0,	null,	41,	52,	37,	0,	160,	300,	"안전",	null],		
+		[95,	"순우경",	1189,	0,	null,	53,	55,	50,	0,	160,	300,	"할거",	null],		
+		[22,	"순욱1",	1190,	0,	null,	46,	29,	75,	0,	160,	300,	"왕좌",	"집중"],		
+		[22,	"순유",	1191,	0,	null,	53,	37,	70,	0,	160,	300,	"대의",	"신중"],		
+		[29,	"신비",	1192,	0,	null,	43,	28,	59,	0,	160,	300,	"재간",	null],		
+		[37,	"신의",	1193,	0,	null,	46,	51,	44,	0,	160,	300,	"출세",	null],		
+		[37,	"신탐",	1194,	0,	null,	46,	49,	48,	0,	160,	300,	"출세",	null],		
+		[85,	"신평",	1195,	0,	null,	51,	44,	60,	0,	160,	300,	"왕좌",	null],		
+		[102,	"심배",	1196,	0,	null,	54,	54,	55,	0,	160,	300,	"패권",	"귀병"],		
+		[126,	"심영",	1197,	0,	null,	45,	58,	44,	0,	160,	300,	"재간",	null],		
+		[47,	"아하소과",	1198,	0,	null,	45,	60,	15,	0,	160,	300,	"안전",	"척사"],		
+		[62,	"아회남",	1199,	0,	null,	44,	59,	30,	0,	160,	300,	"출세",	"척사"],		
+		[23,	"악진",	1200,	0,	null,	53,	55,	47,	0,	160,	300,	"대의",	"돌격"],		
+		[23,	"악침",	1201,	0,	null,	42,	45,	32,	0,	160,	300,	"대의",	null],		
+		[63,	"악환",	1202,	0,	null,	46,	65,	47,	0,	160,	300,	"재간",	null],		
+		[102,	"안량",	1203,	0,	null,	53,	72,	34,	0,	160,	300,	"출세",	"위압"],		
+		[14,	"양백",	1204,	0,	null,	46,	46,	45,	0,	160,	300,	"안전",	null],		
+		[92,	"양봉1",	1205,	0,	null,	47,	53,	34,	0,	160,	300,	"유지",	null],		
+		[91,	"양봉2",	1206,	0,	null,	49,	62,	51,	0,	160,	300,	"정복",	null],		
+		[13,	"양송",	1207,	0,	null,	15,	33,	33,	0,	160,	300,	"안전",	null],		
+		[43,	"양수",	1208,	0,	null,	18,	31,	71,	0,	160,	300,	"재간",	"귀병"],		
+		[61,	"양의",	1209,	0,	null,	51,	47,	57,	0,	160,	300,	"유지",	null],		
+		[141,	"양조1",	1210,	0,	null,	51,	46,	50,	0,	160,	300,	"출세",	null],		
+		[9,	"양추1",	1211,	0,	null,	44,	55,	16,	0,	160,	300,	"정복",	null],		
+		[31,	"양호",	1212,	0,	null,	60,	56,	63,	0,	160,	300,	"패권",	null],		
+		[53,	"양회",	1213,	0,	null,	48,	55,	37,	0,	160,	300,	"출세",	null],		
+		[141,	"양흥",	1214,	0,	null,	45,	55,	17,	0,	160,	300,	"안전",	null],		
+		[6,	"어부라",	1215,	0,	null,	55,	63,	51,	0,	160,	300,	"정복",	null],		
+		[64,	"엄강",	1216,	0,	null,	47,	53,	39,	0,	160,	300,	"재간",	null],		
+		[10,	"엄백호",	1217,	0,	null,	43,	55,	30,	0,	160,	300,	"할거",	null],		
+		[10,	"엄여",	1218,	0,	null,	35,	54,	24,	0,	160,	300,	"할거",	null],		
+		[69,	"엄안",	1219,	0,	null,	53,	66,	55,	0,	160,	300,	"왕좌",	null],		
+		[7,	"엄정",	1220,	0,	null,	31,	55,	43,	0,	160,	300,	"출세",	null],		
+		[121,	"엄준",	1221,	0,	null,	42,	24,	57,	0,	160,	300,	"재간",	null],		
+		[71,	"여개",	1222,	0,	null,	44,	38,	55,	0,	160,	300,	"유지",	null],		
+		[29,	"여건",	1223,	0,	null,	42,	55,	29,	0,	160,	300,	"출세",	null],		
+		[107,	"여광",	1224,	0,	null,	48,	55,	27,	0,	160,	300,	"유지",	null],		
+		[124,	"여몽",	1225,	0,	null,	61,	62,	72,	0,	160,	300,	"패권",	"궁병"],		
+		[123,	"여범",	1226,	0,	null,	41,	33,	57,	0,	160,	300,	"할거",	null],		
+		[107,	"여상",	1227,	0,	null,	49,	55,	26,	0,	160,	300,	"유지",	null],		
+		[105,	"여위황",	1228,	0,	null,	41,	51,	35,	0,	160,	300,	"정복",	null],		
+		[145,	"여포",	1229,	0,	null,	54,	77,	29,	0,	160,	300,	"패권",	"돌격",	"다 죽여버리겠다! 으하하."],
+		[50,	"염우",	1230,	0,	null,	47,	44,	18,	0,	160,	300,	"출세",	null],		
+		[40,	"염유",	1231,	0,	null,	48,	60,	44,	0,	160,	300,	"출세",	null],		
+		[18,	"염포",	1232,	0,	null,	33,	33,	61,	0,	160,	300,	"유지",	null],		
+		[40,	"예형",	1233,	0,	null,	55,	31,	73,	0,	160,	300,	"은둔",	"통찰"],		
+		[133,	"오강",	1234,	0,	null,	43,	35,	51,	0,	160,	300,	"안전",	null],		
+		[59,	"오란",	1235,	0,	null,	51,	60,	38,	0,	160,	300,	"재간",	null],		
+		[72,	"오반",	1236,	0,	null,	52,	54,	40,	0,	160,	300,	"재간",	null],		
+		[128,	"오언",	1237,	0,	null,	52,	50,	45,	0,	160,	300,	"재간",	null],		
+		[126,	"오연",	1238,	0,	null,	36,	57,	31,	0,	160,	300,	"정복",	null],		
+		[69,	"오의",	1239,	0,	null,	54,	58,	59,	0,	160,	300,	"유지",	null],		
+		[19,	"오질",	1240,	0,	null,	41,	35,	56,	0,	160,	300,	"출세",	null],		
+		[51,	"올돌골",	1241,	0,	null,	55,	71,	15,	0,	160,	300,	"출세",	"척사"],		
+		[52,	"옹개",	1242,	0,	null,	47,	55,	44,	0,	160,	300,	"안전",	null],		
+		[20,	"왕경",	1243,	0,	null,	46,	41,	53,	0,	160,	300,	"재간",	null],		
+		[97,	"왕광",	1244,	0,	null,	53,	55,	46,	0,	160,	300,	"유지",	null],		
+		[30,	"왕기1",	1245,	0,	null,	54,	51,	57,	0,	160,	300,	"유지",	null],		
+		[34,	"왕랑",	1246,	0,	null,	44,	29,	44,	0,	160,	300,	"할거",	null],		
+		[57,	"왕루",	1247,	0,	null,	40,	28,	61,	0,	160,	300,	"유지",	null],		
+		[76,	"왕보",	1248,	0,	null,	43,	33,	60,	0,	160,	300,	"대의",	null],		
+		[86,	"왕수",	1249,	0,	null,	34,	33,	55,	0,	160,	300,	"재간",	null],		
+		[26,	"왕쌍",	1250,	0,	null,	47,	69,	15,	0,	160,	300,	"정복",	"보병"],		
+		[46,	"왕위",	1251,	0,	null,	48,	50,	55,	0,	160,	300,	"안전",	null],		
+		[92,	"왕윤",	1252,	0,	null,	16,	18,	61,	0,	160,	300,	"왕좌",	null],		
+		[40,	"왕융",	1253,	0,	null,	49,	37,	61,	0,	160,	300,	"재간",	null],		
+		[32,	"왕준",	1254,	0,	null,	56,	65,	61,	0,	160,	300,	"대의",	null],		
+		[30,	"왕찬",	1255,	0,	null,	28,	28,	62,	0,	160,	300,	"안전",	null],		
+		[33,	"왕창",	1256,	0,	null,	54,	48,	45,	0,	160,	300,	"정복",	null],		
+		[69,	"왕평",	1257,	0,	null,	55,	61,	57,	0,	160,	300,	"재간",	null],		
+		[71,	"왕항",	1258,	0,	null,	44,	39,	50,	0,	160,	300,	"대의",	null],		
+		[33,	"왕혼",	1259,	0,	null,	52,	31,	49,	0,	160,	300,	"정복",	null],		
+		[71,	"요립",	1260,	0,	null,	50,	37,	66,	0,	160,	300,	"출세",	null],		
+		[74,	"요화",	1261,	0,	null,	51,	49,	50,	0,	160,	300,	"의협",	null],		
+		[22,	"우금1",	1262,	0,	null,	56,	59,	57,	0,	160,	300,	"정복",	null],		
+		[27,	"우금2",	1263,	0,	null,	49,	61,	35,	0,	160,	300,	"대의",	null],		
+		[122,	"우번",	1264,	0,	null,	23,	38,	59,	0,	160,	300,	"유지",	null],		
+		[126,	"우전",	1265,	0,	null,	49,	47,	37,	0,	160,	300,	"안전",	null],		
+		[86,	"원담",	1266,	0,	null,	51,	49,	47,	0,	160,	300,	"왕좌",	null],		
+		[101,	"원상",	1267,	0,	null,	46,	58,	55,	0,	160,	300,	"패권",	null],		
+		[101,	"원소",	1268,	0,	null,	58,	55,	61,	0,	160,	300,	"패권",	"위압"],		
+		[140,	"원술",	1269,	0,	null,	55,	49,	57,	0,	160,	300,	"패권",	"축성"],		
+		[140,	"원윤",	1270,	0,	null,	40,	33,	50,	0,	160,	300,	"패권",	null],		
+		[101,	"원희",	1271,	0,	null,	52,	48,	58,	0,	160,	300,	"할거",	null],		
+		[131,	"위소",	1272,	0,	null,	39,	24,	65,	0,	160,	300,	"재간",	null],		
+		[147,	"위속",	1273,	0,	null,	47,	49,	37,	0,	160,	300,	"안전",	null],		
+		[81,	"위연",	1274,	0,	null,	55,	73,	51,	0,	160,	300,	"패권",	"보병"],		
+		[96,	"위유",	1275,	0,	null,	45,	56,	57,	0,	160,	300,	"재간",	null],		
+		[76,	"유기",	1276,	0,	null,	47,	19,	59,	0,	160,	300,	"왕좌",	null],		
+		[36,	"유대",	1277,	0,	null,	48,	48,	51,	0,	160,	300,	"재간",	null],		
+		[134,	"유도",	1278,	0,	null,	35,	32,	55,	0,	160,	300,	"재간",	null],		
+		[46,	"유벽",	1279,	0,	null,	49,	57,	23,	0,	160,	300,	"출세",	null],		
+		[75,	"유봉",	1280,	0,	null,	48,	53,	51,	0,	160,	300,	"출세",	null],		
+		[75,	"유비",	1281,	0,	null,	58,	60,	57,	0,	160,	300,	"왕좌",	"인덕"],		
+		[75,	"유선1",	1282,	0,	null,	24,	17,	21,	0,	160,	300,	"대의",	null],		
+		[55,	"유순",	1283,	0,	null,	51,	51,	46,	0,	160,	300,	"출세",	null],		
+		[75,	"유심",	1284,	0,	null,	49,	41,	57,	0,	160,	300,	"왕좌",	null],		
+		[129,	"유약",	1285,	0,	null,	51,	52,	51,	0,	160,	300,	"유지",	null],		
+		[55,	"유언",	1286,	0,	null,	48,	37,	59,	0,	160,	300,	"할거",	null],		
+		[27,	"유엽",	1287,	0,	null,	40,	29,	63,	0,	160,	300,	"유지",	null],		
+		[11,	"유요",	1288,	0,	null,	23,	22,	42,	0,	160,	300,	"안전",	"발명"],		
+		[96,	"유우",	1289,	0,	null,	51,	33,	58,	0,	160,	300,	"왕좌",	null],		
+		[55,	"유장",	1290,	0,	null,	38,	31,	52,	0,	160,	300,	"할거",	"수비"],		
+		[45,	"유종",	1291,	0,	null,	22,	26,	51,	0,	160,	300,	"할거",	null],		
+		[56,	"유파",	1292,	0,	null,	43,	31,	57,	0,	160,	300,	"대의",	null],		
+		[45,	"유표1",	1293,	0,	null,	52,	48,	57,	0,	160,	300,	"할거",	null],		
+		[27,	"유표2",	1294,	0,	null,	54,	47,	57,	0,	160,	300,	"안전",	null],		
+		[134,	"유현",	1295,	0,	null,	32,	47,	47,	0,	160,	300,	"안전",	null],		
+		[122,	"육개",	1296,	0,	null,	50,	30,	58,	0,	160,	300,	"재간",	null],		
+		[122,	"육손",	1297,	0,	null,	63,	55,	75,	0,	160,	300,	"왕좌",	"귀병"],		
+		[121,	"육적",	1298,	0,	null,	42,	29,	59,	0,	160,	300,	"안전",	null],		
+		[122,	"육항",	1299,	0,	null,	62,	56,	73,	0,	160,	300,	"왕좌",	null],		
+		[38,	"윤대목",	1300,	0,	null,	49,	43,	56,	0,	160,	300,	"재간",	null],		
+		[80,	"윤묵",	1301,	0,	null,	19,	28,	59,	0,	160,	300,	"대의",	null],		
+		[72,	"윤상",	1302,	0,	null,	30,	31,	38,	0,	160,	300,	"대의",	null],		
+		[136,	"윤직",	1303,	0,	null,	42,	49,	52,	0,	160,	300,	"재간",	null],		
+		[2,	"이각",	1304,	0,	null,	46,	61,	39,	0,	160,	300,	"패권",	null],		
+		[146,	"이숙",	1305,	0,	null,	27,	40,	55,	0,	160,	300,	"재간",	null],		
+		[71,	"이엄",	1306,	0,	null,	56,	66,	64,	0,	160,	300,	"패권",	null],		
+		[2,	"이유",	1307,	0,	null,	50,	22,	70,	0,	160,	300,	"패권",	"귀모"],		
+		[132,	"이이",	1308,	0,	null,	46,	60,	20,	0,	160,	300,	"정복",	null],		
+		[77,	"이적",	1309,	0,	null,	46,	27,	61,	0,	160,	300,	"할거",	null],		
+		[22,	"이전",	1310,	0,	null,	54,	55,	65,	0,	160,	300,	"왕좌",	null],		
+		[71,	"이풍1",	1311,	0,	null,	48,	47,	51,	0,	160,	300,	"재간",	null],		
+		[66,	"이회",	1312,	0,	null,	51,	43,	63,	0,	160,	300,	"유지",	null],		
+		[114,	"잠혼",	1313,	0,	null,	15,	16,	39,	0,	160,	300,	"할거",	null],		
+		[7,	"장각",	1314,	0,	null,	61,	25,	72,	0,	160,	300,	"패권",	"환술"],		
+		[34,	"장간",	1315,	0,	null,	19,	20,	57,	0,	160,	300,	"재간",	null],		
+		[7,	"장개",	1316,	0,	null,	43,	56,	19,	0,	160,	300,	"안전",	null],		
+		[122,	"장굉",	1317,	0,	null,	25,	21,	67,	0,	160,	300,	"왕좌",	null],		
+		[7,	"장량",	1318,	0,	null,	51,	64,	55,	0,	160,	300,	"정복",	"환술"],		
+		[15,	"장로",	1319,	0,	null,	54,	39,	63,	0,	160,	300,	"유지",	"축성"],		
+		[23,	"장료",	1320,	0,	null,	60,	72,	65,	0,	160,	300,	"의협",	"견고"],		
+		[7,	"장보",	1321,	0,	null,	55,	64,	61,	0,	160,	300,	"패권",	"환술"],		
+		[76,	"장비",	1322,	0,	null,	56,	76,	42,	0,	160,	300,	"의협",	"무쌍",	"어쭈. 해보자 이거냐?"],
+		[62,	"장서",	1323,	0,	null,	42,	42,	33,	0,	160,	300,	"출세",	null],		
+		[120,	"장소1",	1324,	0,	null,	41,	24,	71,	0,	160,	300,	"안전",	null],		
+		[78,	"장소2",	1325,	0,	null,	44,	39,	57,	0,	160,	300,	"재간",	null],		
+		[72,	"장송",	1326,	0,	null,	44,	28,	72,	0,	160,	300,	"할거",	"통찰"],		
+		[148,	"장수",	1327,	0,	null,	52,	58,	56,	0,	160,	300,	"할거",	null],		
+		[145,	"장양1",	1328,	0,	null,	49,	54,	53,	0,	160,	300,	"출세",	null],		
+		[8,	"장연",	1329,	0,	null,	55,	54,	41,	0,	160,	300,	"안전",	null],		
+		[11,	"장영",	1330,	0,	null,	46,	53,	37,	0,	160,	300,	"재간",	null],		
+		[118,	"장온",	1331,	0,	null,	21,	30,	56,	0,	160,	300,	"할거",	null],		
+		[78,	"장완",	1332,	0,	null,	52,	47,	67,	0,	160,	300,	"할거",	"상재"],		
+		[15,	"장위",	1333,	0,	null,	50,	57,	29,	0,	160,	300,	"대의",	null],		
+		[36,	"장윤",	1334,	0,	null,	51,	49,	50,	0,	160,	300,	"정복",	null],		
+		[104,	"장의거",	1335,	0,	null,	51,	49,	33,	0,	160,	300,	"대의",	null],		
+		[68,	"장익",	1336,	0,	null,	54,	55,	52,	0,	160,	300,	"유지",	null],		
+		[56,	"장임",	1337,	0,	null,	57,	65,	59,	0,	160,	300,	"대의",	"견고"],		
+		[148,	"장제1",	1338,	0,	null,	52,	53,	49,	0,	160,	300,	"할거",	null],		
+		[32,	"장제2",	1339,	0,	null,	30,	32,	66,	0,	160,	300,	"유지",	null],		
+		[126,	"장제3",	1340,	0,	null,	54,	43,	51,	0,	160,	300,	"할거",	null],		
+		[17,	"장패",	1341,	0,	null,	42,	62,	39,	0,	160,	300,	"할거",	null],		
+		[76,	"장포1",	1342,	0,	null,	52,	67,	43,	0,	160,	300,	"재간",	"징병"],		
+		[113,	"장포2",	1343,	0,	null,	49,	54,	44,	0,	160,	300,	"유지",	null],		
+		[27,	"장합",	1344,	0,	null,	57,	71,	52,	0,	160,	300,	"출세",	"궁병"],		
+		[23,	"장호",	1345,	0,	null,	46,	51,	46,	0,	160,	300,	"정복",	null],		
+		[31,	"장화",	1346,	0,	null,	44,	24,	67,	0,	160,	300,	"유지",	null],		
+		[48,	"장횡",	1347,	0,	null,	45,	55,	25,	0,	160,	300,	"재간",	null],		
+		[141,	"장훈",	1348,	0,	null,	51,	51,	50,	0,	160,	300,	"안전",	null],		
+		[120,	"장휴",	1349,	0,	null,	41,	33,	57,	0,	160,	300,	"재간",	null],		
+		[126,	"장흠",	1350,	0,	null,	50,	54,	55,	0,	160,	300,	"대의",	"저격"],		
+		[96,	"저수",	1351,	0,	null,	57,	46,	69,	0,	160,	300,	"할거",	"반계"],		
+		[130,	"전단",	1352,	0,	null,	50,	59,	51,	0,	160,	300,	"출세",	null],		
+		[42,	"전속",	1353,	0,	null,	50,	48,	43,	0,	160,	300,	"안전",	null],		
+		[26,	"전위1",	1354,	0,	null,	48,	74,	33,	0,	160,	300,	"의협",	"필살"],		
+		[130,	"전위2",	1355,	0,	null,	54,	56,	51,	0,	160,	300,	"출세",	null],		
+		[128,	"전종",	1356,	0,	null,	56,	61,	59,	0,	160,	300,	"패권",	null],		
+		[42,	"전주",	1357,	0,	null,	52,	55,	44,	0,	160,	300,	"의협",	null],		
+		[96,	"전풍",	1358,	0,	null,	56,	37,	74,	0,	160,	300,	"왕좌",	null],		
+		[24,	"정무",	1359,	0,	null,	46,	35,	59,	0,	160,	300,	"출세",	null],		
+		[119,	"정병",	1360,	0,	null,	22,	25,	55,	0,	160,	300,	"유지",	null],		
+		[126,	"정보",	1361,	0,	null,	56,	53,	61,	0,	160,	300,	"패권",	null],		
+		[123,	"정봉1",	1362,	0,	null,	52,	61,	53,	0,	160,	300,	"패권",	null],		
+		[24,	"정욱",	1363,	0,	null,	56,	36,	70,	0,	160,	300,	"패권",	"신중"],		
+		[88,	"정원",	1364,	0,	null,	50,	61,	49,	0,	160,	300,	"왕좌",	"기병"],		
+		[7,	"정원지",	1365,	0,	null,	40,	59,	35,	0,	160,	300,	"출세",	null],		
+		[69,	"정은",	1366,	0,	null,	45,	51,	26,	0,	160,	300,	"재간",	null],		
+		[121,	"제갈각",	1367,	0,	null,	48,	45,	71,	0,	160,	300,	"왕좌",	null],		
+		[76,	"제갈균",	1368,	0,	null,	48,	40,	59,	0,	160,	300,	"안전",	"상재"],		
+		[121,	"제갈근",	1369,	0,	null,	48,	38,	69,	0,	160,	300,	"왕좌",	"경작"],		
+		[76,	"제갈량",	1370,	0,	null,	63,	47,	77,	0,	160,	300,	"왕좌",	"집중",	"슬슬 나의 지모를 발휘해 보겠습니다..."],
+		[76,	"제갈상",	1371,	0,	null,	45,	60,	57,	0,	160,	300,	"대의",	null],		
+		[135,	"제갈정",	1372,	0,	null,	46,	48,	46,	0,	160,	300,	"안전",	null],		
+		[76,	"제갈첨",	1373,	0,	null,	53,	45,	61,	0,	160,	300,	"대의",	null],		
+		[135,	"제갈탄",	1374,	0,	null,	56,	63,	59,	0,	160,	300,	"패권",	null],		
+		[76,	"조광",	1375,	0,	null,	50,	55,	46,	0,	160,	300,	"재간",	null],		
+		[74,	"조루",	1376,	0,	null,	44,	35,	50,	0,	160,	300,	"대의",	null],		
+		[24,	"조모",	1377,	0,	null,	45,	31,	30,	0,	160,	300,	"할거",	null],		
+		[127,	"조무",	1378,	0,	null,	52,	55,	57,	0,	160,	300,	"의협",	null],		
+		[26,	"조방",	1379,	0,	null,	44,	20,	31,	0,	160,	300,	"정복",	null],		
+		[83,	"조범",	1380,	0,	null,	47,	37,	52,	0,	160,	300,	"유지",	null],		
+		[26,	"조비",	1381,	0,	null,	53,	56,	60,	0,	160,	300,	"패권",	"징병"],		
+		[19,	"조상",	1382,	0,	null,	51,	51,	31,	0,	160,	300,	"패권",	null],		
+		[147,	"조성",	1383,	0,	null,	42,	56,	44,	0,	160,	300,	"안전",	null],		
+		[26,	"조순",	1384,	0,	null,	50,	48,	58,	0,	160,	300,	"정복",	null],		
+		[25,	"조식",	1385,	0,	null,	19,	19,	70,	0,	160,	300,	"왕좌",	"귀모"],		
+		[25,	"조앙",	1386,	0,	null,	42,	53,	51,	0,	160,	300,	"왕좌",	null],		
+		[25,	"조예",	1387,	0,	null,	47,	47,	65,	0,	160,	300,	"정복",	null],		
+		[26,	"조우",	1388,	0,	null,	51,	47,	55,	0,	160,	300,	"대의",	null],		
+		[76,	"조운",	1389,	0,	null,	62,	75,	68,	0,	160,	300,	"왕좌",	"무쌍",	"창술의 달인 상산 조자룡 여기 있소!"],
+		[25,	"조웅",	1390,	0,	null,	48,	27,	39,	0,	160,	300,	"안전",	null],		
+		[26,	"조인",	1391,	0,	null,	54,	63,	51,	0,	160,	300,	"패권",	"보병"],		
+		[25,	"조조",	1392,	0,	null,	64,	63,	73,	0,	160,	300,	"패권",	"반계"],		
+		[26,	"조진",	1393,	0,	null,	57,	55,	53,	0,	160,	300,	"정복",	null],		
+		[25,	"조창",	1394,	0,	null,	54,	69,	35,	0,	160,	300,	"정복",	"돌격"],		
+		[76,	"조통",	1395,	0,	null,	50,	53,	47,	0,	160,	300,	"재간",	null],		
+		[84,	"조표",	1396,	0,	null,	34,	57,	16,	0,	160,	300,	"안전",	null],		
+		[7,	"조홍1",	1397,	0,	null,	45,	54,	38,	0,	160,	300,	"유지",	null],		
+		[24,	"조홍2",	1398,	0,	null,	53,	56,	39,	0,	160,	300,	"패권",	null],		
+		[26,	"조환",	1399,	0,	null,	34,	24,	38,	0,	160,	300,	"정복",	null],		
+		[19,	"조훈",	1400,	0,	null,	51,	52,	30,	0,	160,	300,	"출세",	null],		
+		[26,	"조휴",	1401,	0,	null,	54,	57,	57,	0,	160,	300,	"패권",	null],		
+		[19,	"조희",	1402,	0,	null,	50,	48,	57,	0,	160,	300,	"대의",	null],		
+		[22,	"종요",	1403,	0,	null,	16,	20,	59,	0,	160,	300,	"유지",	null],		
+		[20,	"종회",	1404,	0,	null,	58,	49,	72,	0,	160,	300,	"패권",	null],		
+		[128,	"주거",	1405,	0,	null,	53,	57,	58,	0,	160,	300,	"유지",	null],		
+		[118,	"주방",	1406,	0,	null,	46,	34,	61,	0,	160,	300,	"할거",	null],		
+		[126,	"주연",	1407,	0,	null,	53,	58,	44,	0,	160,	300,	"할거",	null],		
+		[126,	"주유",	1408,	0,	null,	63,	59,	75,	0,	160,	300,	"패권",	"신산"],		
+		[128,	"주이",	1409,	0,	null,	48,	47,	51,	0,	160,	300,	"안전",	null],		
+		[88,	"주준",	1410,	0,	null,	57,	60,	53,	0,	160,	300,	"왕좌",	null],		
+		[32,	"주지",	1411,	0,	null,	45,	61,	41,	0,	160,	300,	"안전",	null],		
+		[76,	"주창",	1412,	0,	null,	41,	63,	30,	0,	160,	300,	"의협",	"궁병"],		
+		[126,	"주치",	1413,	0,	null,	47,	47,	47,	0,	160,	300,	"안전",	null],		
+		[41,	"주태1",	1414,	0,	null,	49,	47,	51,	0,	160,	300,	"안전",	null],		
+		[126,	"주태2",	1415,	0,	null,	54,	69,	50,	0,	160,	300,	"정복",	"필살"],		
+		[128,	"주환",	1416,	0,	null,	58,	67,	59,	0,	160,	300,	"정복",	null],		
+		[29,	"진건",	1417,	0,	null,	49,	57,	51,	0,	160,	300,	"정복",	null],		
+		[29,	"진교",	1418,	0,	null,	21,	25,	55,	0,	160,	300,	"유지",	null],		
+		[28,	"진군",	1419,	0,	null,	48,	35,	68,	0,	160,	300,	"대의",	null],		
+		[143,	"진궁",	1420,	0,	null,	55,	44,	70,	0,	160,	300,	"할거",	"신중"],		
+		[79,	"진규",	1421,	0,	null,	22,	19,	57,	0,	160,	300,	"할거",	null],		
+		[72,	"진도",	1422,	0,	null,	52,	67,	57,	0,	160,	300,	"대의",	null],		
+		[79,	"진등",	1423,	0,	null,	50,	51,	57,	0,	160,	300,	"할거",	null],		
+		[37,	"진림",	1424,	0,	null,	44,	28,	65,	0,	160,	300,	"재간",	null],		
+		[124,	"진무",	1425,	0,	null,	49,	59,	49,	0,	160,	300,	"재간",	null],		
+		[66,	"진복",	1426,	0,	null,	36,	27,	61,	0,	160,	300,	"재간",	null],		
+		[50,	"진수",	1427,	0,	null,	25,	29,	65,	0,	160,	300,	"대의",	null],		
+		[81,	"진식",	1428,	0,	null,	43,	55,	45,	0,	160,	300,	"출세",	null],		
+		[79,	"진진",	1429,	0,	null,	47,	35,	53,	0,	160,	300,	"재간",	null],		
+		[28,	"진태",	1430,	0,	null,	56,	61,	57,	0,	160,	300,	"대의",	null],		
+		[11,	"진횡",	1431,	0,	null,	38,	49,	41,	0,	160,	300,	"출세",	null],		
+		[21,	"차주",	1432,	0,	null,	46,	54,	51,	0,	160,	300,	"안전",	null],		
+		[11,	"착융",	1433,	0,	null,	49,	49,	21,	0,	160,	300,	"출세",	null],		
+		[36,	"채모",	1434,	0,	null,	56,	56,	55,	0,	160,	300,	"정복",	"궁병"],		
+		[36,	"채중",	1435,	0,	null,	47,	39,	47,	0,	160,	300,	"출세",	null],		
+		[36,	"채화",	1436,	0,	null,	46,	41,	43,	0,	160,	300,	"안전",	null],		
+		[66,	"초주",	1437,	0,	null,	22,	26,	64,	0,	160,	300,	"대의",	null],		
+		[20,	"최염",	1438,	0,	null,	41,	46,	55,	0,	160,	300,	"대의",	null],		
+		[60,	"축융",	1439,	0,	null,	48,	68,	25,	0,	160,	300,	"정복",	"척사"],		
+		[60,	"타사대왕",	1440,	0,	null,	48,	58,	55,	0,	160,	300,	"출세",	"척사"],		
+		[124,	"태사자",	1441,	0,	null,	52,	75,	53,	0,	160,	300,	"대의",	"무쌍"],		
+		[124,	"태사향",	1442,	0,	null,	44,	56,	43,	0,	160,	300,	"재간",	null],		
+		[12,	"포륭",	1443,	0,	null,	45,	59,	20,	0,	160,	300,	"안전",	null],		
+		[74,	"풍습",	1444,	0,	null,	36,	53,	39,	0,	160,	300,	"재간",	null],		
+		[7,	"하의",	1445,	0,	null,	44,	55,	25,	0,	160,	300,	"출세",	null],		
+		[121,	"하제",	1446,	0,	null,	54,	59,	53,	0,	160,	300,	"재간",	null],		
+		[90,	"하진",	1447,	0,	null,	44,	56,	35,	0,	160,	300,	"왕좌",	null],		
+		[24,	"하후덕",	1448,	0,	null,	51,	53,	36,	0,	160,	300,	"출세",	null],		
+		[26,	"하후돈",	1449,	0,	null,	59,	71,	57,	0,	160,	300,	"의협",	"돌격",	"다 나오거라! 상대해 주마!"],
+		[19,	"하후무",	1450,	0,	null,	38,	32,	35,	0,	160,	300,	"안전",	null],		
+		[24,	"하후상",	1451,	0,	null,	51,	51,	57,	0,	160,	300,	"출세",	null],		
+		[26,	"하후연",	1452,	0,	null,	56,	70,	49,	0,	160,	300,	"패권",	"궁병",	"궁술로 날 당해낼 자가 있을까? 후후."],
+		[26,	"하후위",	1453,	0,	null,	53,	61,	57,	0,	160,	300,	"정복",	null],		
+		[26,	"하후은",	1454,	0,	null,	44,	44,	36,	0,	160,	300,	"안전",	null],		
+		[23,	"하후패",	1455,	0,	null,	55,	69,	56,	0,	160,	300,	"대의",	null],		
+		[20,	"하후현",	1456,	0,	null,	47,	23,	60,	0,	160,	300,	"유지",	null],		
+		[26,	"하후혜",	1457,	0,	null,	54,	54,	62,	0,	160,	300,	"정복",	null],		
+		[26,	"하후화",	1458,	0,	null,	55,	51,	63,	0,	160,	300,	"정복",	null],		
+		[22,	"학소",	1459,	0,	null,	60,	64,	67,	0,	160,	300,	"대의",	"견고"],		
+		[126,	"한당",	1460,	0,	null,	51,	55,	53,	0,	160,	300,	"할거",	null],		
+		[93,	"한복",	1461,	0,	null,	50,	49,	38,	0,	160,	300,	"안전",	null],		
+		[8,	"한섬",	1462,	0,	null,	39,	51,	33,	0,	160,	300,	"출세",	null],		
+		[48,	"한수",	1463,	0,	null,	50,	61,	61,	0,	160,	300,	"대의",	"기병"],		
+		[40,	"한숭",	1464,	0,	null,	21,	25,	57,	0,	160,	300,	"재간",	null],		
+		[7,	"한충",	1465,	0,	null,	40,	54,	29,	0,	160,	300,	"안전",	null],		
+		[9,	"한현",	1466,	0,	null,	41,	51,	20,	0,	160,	300,	"유지",	null],		
+		[27,	"한호",	1467,	0,	null,	48,	59,	40,	0,	160,	300,	"유지",	null],		
+		[79,	"향랑",	1468,	0,	null,	44,	21,	61,	0,	160,	300,	"대의",	null],		
+		[79,	"향총",	1469,	0,	null,	54,	38,	59,	0,	160,	300,	"왕좌",	null],		
+		[139,	"허공",	1470,	0,	null,	50,	52,	49,	0,	160,	300,	"유지",	null],		
+		[21,	"허유",	1471,	0,	null,	43,	41,	48,	0,	160,	300,	"재간",	null],		
+		[23,	"허의",	1472,	0,	null,	31,	59,	41,	0,	160,	300,	"출세",	null],		
+		[26,	"허저",	1473,	0,	null,	47,	75,	27,	0,	160,	300,	"정복",	"무쌍"],		
+		[87,	"허정",	1474,	0,	null,	18,	29,	59,	0,	160,	300,	"재간",	null],		
+		[12,	"형도영",	1475,	0,	null,	44,	62,	23,	0,	160,	300,	"출세",	null],		
+		[148,	"호거아",	1476,	0,	null,	35,	61,	51,	0,	160,	300,	"안전",	null],		
+		[76,	"호반",	1477,	0,	null,	48,	49,	41,	0,	160,	300,	"재간",	null],		
+		[20,	"호분",	1478,	0,	null,	52,	50,	51,	0,	160,	300,	"할거",	null],		
+		[27,	"호주천",	1479,	0,	null,	55,	60,	53,	0,	160,	300,	"정복",	null],		
+		[20,	"호준",	1480,	0,	null,	51,	50,	41,	0,	160,	300,	"재간",	null],		
+		[2,	"화웅",	1481,	0,	null,	51,	69,	24,	0,	160,	300,	"출세",	"돌격"],		
+		[131,	"화핵",	1482,	0,	null,	37,	27,	60,	0,	160,	300,	"안전",	null],		
+		[10,	"화흠",	1483,	0,	null,	18,	39,	60,	0,	160,	300,	"출세",	null],		
+		[21,	"환범",	1484,	0,	null,	20,	25,	64,	0,	160,	300,	"유지",	null],		
+		[127,	"황개",	1485,	0,	null,	55,	67,	56,	0,	160,	300,	"왕좌",	"징병"],		
+		[56,	"황권",	1486,	0,	null,	54,	41,	61,	0,	160,	300,	"대의",	null],		
+		[41,	"황란",	1487,	0,	null,	29,	57,	25,	0,	160,	300,	"재간",	null],		
+		[88,	"황보숭",	1488,	0,	null,	57,	52,	59,	0,	160,	300,	"왕좌",	null],		
+		[72,	"황충",	1489,	0,	null,	58,	73,	55,	0,	160,	300,	"왕좌",	"궁병"],		
+		[50,	"황호",	1490,	0,	null,	15,	17,	42,	0,	160,	300,	"안전",	null],		
+		[147,	"후성",	1491,	0,	null,	46,	51,	32,	0,	160,	300,	"정복",	null]			
+		],											
+		"general_ex":[											
+		[123,	"가화",	1492,	0,	null,	44,	54,	37,	0,	160,	300,	null,	null],		
+		[999,	"건석",	1493,	0,	null,	21,	12,	51,	0,	160,	300,	null,	null],		
+		[999,	"견씨",	1494,	0,	null,	35,	24,	49,	0,	160,	300,	null,	null],		
+		[40,	"견홍",	1495,	0,	null,	54,	58,	54,	0,	160,	300,	null,	null],		
+		[120,	"고담",	1496,	0,	null,	33,	21,	56,	0,	160,	300,	null,	null],		
+		[101,	"고유",	1497,	0,	null,	46,	39,	59,	0,	160,	300,	null,	null],		
+		[132,	"곽마",	1498,	0,	null,	51,	57,	43,	0,	160,	300,	null,	null],		
+		[39,	"관구수",	1499,	0,	null,	47,	52,	33,	0,	160,	300,	null,	null],		
+		[39,	"관구전",	1500,	0,	null,	49,	49,	55,	0,	160,	300,	null,	null],		
+		[999,	"관로",	1501,	0,	null,	49,	21,	60,	0,	160,	300,	null,	null],		
+		[65,	"관정",	1502,	0,	null,	35,	43,	59,	0,	160,	300,	null,	null],		
+		[137,	"교수",	1503,	0,	null,	51,	56,	36,	0,	160,	300,	null,	null],		
+		[33,	"구건",	1504,	0,	null,	41,	47,	56,	0,	160,	300,	null,	null],		
+		[41,	"구본",	1505,	0,	null,	45,	37,	57,	0,	160,	300,	null,	null],		
+		[12,	"구성",	1506,	0,	null,	46,	57,	31,	0,	160,	300,	null,	null],		
+		[21,	"국연",	1507,	0,	null,	45,	21,	57,	0,	160,	300,	null,	null],		
+		[99,	"국의",	1508,	0,	null,	57,	63,	43,	0,	160,	300,	null,	null],		
+		[34,	"금의",	1509,	0,	null,	18,	37,	52,	0,	160,	300,	null,	null],		
+		[76,	"나헌",	1510,	0,	null,	58,	55,	60,	0,	160,	300,	null,	null],		
+		[999,	"남두",	1511,	0,	null,	35,	25,	46,	0,	160,	300,	null,	null],		
+		[54,	"냉포",	1512,	0,	null,	52,	65,	56,	0,	160,	300,	null,	null],		
+		[124,	"노숙2",	1513,	0,	null,	52,	47,	61,	0,	160,	300,	null,	null],		
+		[42,	"누규",	1514,	0,	null,	46,	19,	69,	0,	160,	300,	null,	null],		
+		[6,	"누반",	1515,	0,	null,	50,	61,	36,	0,	160,	300,	null,	null],		
+		[130,	"누현",	1516,	0,	null,	23,	20,	55,	0,	160,	300,	null,	null],		
+		[40,	"당균",	1517,	0,	null,	33,	19,	64,	0,	160,	300,	null,	null],		
+		[32,	"당빈",	1518,	0,	null,	52,	59,	51,	0,	160,	300,	null,	null],		
+		[999,	"대교",	1519,	0,	null,	41,	10,	46,	0,	160,	300,	null,	null],		
+		[28,	"대릉",	1520,	0,	null,	50,	60,	40,	0,	160,	300,	null,	null],		
+		[129,	"동조",	1521,	0,	null,	16,	15,	44,	0,	160,	300,	null,	null],		
+		[114,	"등수",	1522,	0,	null,	35,	20,	39,	0,	160,	300,	null,	null],		
+		[50,	"마막",	1523,	0,	null,	22,	17,	5,	0,	160,	300,	null,	null],		
+		[116,	"만욱",	1524,	0,	null,	20,	18,	54,	0,	160,	300,	null,	null],		
+		[120,	"맹종",	1525,	0,	null,	43,	42,	55,	0,	160,	300,	null,	null],		
+		[38,	"문호",	1526,	0,	null,	50,	59,	40,	0,	160,	300,	null,	null],		
+		[999,	"미씨",	1527,	0,	null,	48,	15,	55,	0,	160,	300,	null,	null],		
+		[39,	"반림",	1528,	0,	null,	50,	63,	8,	0,	160,	300,	null,	null],		
+		[129,	"반장",	1529,	0,	null,	55,	62,	56,	0,	160,	300,	null,	null],		
+		[94,	"방열",	1530,	0,	null,	47,	65,	28,	0,	160,	300,	null,	null],		
+		[55,	"방희",	1531,	0,	null,	48,	35,	56,	0,	160,	300,	null,	null],		
+		[30,	"배수",	1532,	0,	null,	10,	11,	61,	0,	160,	300,	null,	null],		
+		[8,	"번능",	1533,	0,	null,	52,	51,	41,	0,	160,	300,	null,	null],		
+		[999,	"번씨",	1534,	0,	null,	32,	17,	40,	0,	160,	300,	null,	null],		
+		[49,	"보도근",	1535,	0,	null,	50,	59,	43,	0,	160,	300,	null,	null],		
+		[129,	"보천",	1536,	0,	null,	51,	50,	58,	0,	160,	300,	null,	null],		
+		[121,	"보협",	1537,	0,	null,	53,	45,	60,	0,	160,	300,	null,	null],		
+		[28,	"부하",	1538,	0,	null,	42,	34,	67,	0,	160,	300,	null,	null],		
+		[26,	"비요",	1539,	0,	null,	52,	53,	59,	0,	160,	300,	null,	null],		
+		[31,	"사마주",	1540,	0,	null,	49,	45,	51,	0,	160,	300,	null,	null],		
+		[41,	"사찬",	1541,	0,	null,	48,	57,	46,	0,	160,	300,	null,	null],		
+		[128,	"설후",	1542,	0,	null,	16,	14,	57,	0,	160,	300,	null,	null],		
+		[36,	"성공영",	1543,	0,	null,	53,	49,	63,	0,	160,	300,	null,	null],		
+		[126,	"성만",	1544,	0,	null,	48,	56,	54,	0,	160,	300,	null,	null],		
+		[999,	"소교",	1545,	0,	null,	47,	23,	54,	0,	160,	300,	null,	null],		
+		[46,	"소유",	1546,	0,	null,	44,	51,	42,	0,	160,	300,	null,	null],		
+		[31,	"소제2",	1547,	0,	null,	22,	16,	62,	0,	160,	300,	null,	null],		
+		[126,	"손교",	1548,	0,	null,	55,	50,	56,	0,	160,	300,	null,	null],		
+		[116,	"손기",	1549,	0,	null,	49,	53,	45,	0,	160,	300,	null,	null],		
+		[999,	"손상향",	1550,	0,	null,	53,	51,	38,	0,	160,	300,	null,	null],		
+		[125,	"손익",	1551,	0,	null,	52,	60,	26,	0,	160,	300,	null,	null],		
+		[125,	"손진",	1552,	0,	null,	50,	57,	42,	0,	160,	300,	null,	null],		
+		[123,	"송겸",	1553,	0,	null,	48,	42,	39,	0,	160,	300,	null,	null],		
+		[85,	"순심",	1554,	0,	null,	20,	21,	63,	0,	160,	300,	null,	null],		
+		[31,	"순욱2",	1555,	0,	null,	10,	16,	61,	0,	160,	300,	null,	null],		
+		[31,	"순의",	1556,	0,	null,	16,	11,	59,	0,	160,	300,	null,	null],		
+		[129,	"시삭",	1557,	0,	null,	36,	54,	39,	0,	160,	300,	null,	null],		
+		[29,	"신창",	1558,	0,	null,	44,	29,	41,	0,	160,	300,	null,	null],		
+		[999,	"악신",	1559,	0,	null,	45,	12,	41,	0,	160,	300,	null,	null],		
+		[138,	"악취",	1560,	0,	null,	46,	55,	49,	0,	160,	300,	null,	null],		
+		[138,	"양강",	1561,	0,	null,	49,	57,	38,	0,	160,	300,	null,	null],		
+		[21,	"양부",	1562,	0,	null,	51,	47,	67,	0,	160,	300,	null,	null],		
+		[72,	"양서",	1563,	0,	null,	46,	51,	54,	0,	160,	300,	null,	null],		
+		[34,	"양습",	1564,	0,	null,	51,	43,	59,	0,	160,	300,	null,	null],		
+		[16,	"양앙",	1565,	0,	null,	50,	57,	36,	0,	160,	300,	null,	null],		
+		[17,	"양임",	1566,	0,	null,	52,	62,	47,	0,	160,	300,	null,	null],		
+		[32,	"양제",	1567,	0,	null,	52,	52,	57,	0,	160,	300,	null,	null],		
+		[33,	"양조2",	1568,	0,	null,	50,	51,	55,	0,	160,	300,	null,	null],		
+		[48,	"양추2",	1569,	0,	null,	50,	55,	51,	0,	160,	300,	null,	null],		
+		[140,	"양홍",	1570,	0,	null,	19,	17,	61,	0,	160,	300,	null,	null],		
+		[31,	"양혼",	1571,	0,	null,	48,	55,	52,	0,	160,	300,	null,	null],		
+		[123,	"여거",	1572,	0,	null,	52,	49,	56,	0,	160,	300,	null,	null],		
+		[130,	"여대",	1573,	0,	null,	57,	58,	57,	0,	160,	300,	null,	null],		
+		[136,	"염상",	1574,	0,	null,	29,	27,	56,	0,	160,	300,	null,	null],		
+		[36,	"염행",	1575,	0,	null,	52,	67,	35,	0,	160,	300,	null,	null],		
+		[73,	"영수",	1576,	0,	null,	52,	57,	59,	0,	160,	300,	null,	null],		
+		[39,	"오거",	1577,	0,	null,	44,	52,	31,	0,	160,	300,	null,	null],		
+		[126,	"오경",	1578,	0,	null,	53,	50,	48,	0,	160,	300,	null,	null],		
+		[999,	"오국태",	1579,	0,	null,	31,	11,	50,	0,	160,	300,	null,	null],		
+		[126,	"오찬",	1580,	0,	null,	52,	37,	62,	0,	160,	300,	null,	null],		
+		[23,	"온회",	1581,	0,	null,	41,	37,	62,	0,	160,	300,	null,	null],		
+		[21,	"왕기2",	1582,	0,	null,	52,	54,	52,	0,	160,	300,	null,	null],		
+		[32,	"왕도",	1583,	0,	null,	43,	39,	57,	0,	160,	300,	null,	null],		
+		[123,	"왕돈",	1584,	0,	null,	48,	53,	37,	0,	160,	300,	null,	null],		
+		[34,	"왕릉",	1585,	0,	null,	53,	50,	57,	0,	160,	300,	null,	null],		
+		[63,	"왕문",	1586,	0,	null,	50,	55,	31,	0,	160,	300,	null,	null],		
+		[32,	"왕상",	1587,	0,	null,	25,	19,	53,	0,	160,	300,	null,	null],		
+		[34,	"왕숙",	1588,	0,	null,	35,	21,	63,	0,	160,	300,	null,	null],		
+		[33,	"왕업",	1589,	0,	null,	32,	6,	41,	0,	160,	300,	null,	null],		
+		[35,	"왕충",	1590,	0,	null,	41,	49,	21,	0,	160,	300,	null,	null],		
+		[1,	"우보",	1591,	0,	null,	41,	52,	12,	0,	160,	300,	null,	null],		
+		[122,	"우사",	1592,	0,	null,	52,	32,	63,	0,	160,	300,	null,	null],		
+		[138,	"원요",	1593,	0,	null,	42,	38,	40,	0,	160,	300,	null,	null],		
+		[95,	"원유",	1594,	0,	null,	47,	35,	59,	0,	160,	300,	null,	null],		
+		[31,	"위관",	1595,	0,	null,	52,	40,	64,	0,	160,	300,	null,	null],		
+		[129,	"위막",	1596,	0,	null,	47,	51,	50,	0,	160,	300,	null,	null],		
+		[55,	"유괴",	1597,	0,	null,	54,	58,	54,	0,	160,	300,	null,	null],		
+		[129,	"유략",	1598,	0,	null,	53,	55,	49,	0,	160,	300,	null,	null],		
+		[45,	"유반",	1599,	0,	null,	54,	63,	42,	0,	160,	300,	null,	null],		
+		[29,	"유복",	1600,	0,	null,	46,	43,	59,	0,	160,	300,	null,	null],		
+		[78,	"유선2",	1601,	0,	null,	9,	21,	36,	0,	160,	300,	null,	null],		
+		[139,	"유섭",	1602,	0,	null,	49,	63,	26,	0,	160,	300,	null,	null],		
+		[28,	"유소",	1603,	0,	null,	50,	44,	59,	0,	160,	300,	null,	null],		
+		[128,	"유승",	1604,	0,	null,	42,	56,	29,	0,	160,	300,	null,	null],		
+		[129,	"유찬",	1605,	0,	null,	54,	60,	54,	0,	160,	300,	null,	null],		
+		[129,	"유평",	1606,	0,	null,	50,	57,	55,	0,	160,	300,	null,	null],		
+		[138,	"유훈",	1607,	0,	null,	44,	53,	43,	0,	160,	300,	null,	null],		
+		[48,	"이감",	1608,	0,	null,	48,	55,	32,	0,	160,	300,	null,	null],		
+		[19,	"이승",	1609,	0,	null,	13,	26,	31,	0,	160,	300,	null,	null],		
+		[22,	"이통",	1610,	0,	null,	54,	66,	45,	0,	160,	300,	null,	null],		
+		[138,	"이풍2",	1611,	0,	null,	53,	61,	43,	0,	160,	300,	null,	null],		
+		[20,	"이풍3",	1612,	0,	null,	23,	25,	57,	0,	160,	300,	null,	null],		
+		[29,	"장구",	1613,	0,	null,	52,	57,	41,	0,	160,	300,	null,	null],		
+		[21,	"장기",	1614,	0,	null,	55,	33,	63,	0,	160,	300,	null,	null],		
+		[74,	"장남",	1615,	0,	null,	52,	53,	35,	0,	160,	300,	null,	null],		
+		[100,	"장막",	1616,	0,	null,	45,	45,	57,	0,	160,	300,	null,	null],		
+		[7,	"장만성",	1617,	0,	null,	53,	65,	41,	0,	160,	300,	null,	null],		
+		[135,	"장반",	1618,	0,	null,	46,	59,	54,	0,	160,	300,	null,	null],		
+		[78,	"장빈",	1619,	0,	null,	30,	28,	55,	0,	160,	300,	null,	null],		
+		[124,	"장승",	1620,	0,	null,	54,	55,	60,	0,	160,	300,	null,	null],		
+		[999,	"장양2",	1621,	0,	null,	47,	43,	41,	0,	160,	300,	null,	null],		
+		[68,	"장억",	1622,	0,	null,	57,	63,	46,	0,	160,	300,	null,	null],		
+		[75,	"장준",	1623,	0,	null,	50,	55,	54,	0,	160,	300,	null,	null],		
+		[20,	"장집",	1624,	0,	null,	31,	27,	59,	0,	160,	300,	null,	null],		
+		[39,	"장특",	1625,	0,	null,	52,	45,	59,	0,	160,	300,	null,	null],		
+		[96,	"저곡",	1626,	0,	null,	47,	45,	55,	0,	160,	300,	null,	null],		
+		[128,	"전기",	1627,	0,	null,	44,	56,	47,	0,	160,	300,	null,	null],		
+		[23,	"전만",	1628,	0,	null,	45,	59,	35,	0,	160,	300,	null,	null],		
+		[128,	"전상",	1629,	0,	null,	5,	6,	11,	0,	160,	300,	null,	null],		
+		[130,	"전역",	1630,	0,	null,	48,	51,	35,	0,	160,	300,	null,	null],		
+		[75,	"전예",	1631,	0,	null,	56,	51,	65,	0,	160,	300,	null,	null],		
+		[64,	"전해",	1632,	0,	null,	52,	52,	48,	0,	160,	300,	null,	null],		
+		[123,	"정봉2",	1633,	0,	null,	51,	55,	45,	0,	160,	300,	null,	null],		
+		[22,	"정의",	1634,	0,	null,	17,	3,	54,	0,	160,	300,	null,	null],		
+		[81,	"제갈교",	1635,	0,	null,	46,	17,	61,	0,	160,	300,	null,	null],		
+		[40,	"제갈서",	1636,	0,	null,	42,	39,	27,	0,	160,	300,	null,	null],		
+		[25,	"조충",	1637,	0,	null,	14,	7,	63,	0,	160,	300,	null,	null],		
+		[121,	"종리목",	1638,	0,	null,	58,	55,	60,	0,	160,	300,	null,	null],		
+		[22,	"종육",	1639,	0,	null,	27,	11,	57,	0,	160,	300,	null,	null],		
+		[122,	"좌혁",	1640,	0,	null,	48,	54,	44,	0,	160,	300,	null,	null],		
+		[36,	"주령",	1641,	0,	null,	55,	57,	56,	0,	160,	300,	null,	null],		
+		[115,	"주앙",	1642,	0,	null,	54,	53,	53,	0,	160,	300,	null,	null],		
+		[52,	"주포",	1643,	0,	null,	48,	58,	12,	0,	160,	300,	null,	null],		
+		[11,	"주흔",	1644,	0,	null,	51,	45,	61,	0,	160,	300,	null,	null],		
+		[140,	"진기",	1645,	0,	null,	47,	55,	41,	0,	160,	300,	null,	null],		
+		[142,	"진란",	1646,	0,	null,	50,	57,	39,	0,	160,	300,	null,	null],		
+		[25,	"진랑",	1647,	0,	null,	47,	57,	35,	0,	160,	300,	null,	null],		
+		[12,	"진응",	1648,	0,	null,	49,	56,	43,	0,	160,	300,	null,	null],		
+		[124,	"진표",	1649,	0,	null,	49,	43,	59,	0,	160,	300,	null,	null],		
+		[999,	"채염",	1650,	0,	null,	40,	22,	53,	0,	160,	300,	null,	null],		
+		[999,	"초선",	1651,	0,	null,	50,	15,	58,	0,	160,	300,	null,	null],		
+		[135,	"초이",	1652,	0,	null,	46,	53,	47,	0,	160,	300,	null,	null],		
+		[65,	"추단",	1653,	0,	null,	49,	57,	34,	0,	160,	300,	null,	null],		
+		[999,	"추씨",	1654,	0,	null,	36,	13,	46,	0,	160,	300,	null,	null],		
+		[71,	"추정",	1655,	0,	null,	51,	53,	54,	0,	160,	300,	null,	null],		
+		[145,	"파재",	1656,	0,	null,	52,	60,	45,	0,	160,	300,	null,	null],		
+		[22,	"포신",	1657,	0,	null,	55,	50,	65,	0,	160,	300,	null,	null],		
+		[114,	"하식",	1658,	0,	null,	18,	35,	29,	0,	160,	300,	null,	null],		
+		[36,	"하안",	1659,	0,	null,	6,	27,	58,	0,	160,	300,	null,	null],		
+		[999,	"하후씨",	1660,	0,	null,	29,	16,	41,	0,	160,	300,	null,	null],		
+		[5,	"학맹",	1661,	0,	null,	47,	54,	37,	0,	160,	300,	null,	null],		
+		[98,	"한거자",	1662,	0,	null,	45,	49,	30,	0,	160,	300,	null,	null],		
+		[19,	"한덕",	1663,	0,	null,	49,	63,	24,	0,	160,	300,	null,	null],		
+		[140,	"한윤",	1664,	0,	null,	27,	24,	55,	0,	160,	300,	null,	null],		
+		[999,	"허소",	1665,	0,	null,	45,	27,	50,	0,	160,	300,	null,	null],		
+		[30,	"호열",	1666,	0,	null,	55,	56,	61,	0,	160,	300,	null,	null],		
+		[76,	"호제",	1667,	0,	null,	47,	38,	55,	0,	160,	300,	null,	null],		
+		[149,	"호진",	1668,	0,	null,	50,	61,	13,	0,	160,	300,	null,	null],		
+		[29,	"호질",	1669,	0,	null,	53,	43,	60,	0,	160,	300,	null,	null],		
+		[7,	"환계",	1670,	0,	null,	12,	25,	55,	0,	160,	300,	null,	null],		
+		[56,	"황숭",	1671,	0,	null,	51,	53,	59,	0,	160,	300,	null,	null],		
+		[999,	"황승언",	1672,	0,	null,	51,	17,	64,	0,	160,	300,	null,	null],		
+		[999,	"황월영",	1673,	0,	null,	47,	14,	60,	0,	160,	300,	null,	null],		
+		[45,	"황조",	1674,	0,	null,	54,	53,	48,	0,	160,	300,	null,	null],		
+		[48,	"후선",	1675,	0,	null,	46,	54,	33,	0,	160,	300,	null,	null],		
+		[8,	"휴고",	1676,	0,	null,	48,	58,	37,	0,	160,	300,	null,	null],		
+		[98,	"휴원진",	1677,	0,	null,	45,	52,	35,	0,	160,	300,	null,	null],		
+		[22,	"희지재",	1678,	0,	null,	24,	5,	67,	0,	160,	300,	null,	null]					
     ],
     "cities":[
 

From b2096cc2746c21d93f6b2efaa399f681841193e0 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 21:35:13 +0900
Subject: [PATCH 012/184] =?UTF-8?q?=EB=B6=88=EA=B0=80=EC=B9=A8=20=EC=84=9C?=
 =?UTF-8?q?=EC=8B=A0=20=EA=B0=9C=EC=9B=94=EC=88=98=20=EC=95=88=EB=B3=B4?=
 =?UTF-8?q?=EC=9D=B4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0,?=
 =?UTF-8?q?=20=EA=B0=9C=EC=9B=94=EC=88=98=20=EB=85=84=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/DiplomaticMessage.php | 4 ++--
 hwe/sammo/Engine/Diplomacy.php  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php
index 212c02aa..04c5f2ce 100644
--- a/hwe/sammo/DiplomaticMessage.php
+++ b/hwe/sammo/DiplomaticMessage.php
@@ -83,8 +83,8 @@ class DiplomaticMessage extends Message{
             return $chk;
         }
 
-        $youlog[] = "<C>●</><D><b>{$this->dest->nationName}</b></>(와)과 <C>$when</>년 불가침에 성공했습니다.";
-        $mylog[] = "<C>●</><D><b>{$this->src->nationName}</b></>(와)과 <C>$when</>년 불가침에 합의했습니다.";
+        $youlog[] = "<C>●</><D><b>{$this->dest->nationName}</b></>(와)과 <C>$helper->year</>년 불가침에 성공했습니다.";
+        $mylog[] = "<C>●</><D><b>{$this->src->nationName}</b></>(와)과 <C>$helper->year</>년 불가침에 합의했습니다.";
         pushGenLog(['no'=>$this->dest->generalID], $mylog);
         pushGenLog(['no'=>$this->src->generalID], $youlog);
         pushGeneralHistory(['no'=>$this->src->generalID], "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->dest->nationName}</b></>(와)과 {$when}년 불가침 성공");
diff --git a/hwe/sammo/Engine/Diplomacy.php b/hwe/sammo/Engine/Diplomacy.php
index 89f0a40a..22646381 100644
--- a/hwe/sammo/Engine/Diplomacy.php
+++ b/hwe/sammo/Engine/Diplomacy.php
@@ -282,7 +282,7 @@ class Diplomacy{
         $db = DB::db();
         $db->update('diplomacy',[
             'state'=>7,
-            'term'=>$when,
+            'term'=>$when*12,
             'fixed'=>$option
         ],
         '(me=%i AND you=%i) OR (you=%i AND me=%i)', 

From 05c4f721f2eeea8be639c9954b717388ec0ab468 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 21:37:59 +0900
Subject: [PATCH 013/184] =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=EC=B0=BD=20?=
 =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=97=90=EC=84=9C=20=EC=95=88?=
 =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EA=B2=83=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/css/msg.css | 7 ++++++-
 hwe/index.php   | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/hwe/css/msg.css b/hwe/css/msg.css
index 546123be..25c372a6 100644
--- a/hwe/css/msg.css
+++ b/hwe/css/msg.css
@@ -9,6 +9,11 @@
 }
 /*임시용 끝*/
 
+#message_board{
+    height:1370px;
+    position:relative;
+}
+
 #message_board section{
     overflow-y:auto;
     overflow-x:hidden;
@@ -91,10 +96,10 @@
 }
 
 .board_side{
+    position:absolute;
     height:1370px;
     width:498px;
     overflow-y: hidden;
-    display:inline-block;
     border-left:groove 1px;
     border-right:groove 1px;
     border-bottom:groove 1px;
diff --git a/hwe/index.php b/hwe/index.php
index 2bbec125..196aae34 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -286,12 +286,12 @@ if ($session->userGrade >= 5) {
     내용 없이 '서신전달&amp;갱신'을 누르면 메세지창이 갱신됩니다.
 </div>
 <div><?=allButton()?></div>
-<div id="message_board"><div class="board_side bg0">
+<div id="message_board"><div style="left:0;" class="board_side bg0">
         <div class="board_header bg0">전체 메시지(최고99자)</div>
         <section class="public_message"></section>
         <div class="board_header bg0">개인 메시지(최고99자)</div>
         <section class="private_message"></section>
-    </div><div class="board_side bg0">
+    </div><div style="right:0;" class="board_side bg0">
         <section class="diplomacy_message">
 
         </section>

From cf2ace32d1395158103f62ef74303d03e4bee033 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 21:39:08 +0900
Subject: [PATCH 014/184] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/index.php b/hwe/index.php
index 196aae34..6a9e6b02 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -249,7 +249,7 @@ if ($session->userGrade >= 5) {
     <tr>
         <td width=646 align=right>
             <?php commandTable(); ?>
-            <input id="mainBtnSubmit" type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px; value='실 행' onclick='refreshing(this, 3,form2)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px; value='갱 신' onclick='refreshing(this, 0,0)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;font-size:13px; value='로그아웃' onclick=location.replace('logout_process.php')><br>
+            <input id="mainBtnSubmit" type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px; value='실 행' onclick='refreshing(this, 3,form2)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px; value='갱 신' onclick='refreshing(this, 0,0)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;font-size:13px; value='로비로' onclick=location.replace('../')><br>
         </td>
     </tr>
 </form>

From 8fd6b91cf7c5a8da5edb7998626058881e7a2eda Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 21:57:03 +0900
Subject: [PATCH 015/184] =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=20=EC=8A=B5?=
 =?UTF-8?q?=EB=93=9D=EC=8B=9C=20warning=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/func.php b/hwe/func.php
index 93487b90..06b239dd 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -2208,7 +2208,7 @@ function uniqueItem($general, $log, $vote=0) {
                     $item[] = $i;
                 }
             }
-            $it = $item[rand() % count($item)];
+            $it = $item[rand() % count($item)]??0;
 
             $query = "update general set {$type}='$it' where no='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

From 72f41df5d2166bcc496dc008badd1566eae7c50b Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 21:59:48 +0900
Subject: [PATCH 016/184] =?UTF-8?q?=EC=82=AC=EB=A0=B9=EB=B6=80=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_chiefcenter.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/hwe/b_chiefcenter.php b/hwe/b_chiefcenter.php
index 66b464dc..b5dbe4e4 100644
--- a/hwe/b_chiefcenter.php
+++ b/hwe/b_chiefcenter.php
@@ -116,6 +116,24 @@ for($k=0; $k < 2; $k++) {
             'name'=>0
         ];
     }
+    if(!isset($gen[$l3])){
+        $gen[$l3] = [
+            'npc'=>0,
+            'name'=>0
+        ];
+    }
+    if(!isset($gen[$l2])){
+        $gen[$l2] = [
+            'npc'=>0,
+            'name'=>0
+        ];
+    }
+    if(!isset($gen[$l1])){
+        $gen[$l1] = [
+            'npc'=>0,
+            'name'=>0
+        ];
+    }
 
     if    ($gen[$l4]['npc'] >= 2) { $gen[$l4]['name'] = "<font color=cyan>".($gen[$l4]['name']??'')."</font>"; }
     elseif($gen[$l4]['npc'] == 1) { $gen[$l4]['name'] = "<font color=skyblue>".($gen[$l4]['name']??'')."</font>"; }

From 58a7b3afe1d3f232e2137fcd95a771423b5e35bb Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 22:03:08 +0900
Subject: [PATCH 017/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EC=9E=A0?=
 =?UTF-8?q?=EC=8B=9C=20=EC=82=B4=EB=A6=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index 06b239dd..4b62b73b 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -556,15 +556,13 @@ function commandTable() {
     } else {
         addCommand("인재탐색(랜덤경험, 자금$develcost)", 29, 0);
     }
-    //TODO:등용장 재 디자인
-    //xxx:등용장 일단 끔
-    /*
+
     if($me['level'] >= 1 && $city['supply'] != 0) {
         addCommand("등용(자금{$develcost5}+장수가치)", 22);
     } else {
         addCommand("등용(자금{$develcost5}+장수가치)", 22, 0);
     }
-    */
+    
     if($me['no'] == $troop['no'] && $citycount > 0 && $city['supply'] != 0 && $city['nation'] == $me['nation']) {
         addCommand("집합(통솔경험)", 26);
     } else {

From fc021dae54d894db219613cfe506001f14f71032 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 22:03:23 +0900
Subject: [PATCH 018/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EC=82=B4?=
 =?UTF-8?q?=EB=A6=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/processing.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/processing.php b/hwe/processing.php
index 8533a760..ac79fc63 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -58,7 +58,7 @@ switch($commandtype) {
     case 17: command_Single($turn, 17); break; //소집해제
 
     case 21: command_21(    $turn, 21); break; //이동
-    //case 22: command_22(    $turn, 22); break; //등용 //TODO:등용장 재 디자인
+    case 22: command_22(    $turn, 22); break; //등용 //TODO:등용장 재 디자인
     case 23: command_23(    $turn, 23); break; //포상
     case 24: command_24(    $turn, 24); break; //몰수
     case 25: command_25(    $turn, 25); break; //임관

From ab546f66f0397d7fbed67ad143c928be75a8c740 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 22:13:36 +0900
Subject: [PATCH 019/184] =?UTF-8?q?=EA=B5=AD=EA=B0=80=EA=B0=84=20=EA=B0=A0?=
 =?UTF-8?q?=EB=A9=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_command.php |  2 +-
 hwe/j_basic_info.php |  1 +
 hwe/js/msg.js        | 23 ++++++++++++++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/hwe/func_command.php b/hwe/func_command.php
index 349bfed9..871219ee 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -570,7 +570,7 @@ function processCommand($no) {
             case 17: process_17($general); break; //소집해제
 
             case 21: process_21($general); break; //이동
-            //case 22: process_22($general); break; //등용 //TODO:등용장 재 디자인
+            case 22: process_22($general); break; //등용 //TODO:등용장 재 디자인
             case 25: process_25($general); break; //임관
             case 26: process_26($general); break; //집합
             case 28: process_28($general); break; //귀환
diff --git a/hwe/j_basic_info.php b/hwe/j_basic_info.php
index 60a799c1..3d597164 100644
--- a/hwe/j_basic_info.php
+++ b/hwe/j_basic_info.php
@@ -19,5 +19,6 @@ if(!$generalInfo){
 $result['generalID'] = $generalInfo['no'];
 $result['myNationID'] = $generalInfo['nation'];
 $result['isChief'] = ($generalInfo['level'] == 12);
+$result['generalLevel'] = $generalInfo['level'];
 
 Json::die($result);
\ No newline at end of file
diff --git a/hwe/js/msg.js b/hwe/js/msg.js
index 93bd0c00..a059f661 100644
--- a/hwe/js/msg.js
+++ b/hwe/js/msg.js
@@ -216,7 +216,8 @@ function refreshMailboxList(obj){
 
     generalList = {};
 
-    //TODO:수뇌인 경우 각국에 대해 외교 국메를 넣을 수 있어야함.
+    
+    
 
     $.each(obj.nation, function(){
         var nation = this;
@@ -284,6 +285,25 @@ function refreshMailboxList(obj){
     $favorite.append($lastContact);
     //TODO:운영자를 추가하는 코드도 넣을 것.
 
+    if(myGeneralLevel >= 5){
+        $.each(obj.nation, function(){
+            var nation = this;
+            //console.log(nation);
+            var $nation = $('<option value="{0}">{1}</option>'.format(nation.mailbox,nation.name));
+            $nation.css('color', nation.color);
+    
+            if(isBrightColor(nation.color)){
+                $nation.css('background-color', 'black');
+            }
+            else{
+                $nation.css('background-color', 'white');
+            }
+            $favorite.append($nation);
+        });
+        
+    }
+    
+
     $mailboxList.prepend($favorite);
 
     if(!oldSelected){
@@ -307,6 +327,7 @@ function registerGlobal(basicInfo){
     };
     myGeneralID = basicInfo.generalID;
     isChief = basicInfo.isChief;
+    myGeneralLevel = basicInfo.generalLevel;
 }
 
 function activateMessageForm(){

From 1566aa0243ac5ffd530234e77e86d7f2919e7108 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 22:15:11 +0900
Subject: [PATCH 020/184] =?UTF-8?q?=EA=B5=AD=EA=B0=80=EC=83=89=20=EC=83=88?=
 =?UTF-8?q?=EB=A1=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/js/msg.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hwe/js/msg.js b/hwe/js/msg.js
index a059f661..0af6eeef 100644
--- a/hwe/js/msg.js
+++ b/hwe/js/msg.js
@@ -290,13 +290,13 @@ function refreshMailboxList(obj){
             var nation = this;
             //console.log(nation);
             var $nation = $('<option value="{0}">{1}</option>'.format(nation.mailbox,nation.name));
-            $nation.css('color', nation.color);
+            $nation.css('background-color', nation.color);
     
             if(isBrightColor(nation.color)){
-                $nation.css('background-color', 'black');
+                $nation.css('color', 'black');
             }
             else{
-                $nation.css('background-color', 'white');
+                $nation.css('color', 'white');
             }
             $favorite.append($nation);
         });

From 418130f4cd4df382fe58fd3d11edfe5913fe59d2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 22:44:39 +0900
Subject: [PATCH 021/184] =?UTF-8?q?bool=20=EB=B3=80=ED=99=98=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20false=20=EC=A1=B0=EA=B1=B4=20=ED=95=98=EB=82=98=20?=
 =?UTF-8?q?=EB=8D=94=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sammo/Util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sammo/Util.php b/src/sammo/Util.php
index ff33e686..2f4cbf4a 100644
--- a/src/sammo/Util.php
+++ b/src/sammo/Util.php
@@ -34,7 +34,7 @@ class Util extends \utilphp\util
 
         if ($type === 'bool') {
             $value = strtolower($value);
-            if ($value === 'off' || $value === 'false' || $value === 'no' || $value === 'n' || $value === 'x' || $value === 'null') {
+            if ($value === '' || $value === 'off' || $value === 'false' || $value === 'no' || $value === 'n' || $value === 'x' || $value === 'null') {
                 return false;
             }
             return !!$value;

From f71c61a55bca5858e93554ce3e961fea82be711e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 22:57:10 +0900
Subject: [PATCH 022/184] =?UTF-8?q?=ED=8A=B9=EC=88=98=20=EA=B6=8C=ED=95=9C?=
 =?UTF-8?q?=20=EC=9C=A0=EC=A0=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/_119.php   | 2 +-
 hwe/_119_b.php | 2 +-
 hwe/index.php  | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/hwe/_119.php b/hwe/_119.php
index b73d8c0e..9ac164fc 100644
--- a/hwe/_119.php
+++ b/hwe/_119.php
@@ -5,7 +5,7 @@ include "lib.php";
 include "func.php";
 
 $session = Session::requireGameLogin()->setReadOnly();
-if($session->userGrade < 5) {
+if($session->userGrade < 4) {
     ?><!DOCTYPE html>
 <!DOCTYPE html>
 <html>
diff --git a/hwe/_119_b.php b/hwe/_119_b.php
index 34ba6505..fd154c62 100644
--- a/hwe/_119_b.php
+++ b/hwe/_119_b.php
@@ -6,7 +6,7 @@ include "func.php";
 
 
 $session = Session::requireGameLogin()->setReadOnly();
-if($session->userGrade < 5){
+if($session->userGrade < 4){
     header('location:_119.php');
     die();
 }
diff --git a/hwe/index.php b/hwe/index.php
index 6a9e6b02..942cb9ba 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -211,6 +211,14 @@ if ($session->userGrade >= 5) {
     </td></tr>
 ";
 }
+else if($session->userGrade == 4){
+    echo "
+    <tr><td colspan=5>
+        <input type=button value=시뮬 onclick=window.open('_simul.php')>
+        <input type=button value=119 onclick=window.open('_119.php')>
+    </td></tr>
+";
+}
 
 ?>
 

From a4ee43f12bfcca0d125ddc4c3391a7ba7f599dac Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 23:04:37 +0900
Subject: [PATCH 023/184] =?UTF-8?q?=EC=84=B8=EB=A0=A5=EB=8F=84=20=EC=95=84?=
 =?UTF-8?q?=EB=9E=98=20=EC=95=88=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EA=B2=83=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/a_status.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/a_status.php b/hwe/a_status.php
index 342e828d..bde3892f 100644
--- a/hwe/a_status.php
+++ b/hwe/a_status.php
@@ -67,7 +67,7 @@ $(function(){
     </tr>
     <tr>
         <td colspan=2 valign=top>
-            <?php getWorldHistoryRecent(34); ?>
+            <?=getWorldHistoryRecent(34)?>
         </td>
     </tr>
 </table>

From b65e6912554120ed5906ef8054c2459cf680f03f Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 23:17:16 +0900
Subject: [PATCH 024/184] =?UTF-8?q?=EB=B2=8C=EC=A0=90=20=EC=95=88=20?=
 =?UTF-8?q?=EC=8C=93=EC=9D=B4=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hwe/func.php b/hwe/func.php
index 4b62b73b..28cca4e9 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1262,6 +1262,7 @@ function cutDay($date, int $turnterm) {
 function increaseRefresh($type="", $cnt=1) {
     //FIXME: 로그인, 비로그인 시 처리가 명확하지 않음
     $session = Session::getInstance();
+    $userID = $session->userID;
     $generalID = $session->generalID;
 
     $date = date('Y-m-d H:i:s');
@@ -1278,7 +1279,7 @@ function increaseRefresh($type="", $cnt=1) {
             'connect'=>$db->sqleval('connect + %i', $cnt),
             'refcnt'=>$db->sqleval('refcnt + %i', $cnt),
             'refresh'=>$db->sqleval('refresh + %i', $cnt)
-        ], 'owner=%i', $generalID);
+        ], 'owner=%i', $userID);
     }
 
     $date = date('Y_m_d H:i:s');

From 1cb877503dd19f8b22ae45e493c0722648a01e79 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 23:30:48 +0900
Subject: [PATCH 025/184] =?UTF-8?q?=EB=B6=88=EA=B0=80=EC=B9=A8=20=ED=95=A9?=
 =?UTF-8?q?=EC=9D=98=20=EC=8B=9C=20=EB=85=84=20=ED=91=9C=EA=B8=B0=EA=B0=80?=
 =?UTF-8?q?=20=EC=9D=B4=EC=83=81=ED=95=9C=20=EB=AC=B8=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/DiplomaticMessage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php
index 04c5f2ce..86f16628 100644
--- a/hwe/sammo/DiplomaticMessage.php
+++ b/hwe/sammo/DiplomaticMessage.php
@@ -83,8 +83,8 @@ class DiplomaticMessage extends Message{
             return $chk;
         }
 
-        $youlog[] = "<C>●</><D><b>{$this->dest->nationName}</b></>(와)과 <C>$helper->year</>년 불가침에 성공했습니다.";
-        $mylog[] = "<C>●</><D><b>{$this->src->nationName}</b></>(와)과 <C>$helper->year</>년 불가침에 합의했습니다.";
+        $youlog[] = "<C>●</><D><b>{$this->dest->nationName}</b></>(와)과 <C>$year</>년 불가침에 성공했습니다.";
+        $mylog[] = "<C>●</><D><b>{$this->src->nationName}</b></>(와)과 <C>$year</>년 불가침에 합의했습니다.";
         pushGenLog(['no'=>$this->dest->generalID], $mylog);
         pushGenLog(['no'=>$this->src->generalID], $youlog);
         pushGeneralHistory(['no'=>$this->src->generalID], "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->dest->nationName}</b></>(와)과 {$when}년 불가침 성공");

From 18e355b701f84690e4df22a10eb424fb2eca4abf Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 17 Apr 2018 23:39:36 +0900
Subject: [PATCH 026/184] =?UTF-8?q?bool=20=EB=B3=80=EC=88=98=20=EB=B0=9B?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0.=20?=
 =?UTF-8?q?=EC=A0=84=EC=BD=98=20=EC=95=88=20=EA=B3=A0=EB=A5=BC=20=EC=88=98?=
 =?UTF-8?q?=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=84=A0=ED=83=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/join_post.php  | 4 +---
 src/sammo/Util.php | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hwe/join_post.php b/hwe/join_post.php
index 85001276..76c155bf 100644
--- a/hwe/join_post.php
+++ b/hwe/join_post.php
@@ -8,7 +8,6 @@ $v = new Validator($_POST + $_GET);
 $v
 ->rule('required', [
     'name',
-    'pic',
     'leader',
     'power',
     'intel'
@@ -18,7 +17,6 @@ $v
     'power',
     'intel',
     'character',
-    'pic'
 ])
 ->rule('lengthBetween', 'name', 1, 6)
 ->rule('min', [
@@ -46,7 +44,7 @@ $userID = Session::getUserID();
 
 $name       = Util::getReq('name');
 $name       = StringUtil::removeSpecialCharacter($name);
-$pic        = Util::getReq('pic', 'int', 0);
+$pic        = (int)Util::getReq('pic', 'bool', 0);
 $character  = Util::getReq('character', 'int', 0);
 
 $leader = Util::getReq('leader', 'int', 50);
diff --git a/src/sammo/Util.php b/src/sammo/Util.php
index 2f4cbf4a..2b0a3bce 100644
--- a/src/sammo/Util.php
+++ b/src/sammo/Util.php
@@ -34,7 +34,7 @@ class Util extends \utilphp\util
 
         if ($type === 'bool') {
             $value = strtolower($value);
-            if ($value === '' || $value === 'off' || $value === 'false' || $value === 'no' || $value === 'n' || $value === 'x' || $value === 'null') {
+            if ($value === null || $value === '' || $value === 'off' || $value === 'false' || $value === 'no' || $value === 'n' || $value === 'x' || $value === 'null') {
                 return false;
             }
             return !!$value;

From 0fa4d88ea9190ff287f65872a516e257329d9f51 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 00:01:40 +0900
Subject: [PATCH 027/184] =?UTF-8?q?lock=20=ED=8C=8C=EC=9D=BC=20=EA=B2=BD?=
 =?UTF-8?q?=EB=A1=9C=20=EC=B2=B4=ED=81=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/func.php b/hwe/func.php
index 28cca4e9..6ada2b7d 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1522,7 +1522,7 @@ function checkTurn() {
 
     // 파일락 획득
     //FIXME:이미 DB 테이블로 lock을 시도하는데 이게 따로 필요한가?
-    $fp = fopen('lock.txt', 'r');
+    $fp = fopen(__dir__.'/lock.txt', 'r');
     if(!flock($fp, LOCK_EX)) {
          return; 
         }

From 0eb91c6301e1d48ece165288cdb4fa664649a8d4 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 00:08:12 +0900
Subject: [PATCH 028/184] =?UTF-8?q?=EB=B2=84=ED=8A=BC=EB=93=A4=20'?=
 =?UTF-8?q?=EB=92=A4=EB=A1=9C=20=EA=B0=80=EA=B8=B0'=20=EA=B0=80=EB=8A=A5?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=A7=81=EC=A0=91=20=EB=A7=81?=
 =?UTF-8?q?=ED=81=AC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/templates/commandButton.php | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/hwe/templates/commandButton.php b/hwe/templates/commandButton.php
index 8de311cd..9a0c1585 100644
--- a/hwe/templates/commandButton.php
+++ b/hwe/templates/commandButton.php
@@ -1,27 +1,27 @@
 <div class='buttonPlate bg2'>
     <div>
-    <a href='javascript:refreshing(this, 1,1);'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>회 의 실</button></a>
-    <a href='javascript:refreshing(this, 1,4);'><button class='commandButton' <?=$meLevel>=5?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>기 밀 실</button></a>
-    <a href='javascript:refreshing(this, 1,2);'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>부대 편성</button></a>
-    <a href='javascript:refreshing(this, 1,10);'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>인 사 부</button></a>
-    <a href='javascript:refreshing(this, 1,13);'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>내 무 부</button></a>
-    <a href='javascript:refreshing(this, 1,5);'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>사 령 부</button></a>
-    <a href='javascript:refreshing(this, 1,6);'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>암 행 부</button></a>
-    <a href='javascript:refreshing(this, 1,15);'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>토 너 먼 트</button></a>
-    <a href='javascript:refreshing(this, 1,16);'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>베 팅 장</button></a>
+    <a href='b_nationboard.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>회 의 실</button></a>
+    <a href='b_chiefboard.php'><button class='commandButton' <?=$meLevel>=5?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>기 밀 실</button></a>
+    <a href='b_troop.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>부대 편성</button></a>
+    <a href='b_myBossInfo.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>인 사 부</button></a>
+    <a href='b_dipcenter.php'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>내 무 부</button></a>
+    <a href='b_chiefcenter.php'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>사 령 부</button></a>
+    <a href='b_genList.php' target='_blank'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>암 행 부</button></a>
+    <a href='b_tournament.php' target='_blank'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>토 너 먼 트</button></a>
+    <a href='b_betting.php' target='_blank'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>베 팅 장</button></a>
 
     </div>
 <div>
 
-    <a href='javascript:refreshing(this, 1,7);'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>세력 정보</button></a>
-    <a href='javascript:refreshing(this, 1,8);'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>세력 도시</button></a>
-    <a href='javascript:refreshing(this, 1,9);'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>세력 장수</button></a>
-    <a href='javascript:refreshing(this, 1,3);'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>국 법</button></a>
-    <a href='javascript:refreshing(this, 1,14);'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>중원 정보</button></a>
-    <a href='javascript:refreshing(this, 1,11);'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>현재 도시</button></a>
-    <a href='javascript:refreshing(this, 1,18);'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>감 찰 부</button></a>
-    <a href='javascript:refreshing(this, 1,12);'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>내 정보 &amp; 설정</button></a>
-    <a href='javascript:refreshing(this, 1,17);'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>거 래 장</button></a>
+    <a href='b_myKingdomInfo.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>세력 정보</button></a>
+    <a href='b_myCityInfo.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>세력 도시</button></a>
+    <a href='b_myGenInfo.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>세력 장수</button></a>
+    <a href='b_nationrule.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>국 법</button></a>
+    <a href='b_diplomacy.php'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>중원 정보</button></a>
+    <a href='b_currentCity.php'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>현재 도시</button></a>
+    <a href='b_battleCenter.php' target='_blank'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>감 찰 부</button></a>
+    <a href='b_myPage.php'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>내 정보 &amp; 설정</button></a>
+    <a href='b_auction.php' target='_blank'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>거 래 장</button></a>
 
     </div>
 </div>
\ No newline at end of file

From f7dc1a588b7451775f7e31014f5089527eb0ae37 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 18 Apr 2018 09:24:10 +0900
Subject: [PATCH 029/184] =?UTF-8?q?=EB=8A=A5=EB=A0=A5=EC=B9=98=20=EB=B0=9B?=
 =?UTF-8?q?=EC=95=84=EC=98=AC=20=EB=95=8C=20general=EC=9D=B4=20NULL?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=EB=8F=84=20=EB=8C=80=EC=9D=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/hwe/func_process.php b/hwe/func_process.php
index 2db914c5..789612a7 100644
--- a/hwe/func_process.php
+++ b/hwe/func_process.php
@@ -13,6 +13,9 @@ namespace sammo;
  * @return int|float 계산된 능력치
  */
 function getGeneralLeadership(&$general, $withInjury, $withItem, $withStatAdjust, $useFloor = true){
+	if($general === null){
+		return 0;
+	}
     $leadership = $general['leader'];
     if($withInjury){
         $leadership *= (100 - $general['injury']) / 100;
@@ -47,6 +50,9 @@ function getGeneralLeadership(&$general, $withInjury, $withItem, $withStatAdjust
  * @return int|float 계산된 능력치
  */
 function getGeneralPower(&$general, $withInjury, $withItem, $withStatAdjust, $useFloor = true){
+	if($general === null){
+		return 0;
+	}
     $power = $general['power'];
     if($withInjury){
         $power *= (100 - $general['injury']) / 100;
@@ -78,6 +84,10 @@ function getGeneralPower(&$general, $withInjury, $withItem, $withStatAdjust, $us
  * @return int|float 계산된 능력치
  */
 function getGeneralIntel(&$general, $withInjury, $withItem, $withStatAdjust, $useFloor = true){
+	if($general === null){
+		return 0;
+	}
+	
     $intel = $general['intel'];
     if($withInjury){
         $intel *= (100 - $general['injury']) / 100;

From 8bccf449adbebd45309c4b2985be15dba998efd6 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 18 Apr 2018 09:38:32 +0900
Subject: [PATCH 030/184] =?UTF-8?q?NPC=20=EA=B0=90=EC=B0=B0=EB=B6=80?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=9E=A5=EC=88=98=20=ED=96=89=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_battleCenter.php | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/hwe/b_battleCenter.php b/hwe/b_battleCenter.php
index c147d6ad..1ca833a1 100644
--- a/hwe/b_battleCenter.php
+++ b/hwe/b_battleCenter.php
@@ -100,20 +100,23 @@ $sel[$type] = "selected";
 <?php
 switch ($type) {
     default:
-    case 0: $query = "select no,name from general where nation='{$me['nation']}' order by turntime desc"; break;
-    case 1: $query = "select no,name from general where nation='{$me['nation']}' order by recwar desc"; break;
-    case 2: $query = "select no,name from general where nation='{$me['nation']}' order by npc,binary(name)"; break;
-    case 3: $query = "select no,name from general where nation='{$me['nation']}' order by warnum desc"; break;
+    case 0: $query = "select no,name,npc from general where nation='{$me['nation']}' order by turntime desc"; break;
+    case 1: $query = "select no,name,npc from general where nation='{$me['nation']}' order by recwar desc"; break;
+    case 2: $query = "select no,name,npc from general where nation='{$me['nation']}' order by npc,binary(name)"; break;
+    case 3: $query = "select no,name,npc from general where nation='{$me['nation']}' order by warnum desc"; break;
 }
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $gencount = MYDB_num_rows($result);
-
+$npc = 0;
 for ($i=0; $i < $gencount; $i++) {
     $general = MYDB_fetch_array($result);
     // 선택 없으면 맨 처음 장수
     if ($gen == 0) {
         $gen = $general['no'];
     }
+	if($gen == $general['no']){
+		$npc = $general['npc'];
+	}
     if ($gen == $general['no']) {
         echo "
             <option selected value={$general['no']}>{$general['name']}</option>";
@@ -153,6 +156,19 @@ for ($i=0; $i < $gencount; $i++) {
             <?=getBatResRecent($gen, 24)?>
         </td>
     </tr>
+<?php if($npc > 1): ?>
+    <tr>
+        <td align=center id=bg1><font color=orange size=3>개인 기록</font></td>
+        <td align=center id=bg1><font color=orange size=3>&nbsp;</font></td>
+    </tr>
+    <tr>
+        <td valign=top>
+            <?=getGenLogRecent($gen, 24)?>
+        </td>
+        <td valign=top>
+        </td>
+    </tr>
+<?php endif; ?>
 </table>
 <table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
     <tr><td><?=closeButton()?></td></tr>

From 190fcabbac5f9672f06336c0721c4807bd502187 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 18 Apr 2018 09:43:58 +0900
Subject: [PATCH 031/184] =?UTF-8?q?NPC=20=EC=82=BC=ED=8C=9C=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 478fe4fe..5751d389 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -663,11 +663,11 @@ function processAI($no) {
             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) {                                      //금없으면 쌀팜
-                $amount = intdiv(($general['rice'] - $general['gold']), 100 / 2);   // 100단위
+                $amount = intdiv(($general['rice'] - $general['gold'])/2, 100);   // 100단위
                 $command = EncodeCommand(0, 1, $amount, 49);                    //팜
             } elseif($general['gold'] < 700 && $general['rice'] < 700) { $command = EncodeCommand(0, 0, 0, 1); } //금쌀되면 내정
             elseif($general['rice'] < 100) {                                      //쌀없으면 쌀삼
-                $amount = intdiv(($general['gold'] - $general['rice']), 100 / 2);  // 100단위
+                $amount = intdiv(($general['gold'] - $general['rice'])/2, 100);  // 100단위
                 $command = EncodeCommand(0, 2, $amount, 49);                    //삼
             } elseif($genType >= 2) { $command = EncodeCommand(0, 0, 0, 1); } //내정장일때 내정
             else {

From 49f40d56b0fb967a8c19768e69e9efc469def6b5 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 18 Apr 2018 10:13:32 +0900
Subject: [PATCH 032/184] =?UTF-8?q?=ED=9A=8C=ED=94=BC=20=EC=9E=98=EB=AA=BB?=
 =?UTF-8?q?=20=EC=A0=81=EC=9A=A9=EB=90=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/process_war.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/process_war.php b/hwe/process_war.php
index 41d84416..f47e0e9b 100644
--- a/hwe/process_war.php
+++ b/hwe/process_war.php
@@ -1159,7 +1159,7 @@ function processWar($general, $city) {
                 }
                 //회피
                 $ratio = rand() % 100; // 0 ~ 99
-                $ratio2 = GameUnitConst::byID($oppose['crewtype'])->defence;   //회피율
+                $ratio2 = GameUnitConst::byID($oppose['crewtype'])->avoid;   //회피율
 				$ratio2 = Util::round($ratio2 * $oppose['train'] / 100); //훈련 반영
                 // 특기보정 : 돌격, 궁병
                 if($general['special2'] == 60) { $ratio2 -= 100; }

From f57c4967f2873cec0cda3cfe4c60bb33f7985638 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 18 Apr 2018 13:56:36 +0900
Subject: [PATCH 033/184] =?UTF-8?q?NPC=20=EC=82=BC/=ED=8C=9C=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EB=A7=88=EC=A0=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 5751d389..1e7179d8 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -743,12 +743,12 @@ function processAI($no) {
                         else { $command = EncodeCommand(0, 0, 0, 1); }
                     } elseif($general['rice'] < $resrc && $general['rice'] <= $general['gold']) {
                         //금이 더 많으면 매매
-                        $amount = intdiv(($general['gold'] - $general['rice']), 100 / 2);  // 100단위
+                        $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']) {
                         //쌀이 더 많으면 매매
-                        $amount = intdiv(($general['rice'] - $general['gold']), 100 / 2);  // 100단위
+                        $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); }   // 내정, 조달
                     //자원, 병사 모두 충족
@@ -777,11 +777,11 @@ function processAI($no) {
             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'] == 1) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
             elseif($general['gold'] < $resrc) {                                   // 금없으면 쌀팜
-                $amount = intdiv(($general['rice'] - $general['gold']), 100 / 2);   // 100단위
+                $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) {                                 // 쌀없으면 쌀삼
-                $amount = intdiv(($general['gold'] - $general['rice']), 100 / 2);   // 100단위
+                $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); } //내정장일때 내정

From 03c930ce7dd1b2ec39e8c4355ac37c34da2b1047 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 21:16:49 +0900
Subject: [PATCH 034/184] =?UTF-8?q?npc=EA=B0=80=20=EC=9C=A0=EC=A0=80?=
 =?UTF-8?q?=EC=97=90=EA=B2=8C=20=ED=8F=AC=EC=83=81,=20=EB=AA=B0=EC=88=98?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EA=B8=B0=EC=A4=80=EC=9D=84=20=EB=8D=94=20?=
 =?UTF-8?q?=ED=9B=84=ED=95=98=EA=B2=8C=20=EC=9E=A1=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 78 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 64 insertions(+), 14 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 1e7179d8..ab1aa607 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -573,25 +573,75 @@ function processAI($no) {
 
                     if($nation[$type] < 1000) {  // 몰수
                         // 몰수 대상
-                        $query = "select no,{$type} from general where nation='{$general['nation']}' and no!='{$general['no']}' and {$type}>3000 order by {$type} desc limit 0,1";
-                        $result = MYDB_query($query, $connect) or Error("processAI10 ".MYDB_error($connect),"");
-                        $SelGen = MYDB_fetch_array($result);
-                        if($SelGen['no'] != 0) {
-                            $amount = intdiv($SelGen[$type], 5000)*10 + 10;
-                            if($amount > 100) $amount = 100;
+                        list($npcGenID, $npcGenValue) = $db->queryFirstList(
+                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND %b>3000 AND npc >= 2 ORDER BY %b DESC LIMIT 1',
+                            $type,
+                            $general['nation'],
+                            $type,
+                            $type
+                        );
+
+                        list($userGenID, $userGenValue) = $db->queryFirstList(
+                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND %b>3000 AND npc < 2 ORDER BY %b DESC LIMIT 1',
+                            $type,
+                            $general['nation'],
+                            $type,
+                            $type
+                        );
+
+                        if($npcGenID === null && $userGenID === null){
+                            $genID = 0;
+                            $genValue = 0;
+                        }
+                        else if($npcGenID === null || $userGenValue > $npcGenValue * 4){
+                            $genID = $userGenID;
+                            $genValue = $userGenValue;
+                        }
+                        else{
+                            $genID = $npcGenID;
+                            $genValue = $npcGenValue;
+                        }
+
+                        if($genID){
+                            $amount = min(100, intdiv($genValue, 5000)*10 + 10);
                             // 몰수
-                            $command = EncodeCommand($type2, $SelGen['no'], $amount, 24);    // 금,쌀 1000단위 몰수
+                            $command = EncodeCommand($type2, $genID, $amount, 24);    // 금,쌀 1000단위 몰수
                         }
                     } else {    // 포상
                         // 포상 대상
-                        $query = "select no from general where nation='{$general['nation']}' and no!='{$general['no']}' and killturn>=5 order by {$type} limit 0,1";
-                        $result = MYDB_query($query, $connect) or Error("processAI10 ".MYDB_error($connect),"");
-                        $SelGen = MYDB_fetch_array($result);
-                        if($SelGen['no'] != 0) {
-                            $amount = intdiv(($nation[$type]-GameConst::$baserice), 5000)*10 + 10;
-                            if($amount > 100) $amount = 100;
+                        list($npcGenID, $npcGenValue) = $db->queryFirstList(
+                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND npc >= 2 ORDER BY %b ASC LIMIT 1',
+                            $type,
+                            $general['nation'],
+                            $type,
+                            $type
+                        );
+
+                        list($userGenID, $userGenValue) = $db->queryFirstList(
+                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND npc < 2 ORDER BY %b ASC LIMIT 1',
+                            $type,
+                            $general['nation'],
+                            $type,
+                            $type
+                        );
+
+                        if($npcGenID === null && $userGenID === null){
+                            $genID = 0;
+                            $genValue = 0;
+                        }
+                        else if($npcGenID === null || $userGenValue < $npcGenValue * 3){
+                            $genID = $userGenID;
+                            $genValue = $userGenValue;
+                        }
+                        else{
+                            $genID = $npcGenID;
+                            $genValue = $npcGenValue;
+                        }
+
+                        if ($genID) {
+                            $amount = min(100, intdiv(($nation[$type]-GameConst::$baserice), 5000)*10 + 10);
                             // 포상
-                            $command = EncodeCommand($type2, $SelGen['no'], $amount, 23);    // 금 1000단위 포상
+                            $command = EncodeCommand($type2, $genID, $amount, 23);    // 금,쌀 1000단위 포상
                         }
                     }
                 }

From 61244fcef9cd7e052d8d404aee8956f9e1d2f4cc Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 21:17:39 +0900
Subject: [PATCH 035/184] =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=95=9C=20=EC=BB=A4?=
 =?UTF-8?q?=EB=B0=8B=EC=97=90=EC=84=9C=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20npc=20=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index ab1aa607..acba93d8 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -627,15 +627,12 @@ function processAI($no) {
 
                         if($npcGenID === null && $userGenID === null){
                             $genID = 0;
-                            $genValue = 0;
                         }
                         else if($npcGenID === null || $userGenValue < $npcGenValue * 3){
                             $genID = $userGenID;
-                            $genValue = $userGenValue;
                         }
                         else{
                             $genID = $npcGenID;
-                            $genValue = $npcGenValue;
                         }
 
                         if ($genID) {

From 3f21e28ef790c04271b8247dec3b13698259fde7 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 21:24:00 +0900
Subject: [PATCH 036/184] =?UTF-8?q?=EC=9C=A0=EC=A0=80=EC=97=90=EA=B2=8C=20?=
 =?UTF-8?q?=ED=8F=AC=EC=83=81=EB=9F=89=EC=9D=B4=20=ED=99=95=EC=8B=A4?=
 =?UTF-8?q?=ED=9E=88=20=EB=8D=94=20=EB=A7=8E=EC=95=84=EC=A7=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index acba93d8..f6c3a445 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -636,7 +636,13 @@ function processAI($no) {
                         }
 
                         if ($genID) {
-                            $amount = min(100, intdiv(($nation[$type]-GameConst::$baserice), 5000)*10 + 10);
+                            if($genID === $npcGenID){
+                                $amount = min(100, intdiv(($nation[$type]-GameConst::$baserice), 5000)*10 + 10);
+                            }
+                            else{
+                                $amount = min(100, intdiv(($nation[$type]-GameConst::$baserice), 2000)*10 + 10);
+                            }
+                            
                             // 포상
                             $command = EncodeCommand($type2, $genID, $amount, 23);    // 금,쌀 1000단위 포상
                         }

From 1c853107b7556caa6d34f4a4d010585d507fffa2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 21:38:56 +0900
Subject: [PATCH 037/184] =?UTF-8?q?=EB=B6=88=EA=B0=80=EC=B9=A8=20=EC=A0=9C?=
 =?UTF-8?q?=EC=9D=98=20=EC=84=9C=EC=8B=A0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process_chief.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php
index a1349db4..275e96b6 100644
--- a/hwe/func_process_chief.php
+++ b/hwe/func_process_chief.php
@@ -644,7 +644,7 @@ function process_61(&$general) {
         Message::MSGTYPE_DIPLOMACY,
         $src,
         $dest,
-        "{$srcNation['name']}의 불가침 제의 서신",
+        "{$srcNation['name']}의 {$when}년 불가침 제의 서신",
         $now,
         $validUntil,
         [

From 9bcd18c42e86fbb59291e09a23d37c16fa664c40 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 21:42:09 +0900
Subject: [PATCH 038/184] =?UTF-8?q?=EB=AA=A8,=EC=A7=95=EB=B3=91=EC=8B=9C?=
 =?UTF-8?q?=20=ED=8A=B9=EC=84=B1=20=EB=B3=91=EC=A2=85=EC=9D=B4=202000=20?=
 =?UTF-8?q?=EB=A7=8C=20=EB=84=98=EC=96=B4=EB=8F=84=20=EB=9C=A8=EB=8A=94=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_converter.php       | 3 ---
 hwe/sammo/GameUnitDetail.php | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/hwe/func_converter.php b/hwe/func_converter.php
index 83e25176..83d45e69 100644
--- a/hwe/func_converter.php
+++ b/hwe/func_converter.php
@@ -397,9 +397,6 @@ function getBill(int $dedication) : int{
 }
 
 function getCost(int $armtype) : int {
-    //FIXME: 정말로 side effect가 없으려면 query는 밖으로 이동해야함.
-    //TODO: 병종 값이 column으로 들어있는건 전혀 옳지 않음. key->value 형태로 바꿔야함
-
     return GameUnitConst::byID($armtype)->cost;
 }
 
diff --git a/hwe/sammo/GameUnitDetail.php b/hwe/sammo/GameUnitDetail.php
index 25ca54f6..c43e65df 100644
--- a/hwe/sammo/GameUnitDetail.php
+++ b/hwe/sammo/GameUnitDetail.php
@@ -68,7 +68,7 @@ class GameUnitDetail{
             if(!key_exists($this->recruitCondition, $ownCities)){
                 return false;
             }
-            if($cityLevel == '특'){
+            if($cityLevel == CityConst::$levelMap['특']){
                 if ($tech < 3000) {
                     return false;
                 }

From 0df12931396479099f785eac75d0a6e68f64005f Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 21:46:26 +0900
Subject: [PATCH 039/184] =?UTF-8?q?=EC=B2=B4=EA=B2=B0=20=EB=A9=94=EC=8B=9C?=
 =?UTF-8?q?=EC=A7=80=EC=97=90=EB=8F=84=20=EB=85=84=EB=8F=84=20=EB=9C=A8?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/DiplomaticMessage.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php
index 86f16628..b60494f9 100644
--- a/hwe/sammo/DiplomaticMessage.php
+++ b/hwe/sammo/DiplomaticMessage.php
@@ -16,6 +16,7 @@ class DiplomaticMessage extends Message{
 
     protected $diplomaticType = '';
     protected $diplomacyName = '';
+    protected $diplomacyDetail = '';
     protected $validDiplomacy = true;
 
     public function __construct(
@@ -77,6 +78,8 @@ class DiplomaticMessage extends Message{
             return [self::INVALID, '올바르지 않은 불가침 서신입니다.'];
         }
 
+        $this->diplomacyDetail = "{$year}년";
+
         $helper = new Engine\Diplomacy($this->src->nationID, $this->dest->nationID);
         $chk = $helper->noAggression($year, $option);
         if($chk[0] !== self::ACCEPTED){
@@ -294,7 +297,7 @@ class DiplomaticMessage extends Message{
             self::MSGTYPE_NATIONAL, 
             $this->dest, 
             $this->src, 
-            "【외교】{$year}년 {$month}월: {$this->src->nationName}이 {$this->dest->nationName}에게 제안한 {$this->diplomacyName} 동의.",
+            "【외교】{$year}년 {$month}월: {$this->src->nationName}이 {$this->dest->nationName}에게 제안한 {$this->diplomacyDetail}{$this->diplomacyName} 동의.",
             new \DateTime(),
             new \DateTime('9999-12-31'),
             [

From 915c5fcd8ed9adc09c4c87997f6c63c1428dab68 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 21:51:44 +0900
Subject: [PATCH 040/184] =?UTF-8?q?npc=20=EB=AA=B0=ED=8F=AC=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index f6c3a445..095b118d 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -577,6 +577,7 @@ function processAI($no) {
                             'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND %b>3000 AND npc >= 2 ORDER BY %b DESC LIMIT 1',
                             $type,
                             $general['nation'],
+                            $general['no'],
                             $type,
                             $type
                         );
@@ -585,6 +586,7 @@ function processAI($no) {
                             'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND %b>3000 AND npc < 2 ORDER BY %b DESC LIMIT 1',
                             $type,
                             $general['nation'],
+                            $general['no'],
                             $type,
                             $type
                         );
@@ -613,6 +615,7 @@ function processAI($no) {
                             'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND npc >= 2 ORDER BY %b ASC LIMIT 1',
                             $type,
                             $general['nation'],
+                            $general['no'],
                             $type,
                             $type
                         );
@@ -621,6 +624,7 @@ function processAI($no) {
                             'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND npc < 2 ORDER BY %b ASC LIMIT 1',
                             $type,
                             $general['nation'],
+                            $general['no'],
                             $type,
                             $type
                         );

From 94583076121d98f20407a3c90abc5e84a463534a Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 21:55:22 +0900
Subject: [PATCH 041/184] =?UTF-8?q?=EC=82=AC=EB=A0=B9=EB=B6=80=20=ED=91=9C?=
 =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_chiefcenter.php | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/hwe/b_chiefcenter.php b/hwe/b_chiefcenter.php
index b5dbe4e4..f1e91411 100644
--- a/hwe/b_chiefcenter.php
+++ b/hwe/b_chiefcenter.php
@@ -58,13 +58,17 @@ $nation = MYDB_fetch_array($result);
 
 $lv = getNationChiefLevel($nation['level']);
 $turn = [];
-$gen = [[],[],[],[],[],[],[],[],[],[],[],[]];
+
 for($i=12; $i >= $lv; $i--) {
     $turn[$i] = getCoreTurn($nation, $i);
 
     $query = "select name,turntime,npc from general where level={$i} and nation='{$me['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gen[$i] = MYDB_fetch_array($result);
+    $gen[$i] = MYDB_fetch_array($result)??[
+        'npc'=>0,
+        'name'=>'',
+        'turntime'=>''
+    ];
 }
 
 ?>
@@ -110,31 +114,6 @@ for($i=12; $i >= $lv; $i--) {
 for($k=0; $k < 2; $k++) {
     $l4 = 12 - $k;  $l3 = 10 - $k;  $l2 =  8 - $k;  $l1 =  6 - $k;
 
-    if(!isset($gen[$l4])){
-        $gen[$l4] = [
-            'npc'=>0,
-            'name'=>0
-        ];
-    }
-    if(!isset($gen[$l3])){
-        $gen[$l3] = [
-            'npc'=>0,
-            'name'=>0
-        ];
-    }
-    if(!isset($gen[$l2])){
-        $gen[$l2] = [
-            'npc'=>0,
-            'name'=>0
-        ];
-    }
-    if(!isset($gen[$l1])){
-        $gen[$l1] = [
-            'npc'=>0,
-            'name'=>0
-        ];
-    }
-
     if    ($gen[$l4]['npc'] >= 2) { $gen[$l4]['name'] = "<font color=cyan>".($gen[$l4]['name']??'')."</font>"; }
     elseif($gen[$l4]['npc'] == 1) { $gen[$l4]['name'] = "<font color=skyblue>".($gen[$l4]['name']??'')."</font>"; }
     if    ($gen[$l3]['npc'] >= 2) { $gen[$l3]['name'] = "<font color=cyan>".($gen[$l3]['name']??'')."</font>"; }

From 9ec144e8f6aa37f2b9379928d4de1dd17c894757 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 21:58:01 +0900
Subject: [PATCH 042/184] =?UTF-8?q?=EC=82=AC=EB=A0=B9=EB=B6=80=20=EC=9D=B8?=
 =?UTF-8?q?=EB=8D=B1=EC=8A=A4=20=EB=B2=84=EA=B7=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_chiefcenter.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hwe/b_chiefcenter.php b/hwe/b_chiefcenter.php
index f1e91411..93a66880 100644
--- a/hwe/b_chiefcenter.php
+++ b/hwe/b_chiefcenter.php
@@ -70,6 +70,13 @@ for($i=12; $i >= $lv; $i--) {
         'turntime'=>''
     ];
 }
+for($i= $lv - 1; $i>=5; $i--){
+    $gen[$i] = [
+        'npc'=>0,
+        'name'=>'',
+        'turntime'=>''
+    ];
+}
 
 ?>
 <!DOCTYPE html>

From d550415b65398953ff451cda870dafd85b779178 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 22:00:11 +0900
Subject: [PATCH 043/184] =?UTF-8?q?=EC=84=B8=EC=85=98=20=EC=84=A4=EC=A0=95?=
 =?UTF-8?q?=EC=8B=9C=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sammo/Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sammo/Session.php b/src/sammo/Session.php
index 97ff110d..bd88ab20 100644
--- a/src/sammo/Session.php
+++ b/src/sammo/Session.php
@@ -121,7 +121,7 @@ class Session
 
     public function __set(string $name, $value)
     {
-        if (key_exists($name, $this->PROTECED_NAMES)) {
+        if (key_exists($name, self::PROTECTED_NAMES)) {
             trigger_error("{$name}은 외부에서 쓰기 금지된 Session 변수입니다.", E_USER_NOTICE);
             return;
         }

From e709ee5db81425843bd36fa8ba08ff9e684a5af3 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 22:03:01 +0900
Subject: [PATCH 044/184] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?=
 =?UTF-8?q?array=5Fget=20=EC=82=AD=EC=A0=9C.=20=EB=AA=A8=EB=B3=91=20?=
 =?UTF-8?q?=EC=B9=B8=20=EB=B2=84=ED=8A=BC=EC=9D=84=20=EC=A7=95=EB=B3=91->?=
 =?UTF-8?q?=EB=AA=A8=EB=B3=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/processing.php             | 2 +-
 oauth_kakao/j_join_process.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hwe/processing.php b/hwe/processing.php
index ac79fc63..465494b2 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -594,7 +594,7 @@ function calc(cost, formnum) {
 <form name=form{$i} action=c_double.php>
     <td valign=center>
         <input type=text name=double maxlength=3 size=3 value=$crew style=text-align:right;color:white;background-color:black>00명<input type=button value=계산 onclick='calc($baseCost, $i)'><br>
-        <input type=text name=cost maxlength=5 size=5 readonly style=text-align:right;color:white;background-color:black>원 <input type=submit value=징병>
+        <input type=text name=cost maxlength=5 size=5 readonly style=text-align:right;color:white;background-color:black>원 <input type=submit value=모병>
         <input type=hidden name=third value={$i}>
         <input type=hidden name=command value=$command>";
 
diff --git a/oauth_kakao/j_join_process.php b/oauth_kakao/j_join_process.php
index 76fd4e2a..da51e1e7 100644
--- a/oauth_kakao/j_join_process.php
+++ b/oauth_kakao/j_join_process.php
@@ -18,10 +18,10 @@ if($canJoin != 'Y'){
 
 $nowDate = TimeUtil::DatetimeNow();
 
-$access_token = Util::array_get($session->access_token);
-$expires = Util::array_get($session->expires);
-$refresh_token = Util::array_get($session->refresh_token);
-$refresh_token_expires = Util::array_get($session->refresh_token_expires);
+$access_token = $session->access_token;
+$expires = $session->expires;
+$refresh_token = $session->refresh_token;
+$refresh_token_expires = $session->refresh_token_expires;
 if(!$access_token){
     Json::die([
         'result'=>false,

From 2c382da773d6d982ca1eb6194972896082dccc11 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 22:05:58 +0900
Subject: [PATCH 045/184] =?UTF-8?q?=EB=B6=80=EB=8C=80=EA=B0=80=20=EC=97=86?=
 =?UTF-8?q?=EB=8D=94=EB=9D=BC=EB=8F=84=20=EB=B6=80=EB=8C=80=20=EA=B0=80?=
 =?UTF-8?q?=EC=9E=85=20=EB=B2=84=ED=8A=BC=EC=9D=B4=20=EB=9C=A8=EB=8A=94=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_troop.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hwe/b_troop.php b/hwe/b_troop.php
index 91fbe6e7..ab2a0016 100644
--- a/hwe/b_troop.php
+++ b/hwe/b_troop.php
@@ -123,7 +123,9 @@ for($i=0; $i < $troopcount; $i++) {
     }
 }
 
-if($me['troop'] == 0) {
+if ($troopcount == 0) {
+}
+else if($me['troop'] == 0) {
     echo"
 <input type=submit name=btn value='부 대 가 입'>";
 } else {

From 0e650da34a0dbd5bb9a9338f1a104fc16a6f8e19 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 22:16:59 +0900
Subject: [PATCH 046/184] =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=EC=B0=BD=20?=
 =?UTF-8?q?=EC=A0=95=EB=A0=AC.=20=EB=AA=B0/=ED=8F=AC=201200,=201500=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/css/msg.css    | 15 ++++++++++++++-
 hwe/processing.php | 10 ++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/hwe/css/msg.css b/hwe/css/msg.css
index 25c372a6..88414a94 100644
--- a/hwe/css/msg.css
+++ b/hwe/css/msg.css
@@ -75,19 +75,32 @@
     color:white;
 }
 
+.message_input_form{
+    position:relative;
+}
+
 #msg_input{
     color:white;
     background-color:black;
     font-size:12px;
-    width:720px;
+    width:715px;
+    margin:0 2px;
     height:15px;
 }
 
+#msg_submit{
+    position:absolute;
+    right:0;
+    margin-right:2px;
+}
+
 #mailbox_list{
+    float:left;
     color:white;
     background-color:black;
     font-size:12px;
     width:160px;
+    height:20px;
 }
 
 .board_header{
diff --git a/hwe/processing.php b/hwe/processing.php
index 465494b2..893ad56d 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -860,6 +860,8 @@ function command_23($turn, $command) {
     <option value=8>800</option>
     <option value=9>900</option>
     <option value=10>1000</option>
+    <option value=12>1200</option>
+    <option value=15>1500</option>
     <option value=20>2000</option>
     <option value=30>3000</option>
     <option value=40>4000</option>
@@ -935,6 +937,8 @@ function command_24($turn, $command) {
     <option value=8>800</option>
     <option value=9>900</option>
     <option value=10>1000</option>
+    <option value=12>1200</option>
+    <option value=15>1500</option>
     <option value=20>2000</option>
     <option value=30>3000</option>
     <option value=40>4000</option>
@@ -1448,6 +1452,8 @@ function command_43($turn, $command) {
     <option value=8>800</option>
     <option value=9>900</option>
     <option value=10>1000</option>
+    <option value=12>1200</option>
+    <option value=15>1500</option>
     <option value=20>2000</option>
     <option value=30>3000</option>
     <option value=40>4000</option>
@@ -1496,6 +1502,8 @@ function command_44($turn, $command) {
     <option value=8>800</option>
     <option value=9>900</option>
     <option value=10>1000</option>
+    <option value=12>1200</option>
+    <option value=15>1500</option>
     <option value=20>2000</option>
     <option value=30>3000</option>
     <option value=40>4000</option>
@@ -1720,6 +1728,8 @@ function command_49($turn, $command) {
     <option value=8>800</option>
     <option value=9>900</option>
     <option value=10>1000</option>
+    <option value=12>1200</option>
+    <option value=15>1500</option>
     <option value=20>2000</option>
     <option value=30>3000</option>
     <option value=40>4000</option>

From df26c511b5659c6d5ac8095cb53b4c11720c7674 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 22:18:39 +0900
Subject: [PATCH 047/184] =?UTF-8?q?=EA=B8=88=EC=8C=80=202500=EB=8B=A8?=
 =?UTF-8?q?=EC=9C=84=EB=8F=84=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/processing.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hwe/processing.php b/hwe/processing.php
index 893ad56d..71c900c4 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -863,6 +863,7 @@ function command_23($turn, $command) {
     <option value=12>1200</option>
     <option value=15>1500</option>
     <option value=20>2000</option>
+    <option value=25>2500</option>
     <option value=30>3000</option>
     <option value=40>4000</option>
     <option value=50>5000</option>
@@ -940,6 +941,7 @@ function command_24($turn, $command) {
     <option value=12>1200</option>
     <option value=15>1500</option>
     <option value=20>2000</option>
+    <option value=25>2500</option>
     <option value=30>3000</option>
     <option value=40>4000</option>
     <option value=50>5000</option>
@@ -1455,6 +1457,7 @@ function command_43($turn, $command) {
     <option value=12>1200</option>
     <option value=15>1500</option>
     <option value=20>2000</option>
+    <option value=25>2500</option>
     <option value=30>3000</option>
     <option value=40>4000</option>
     <option value=50>5000</option>
@@ -1505,6 +1508,7 @@ function command_44($turn, $command) {
     <option value=12>1200</option>
     <option value=15>1500</option>
     <option value=20>2000</option>
+    <option value=25>2500</option>
     <option value=30>3000</option>
     <option value=40>4000</option>
     <option value=50>5000</option>
@@ -1731,6 +1735,7 @@ function command_49($turn, $command) {
     <option value=12>1200</option>
     <option value=15>1500</option>
     <option value=20>2000</option>
+    <option value=25>2500</option>
     <option value=30>3000</option>
     <option value=40>4000</option>
     <option value=50>5000</option>

From 5187ebbf526e6afee214b65d2e6e8259ff9dc19c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 22:34:13 +0900
Subject: [PATCH 048/184] =?UTF-8?q?=EC=B6=94=EB=B0=A9=20=EB=AA=B0=EC=88=98?=
 =?UTF-8?q?=20=EC=84=A0=ED=8F=AC=20=EB=93=B1=20=EC=83=81=ED=99=A9=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=20=EC=95=88=20?=
 =?UTF-8?q?=EB=82=98=ED=83=80=EB=82=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/c_myBossInfo.php       | 18 +++++++++++++++-
 hwe/func.php               | 17 ---------------
 hwe/func_npc.php           | 22 +++++++++++++++----
 hwe/func_process_chief.php | 44 +++++++++++++++++++++++++++++++++++---
 4 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/hwe/c_myBossInfo.php b/hwe/c_myBossInfo.php
index b149ddbb..795b5bdd 100644
--- a/hwe/c_myBossInfo.php
+++ b/hwe/c_myBossInfo.php
@@ -165,7 +165,23 @@ if($btn == "추방") {
             case 4: $str = "날 추방했으니 그 복수로 적국에 정보를 팔아 넘겨야겠군요. 그럼 이만."; break;
             }
 
-            PushMsg(1, 0, $general['picture'], $general['imgsvr'], "{$general['name']}:", $nation['color'], $nation['name'], $nation['color'], $str);
+            $src = new MessageTarget(
+                $general['no'], 
+                $general['name'],
+                $general['nation'],
+                $nation['name'],
+                $nation['color'],
+                GetImageURL($general['imgsvr'], $general['picture'])
+            );
+            $msg = new Message(
+                Message::MSGTYPE_PUBLIC, 
+                $src,
+                $src,
+                $str,
+                new \DateTime(),
+                new \DateTime('9999-12-31')
+            );
+            $msg->send();
         }
 
         //국가 기술력 그대로
diff --git a/hwe/func.php b/hwe/func.php
index 6ada2b7d..62207e58 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1126,23 +1126,6 @@ function nationMsg() {
     echo "<font color=orange>".$nation['msg']."</font>";
 }
 
-
-function PushMsg($type, $nation, $picture, $imgsvr, $from, $fromcolor, $to, $tocolor, $msg) {
-    if($nation == 0) { $nation = 0; }
-    if($fromcolor == "") { $fromcolor = "#FFFFFF"; }
-    if($to == "") { $to = "재야"; }
-    if($tocolor == "") { $tocolor = "#FFFFFF"; }
-
-    $date = date('Y-m-d H:i:s');
-    if($type == 1) { $file = "_all_msg.txt"; }
-    else { $file = "_nation_msg{$nation}.txt"; }
-    $fp = fopen(__dir__."/logs/{$file}", "a");
-    //로그 파일에 기록
-    $str = "{$type}|".StringUtil::padStringAlignRight($from,12," ")."|".StringUtil::padStringAlignRight($to,12," ")."|".$date."|".$msg."|".$fromcolor."|".$tocolor."|".$picture."|".$imgsvr;
-    fwrite($fp, "{$str}\n");
-    fclose($fp);
-}
-
 function msgprint($msg, $name, $picture, $imgsvr, $when, $num, $type) {
     $db = DB::db();
     $connect=$db->get();
diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 095b118d..5e741a2f 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -286,10 +286,24 @@ function processAI($no) {
     case 6: $term = 30; break;
     case 7: $term = 60; break;
     }
-    if($general['npcid'] == 2000 && rand()%(24*$term) < 6) {
-        PushMsg(1, 0, $general['picture'], $general['imgsvr'], "{$general['name']}:", $nation['color'], $nation['name'], $nation['color'], $general['npcmsg']);
-    } elseif($general['npcmsg'] != "" && rand()%(24*$term) < 3) {
-        PushMsg(1, 0, $general['picture'], $general['imgsvr'], "{$general['name']}:", $nation['color'], $nation['name'], $nation['color'], $general['npcmsg']);
+    if($general['npcmsg'] != "" && rand()%(24*$term) < 3) {
+        $src = new MessageTarget(
+            $general['no'], 
+            $general['name'],
+            $general['nation'],
+            $nation['name'],
+            $nation['color'],
+            GetImageURL($general['imgsvr'], $general['picture'])
+        );
+        $msg = new Message(
+            Message::MSGTYPE_PUBLIC, 
+            $src,
+            $src,
+            $general['npcmsg'],
+            new \DateTime(),
+            new \DateTime('9999-12-31')
+        );
+        $msg->send();
     }
 
     //재야인경우
diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php
index 275e96b6..fac6e7b4 100644
--- a/hwe/func_process_chief.php
+++ b/hwe/func_process_chief.php
@@ -173,7 +173,23 @@ function process_24(&$general) {
             case 4: $str = "몰수로 인한 사기 저하는 몰수로 얻은 물자보다 더 손해란걸 모른단 말인가!"; break;
             }
 
-            PushMsg(1, 0, $gen['picture'], $gen['imgsvr'], "{$gen['name']}:", $nation['color'], $nation['name'], $nation['color'], $str);
+            $src = new MessageTarget(
+                $gen['no'], 
+                $gen['name'],
+                $gen['nation'],
+                $nation['name'],
+                $nation['color'],
+                GetImageURL($gen['imgsvr'], $gen['picture'])
+            );
+            $msg = new Message(
+                Message::MSGTYPE_PUBLIC, 
+                $src,
+                $src,
+                $str,
+                new \DateTime(),
+                new \DateTime('9999-12-31')
+            );
+            $msg->send();
         }
 
         $genlog[] = "<C>●</>$dtype {$amount}을 몰수 당했습니다.";
@@ -759,8 +775,30 @@ function process_62(&$general) {
         $msg = "【외교】{$admin['year']}년 {$admin['month']}월:{$younation['name']}에 선전포고";
         $youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:{$nation['name']}에서 선전포고";
 
-        PushMsg(2, $nation['nation'], $general['picture'], $general['imgsvr'], "{$general['name']}:{$nation['name']}▶", $nation['color'], $younation['name'], $younation['color'], $msg);
-        PushMsg(3, $younation['nation'], $general['picture'], $general['imgsvr'], "{$general['name']}:{$nation['name']}▶", $nation['color'], $younation['name'], $younation['color'], $youmsg);
+        $src = new MessageTarget(
+            $general['no'], 
+            $general['name'],
+            $general['nation'],
+            $nation['name'],
+            $nation['color'],
+            GetImageURL($general['imgsvr'], $general['picture'])
+        );
+        $dest = new MessageTarget(
+            0,
+            '',
+            $younation['nation'],
+            $younation['name'],
+            $younation['color']
+        );
+        $msg = new Message(
+            Message::MSGTYPE_NATIONAL, 
+            $src,
+            $dest,
+            $str,
+            new \DateTime($general['turntime']),
+            new \DateTime('9999-12-31')
+        );
+        $msg->send(true);
     }
 
     pushWorldHistory($history, $admin['year'], $admin['month']);

From e701540d7f2b34f10753ebd8d3371ea4acc33c82 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 22:37:00 +0900
Subject: [PATCH 049/184] =?UTF-8?q?=EC=99=B8=EA=B5=90=20=EC=84=9C=EC=8B=A0?=
 =?UTF-8?q?=20(=EC=9D=B4)=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/DiplomaticMessage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php
index b60494f9..6d4ea7fc 100644
--- a/hwe/sammo/DiplomaticMessage.php
+++ b/hwe/sammo/DiplomaticMessage.php
@@ -297,7 +297,7 @@ class DiplomaticMessage extends Message{
             self::MSGTYPE_NATIONAL, 
             $this->dest, 
             $this->src, 
-            "【외교】{$year}년 {$month}월: {$this->src->nationName}이 {$this->dest->nationName}에게 제안한 {$this->diplomacyDetail}{$this->diplomacyName} 동의.",
+            "【외교】{$year}년 {$month}월: {$this->src->nationName}(이)가 {$this->dest->nationName}에게 제안한 {$this->diplomacyDetail}{$this->diplomacyName} 동의.",
             new \DateTime(),
             new \DateTime('9999-12-31'),
             [

From 7fea0a41c62a216aa1855643c3b5f66bde771ce8 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 22:57:38 +0900
Subject: [PATCH 050/184] =?UTF-8?q?=EC=A7=80=EB=8F=84=20=EC=88=98=EC=A4=80?=
 =?UTF-8?q?=EC=9D=84=20=EC=97=86=EC=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/a_history.php       |  2 +-
 hwe/a_status.php        |  2 +-
 hwe/b_diplomacy.php     |  2 +-
 hwe/b_myPage.php        | 17 +++--------------
 hwe/index.php           |  2 +-
 hwe/select_npc_post.php |  1 -
 hwe/sql/schema.sql      |  3 +--
 7 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/hwe/a_history.php b/hwe/a_history.php
index 14a2ff9c..fd8354ad 100644
--- a/hwe/a_history.php
+++ b/hwe/a_history.php
@@ -21,7 +21,7 @@ $query = "select startyear,year,month,conlimit from game limit 1";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $admin = MYDB_fetch_array($result);
 
-$query = "select map,con,turntime from general where owner='{$userID}'";
+$query = "select con,turntime from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
diff --git a/hwe/a_status.php b/hwe/a_status.php
index bde3892f..b5951a47 100644
--- a/hwe/a_status.php
+++ b/hwe/a_status.php
@@ -17,7 +17,7 @@ $query = "select conlimit from game limit 1";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 
-$query = "select map,con,turntime from general where owner='{$userID}'";
+$query = "select con,turntime from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
 
diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php
index f91cc616..b7abc682 100644
--- a/hwe/b_diplomacy.php
+++ b/hwe/b_diplomacy.php
@@ -16,7 +16,7 @@ $query = "select turnterm from game limit 1";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 
-$query = "select no,nation,map from general where owner='{$userID}'";
+$query = "select no,nation from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
 
diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php
index eb3cbde5..56a82064 100644
--- a/hwe/b_myPage.php
+++ b/hwe/b_myPage.php
@@ -5,18 +5,13 @@ include "lib.php";
 include "func.php";
 
 $btn = Util::getReq('btn');
-$map = Util::getReq('map', 'int', 0);
 $mode = Util::getReq('mode', 'int', 2);
 $tnmt = Util::getReq('tnmt', 'int', 1);
 
 extractMissingPostToGlobals();
 
-if($map < 0 || $map > 2){
-    $map = 0;
-}
-
-if($mode < 0 || $mode > 2){
-    $mode = 2;
+if($mode < 0 || $mode > 1){
+    $mode = 1;
 }
 
 if($tnmt < 0 || $tnmt > 1){
@@ -51,13 +46,12 @@ if ($btn == "설정저장" && $me['myset'] > 0) {
 
     $db->update('general', [
         'myset'=>$db->sqleval('myset-1'),
-        'map'=>$map,
         'mode'=>$mode,
         'tnmt'=>$tnmt
     ], 'owner=%i', $userID);
 }
 
-$query = "select no,map,mode,tnmt,myset from general where owner='{$userID}'";
+$query = "select no,mode,tnmt,myset from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
@@ -91,11 +85,6 @@ function go(type) {
         </td>
         <td width=50% valign=top>
             <form name=form1 action=b_myPage.php method=post>
-                &nbsp;&nbsp;&nbsp;&nbsp;지도수준 【
-                <input type=radio name=map value=0 <?=$me['map']==0?"checked":""; ?>>상세
-                <input type=radio name=map value=1 <?=$me['map']==1?"checked":""; ?>>간단
-                <input type=radio name=map value=2 <?=$me['map']==2?"checked":""; ?>>생략
-                】<br><br>
                 &nbsp;&nbsp;&nbsp;&nbsp;토너먼트 【
                 <input type=radio name=tnmt value=0 <?=$me['tnmt']==0?"checked":""; ?>>수동참여
                 <input type=radio name=tnmt value=1 <?=$me['tnmt']==1?"checked":""; ?>>자동참여
diff --git a/hwe/index.php b/hwe/index.php
index 942cb9ba..96174ff4 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -18,7 +18,7 @@ if (!$userID) {
 }
 
 $me = $db->queryFirstRow(
-    'SELECT no,con,turntime,newmsg,newvote,map from general where owner = %i',
+    'SELECT no,con,turntime,newmsg,newvote from general where owner = %i',
     $userID
 );
 
diff --git a/hwe/select_npc_post.php b/hwe/select_npc_post.php
index 5fb153b3..489d0970 100644
--- a/hwe/select_npc_post.php
+++ b/hwe/select_npc_post.php
@@ -101,7 +101,6 @@ $db->update('general', [
     'npc'=>1,
     'killturn'=>6,
     'mode'=>2,
-    'map'=>0,
     'owner'=>$userID
 ], 'no=%i and npc=2', $npcID);
 $affected = $db->affectedRows();
diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index ae9a5185..d3014e4c 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -80,7 +80,6 @@ CREATE TABLE `general` (
 	`specage2` INT(2) NULL DEFAULT '0',
 	`mode` INT(1) NULL DEFAULT '2',
 	`tnmt` INT(1) NULL DEFAULT '1',
-	`map` INT(1) NULL DEFAULT '0',
 	`myset` INT(1) NULL DEFAULT '3',
 	`tournament` INT(1) NULL DEFAULT '0',
 	`vote` INT(1) NULL DEFAULT '0',
@@ -152,7 +151,7 @@ CREATE TABLE `general` (
 	`recturn` CHAR(14) NULL DEFAULT '',
 	`resturn` CHAR(14) NULL DEFAULT '',
 	PRIMARY KEY (`no`),
-	INDEX `nation` (`nation`),
+	INDEX `nation` (`nation`, `npc`)
 	INDEX `city` (`city`),
 	INDEX `turntime` (`turntime`, `no`),
 	INDEX `no_member` (`owner`),

From 7a3064d37b32961a5cf6df3009b1c86d69a7d4d0 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 23:16:05 +0900
Subject: [PATCH 051/184] =?UTF-8?q?=EC=B2=A9=EB=B3=B4=EC=8B=9C=20=EB=B3=91?=
 =?UTF-8?q?=EC=A2=85=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/hwe/func_process.php b/hwe/func_process.php
index 789612a7..30209b1e 100644
--- a/hwe/func_process.php
+++ b/hwe/func_process.php
@@ -1683,7 +1683,16 @@ function process_31(&$general) {
         $typecount = [];
         for($i=0; $i < $gencount; $i++) {
             $gen = MYDB_fetch_array($result);
-            if($gen['crew'] != 0) { $typecount[$gen['crewtype']]++; $crew += $gen['crew']; }
+            if($gen['crew'] != 0) {
+                if(!key_exists($gen['crewtype'], $typecount)){
+                    $typecount[$gen['crewtype']] = 1;
+                }
+                else{
+                    $typecount[$gen['crewtype']]+=1;
+                }
+                
+                $crew += $gen['crew'];
+            }
         }
         if(!key_exists($destination, $dist)) {
             $alllog[] = "<C>●</>{$admin['month']}월:누군가가 <G><b>{$city['name']}</b></>(을)를 살피는 것 같습니다.";
@@ -1699,13 +1708,9 @@ function process_31(&$general) {
             $log[] = "<C>●</>{$admin['month']}월:<G><b>{$city['name']}</b></>의 많은 정보를 얻었습니다. <1>$date</>";
             $msg[] = "【<S>병종</>】";
 
-            foreach(GameUnitConst::all() as $unit){
-                if($typecount[$unit->id] == 0){
-                    continue;
-                }
-
-                $unitStr = mb_substr($unit->name, 0, 2); 
-                $msg[] = "{$unitStr}:{$typecount[$unit->id]}";
+            foreach($typecount as $crewtype->$cnt){
+                $crewtypeText = mb_substr(GameUnitConst::byID($crewtype)->name, 0, 2);
+                $msg[] = "{$crewtypeText}:{$cnt}";
             }
 
             $log[] = join(' ', $msg);

From 20fd52b32d49fde1ed0290e375650447c1f758a2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 23:17:55 +0900
Subject: [PATCH 052/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/ScoutMessage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php
index dc818e82..6167f5c1 100644
--- a/hwe/sammo/ScoutMessage.php
+++ b/hwe/sammo/ScoutMessage.php
@@ -167,8 +167,8 @@ class ScoutMessage extends Message{
         }
 
         $db = DB::db();
-        $srcGeneral = $db->queryFirstRow('SELECT `name`, nation FROM nation WHERE `no`=%i', $srcGeneralID);
-        $destGeneral = $db->queryFirstRow('SELECT `name`, nation, `level` FROM nation WHERE `no`=%i', $destGeneralID);
+        $srcGeneral = $db->queryFirstRow('SELECT `name`, nation FROM general WHERE `no`=%i', $srcGeneralID);
+        $destGeneral = $db->queryFirstRow('SELECT `name`, nation, `level` FROM general WHERE `no`=%i', $destGeneralID);
         if($date === null){
             $date = new \DateTime();
         }

From 63000bdd224c028f8c32517c7c2188613148b260 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 23:18:55 +0900
Subject: [PATCH 053/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/ScoutMessage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php
index 6167f5c1..e2f7dd0f 100644
--- a/hwe/sammo/ScoutMessage.php
+++ b/hwe/sammo/ScoutMessage.php
@@ -32,7 +32,7 @@ class ScoutMessage extends Message{
             $this->validScout = false;
         }
 
-        if($this->validUntil <= new DateTime()){
+        if($this->validUntil <= new \DateTime()){
             $this->validScout = false;
         }
     }

From 002b7ae5342b2815a066e89d2c55e557a5762a1c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 23:20:47 +0900
Subject: [PATCH 054/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process_personnel.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/hwe/func_process_personnel.php b/hwe/func_process_personnel.php
index 1dcfdddb..345601cd 100644
--- a/hwe/func_process_personnel.php
+++ b/hwe/func_process_personnel.php
@@ -47,16 +47,8 @@ function process_22(&$general) {
         $ded = CharDedication($ded, $general['personal']);
 
         $msg = ScoutMessage::buildScoutMessage($general['no'], $who, $reason);
+        $msg->send();
         
-/*
-        sendScoutMsg([
-            'id' => $general['no'],
-            'nation_id' => Util::array_get($general['nation'], 0)
-        ],[
-            'id' => $you['no'],
-            'nation_id' => Util::array_get($you['nation'], 0)
-        ],$date);
- */
         $general['intel2']++;
         $query = "update general set resturn='SUCCESS',gold=gold-'$cost',intel2='{$general['intel2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

From 44ed61c14eb17bd48dc4798d22b02c8365e25e4a Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 23:24:33 +0900
Subject: [PATCH 055/184] =?UTF-8?q?touchmode=20=EC=82=AD=EC=A0=9C=20?=
 =?UTF-8?q?=EB=8B=A4=EB=A5=B8=20=EB=B0=A9=EC=95=88=EC=9D=84=20=EC=B0=BE?=
 =?UTF-8?q?=EC=95=84=EB=B3=B4=EB=8A=94=EA=B1=B8=EB=A1=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/js/map.js | 71 +--------------------------------------------------
 1 file changed, 1 insertion(+), 70 deletions(-)

diff --git a/hwe/js/map.js b/hwe/js/map.js
index 8cdc9d02..615eb905 100644
--- a/hwe/js/map.js
+++ b/hwe/js/map.js
@@ -366,65 +366,8 @@ function reloadWorldMap(option){
 
         var $map_body = $('.world_map .map_body');
 
-        //터치스크린 탭
-
-        $objs.on('touchstart', function(e){
-            var $this = $(this);
-            
-            var touchMode = $this.data('touchMode');
-            if($tooltip_city.data('target') != $this.data('id')){
-                $this.data('touchMode', 1);
-            }
-            else if(touchMode === undefined){
-                $this.data('touchMode', 1);
-            }
-            else{
-                $this.data('touchMode', touchMode + 1);
-            }
-            $map_body.data('touchMode', 1);
-
-            $tooltip_city.data('target', $this.data('id'));
-            
-            
-        });
-        
-        $objs.on('touchend', function(e){    
-            var $this = $(this);
-            var position = $this.parent().position();
-            $tooltip_city.html($this.data('text'));
-            
-            var nation_text = $this.data('nation');
-            if(nation_text){
-                $tooltip_nation.html(nation_text).show();
-            }
-            else{
-                $tooltip_nation.html('').hide();
-            }
-            
-            $tooltip.css({'top': position.top + 25, 'left': position.left + 35}).show();
-            
-            var touchMode = $this.data('touchMode');
-            if(touchMode <= 1){
-                return false;
-            }
-
-            //xxx: touchend 다음 click 이벤트가 갈 수도 있고, 안 갈 수도 있다.
-            $this.data('touchMode', 0);
-        });
-
-        $map_body.on('touchend',function(e){
-            
-            //위의 touchend bind에 해당하지 않는 경우 -> 빈 지도 터치
-            $tooltip.hide();
-        });
-
         //Mouse over 모드 작동
-
         $map_body.on('mousemove', function(e){
-            if($(this).data('touchMode')){
-                return true;
-            }
-
             var parentOffset = $map_body.offset(); 
             var relX = e.pageX - parentOffset.left;
             var relY = e.pageY - parentOffset.top;
@@ -433,10 +376,6 @@ function reloadWorldMap(option){
         });
 
         $objs.on('mouseenter', function(e){
-            if($map_body.data('touchMode')){
-                return true;
-            }
-            
             var $this = $(this);
 
             $tooltip_city.data('target', $this.data('id'));
@@ -457,15 +396,7 @@ function reloadWorldMap(option){
         });
 
         $objs.on('click', function(e){
-            //xxx: touchend 다음 click 이벤트가 갈 수도 있고, 안 갈 수도 있다.
-            var touchMode = $(this).data('touchMode');
-            if(touchMode === undefined){
-                return;
-            }
-
-            if(touchMode === 1){
-                return false;
-            }
+            return;
         });
 
 

From 00bece9c9c03dabcfd377da7bc8ee246544c3c70 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 23:42:27 +0900
Subject: [PATCH 056/184] =?UTF-8?q?=EC=9E=84=EA=B4=80=EA=B8=88=EC=A7=80=20?=
 =?UTF-8?q?=EA=B1=B0=EA=BE=B8=EB=A1=9C=EB=90=9C=EA=B2=83=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Engine/Personnel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/sammo/Engine/Personnel.php b/hwe/sammo/Engine/Personnel.php
index 66a878fa..e6f900c8 100644
--- a/hwe/sammo/Engine/Personnel.php
+++ b/hwe/sammo/Engine/Personnel.php
@@ -51,7 +51,7 @@ class Personnel{
             return [ScoutMessage::INVALID, '초반제한 중입니다.'];
         }
         
-        if(!$this->nation['scout']){
+        if($this->nation['scout']){
             return [ScoutMessage::INVALID, '현재 임관금지 중인 국가입니다.'];
         }
 

From c016ea7c52e50c233b950932956214e02f1efcc8 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 23:44:17 +0900
Subject: [PATCH 057/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Engine/Personnel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/sammo/Engine/Personnel.php b/hwe/sammo/Engine/Personnel.php
index e6f900c8..ddb4e7c7 100644
--- a/hwe/sammo/Engine/Personnel.php
+++ b/hwe/sammo/Engine/Personnel.php
@@ -67,7 +67,7 @@ class Personnel{
             return [ScoutMessage::DECLINED, '군주는 등용장을 수락할 수 없습니다.'];
         }
 
-        if(strpos($general['nations'], ",{$this->nation['nation']},") >= 0){
+        if(strpos($general['nations'], ",{$this->nation['nation']},") > 0){
             return [ScoutMessage::DECLINED, '이미 임관했었던 국가입니다.'];
         }
 

From 2a4e59d6e2c9e97d102774139323512b7e88aa14 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 23:44:49 +0900
Subject: [PATCH 058/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95(=EC=9E=84=EA=B4=80=20=EA=B5=AD?=
 =?UTF-8?q?=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Engine/Personnel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/sammo/Engine/Personnel.php b/hwe/sammo/Engine/Personnel.php
index ddb4e7c7..910575a3 100644
--- a/hwe/sammo/Engine/Personnel.php
+++ b/hwe/sammo/Engine/Personnel.php
@@ -67,7 +67,7 @@ class Personnel{
             return [ScoutMessage::DECLINED, '군주는 등용장을 수락할 수 없습니다.'];
         }
 
-        if(strpos($general['nations'], ",{$this->nation['nation']},") > 0){
+        if(strpos($general['nations'], ",{$this->nation['nation']},") !== false){
             return [ScoutMessage::DECLINED, '이미 임관했었던 국가입니다.'];
         }
 

From 10b6a4ff6e89a2f5a248d804973b8ac49e945427 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 23:48:47 +0900
Subject: [PATCH 059/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EA=B3=A0=EC=B9=A8(=EC=86=A1=EC=8B=A0=EC=9E=90?=
 =?UTF-8?q?=EC=97=90=EA=B2=8C=EB=8F=84=20=EA=B0=90)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process_personnel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/func_process_personnel.php b/hwe/func_process_personnel.php
index 345601cd..b809cfb8 100644
--- a/hwe/func_process_personnel.php
+++ b/hwe/func_process_personnel.php
@@ -47,7 +47,7 @@ function process_22(&$general) {
         $ded = CharDedication($ded, $general['personal']);
 
         $msg = ScoutMessage::buildScoutMessage($general['no'], $who, $reason);
-        $msg->send();
+        $msg->send(true);
         
         $general['intel2']++;
         $query = "update general set resturn='SUCCESS',gold=gold-'$cost',intel2='{$general['intel2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";

From 20a475466d1cac34bec69b6d2df96734fd145d44 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 18 Apr 2018 23:54:48 +0900
Subject: [PATCH 060/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20'?=
 =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EC=95=88=20=ED=83=80=EC=A7=80?=
 =?UTF-8?q?=EB=8A=94'=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Engine/Personnel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/Engine/Personnel.php b/hwe/sammo/Engine/Personnel.php
index 910575a3..c6b574d0 100644
--- a/hwe/sammo/Engine/Personnel.php
+++ b/hwe/sammo/Engine/Personnel.php
@@ -100,7 +100,7 @@ class Personnel{
         $isTroopLeader = false;
         if($general['troop']){
             $troopLeader = $db->queryFirstField('SELECT `no` FROM troop WHERE troop = %i', $general['troop']);
-            if($troopLeader == $receiverID){
+            if($troopLeader == $generalID){
                 $isTroopLeader = true;
             }
         }
@@ -183,7 +183,7 @@ class Personnel{
             $setValues['killturn'] = $killturn;
         }
 
-        $db->update('general', $setValues, 'no=%i', $receiverID);
+        $db->update('general', $setValues, 'no=%i', $generalID);
         $db->update('general', $setSenderValues, 'no=%i', $this->src->generalID);
         $db->update('nation', $setOriginalNationValues, 'nation=%i', $general['nation']);
         $db->update('nation', $setScoutNationValues, 'nation=%i', $this->nation['nation']);

From 91273522c0fd137b10118d60b4449b4384d23f81 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 00:03:46 +0900
Subject: [PATCH 061/184] =?UTF-8?q?=EC=98=A4=ED=83=88=EC=9E=90=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/func_process.php b/hwe/func_process.php
index 30209b1e..12c049b1 100644
--- a/hwe/func_process.php
+++ b/hwe/func_process.php
@@ -1708,7 +1708,7 @@ function process_31(&$general) {
             $log[] = "<C>●</>{$admin['month']}월:<G><b>{$city['name']}</b></>의 많은 정보를 얻었습니다. <1>$date</>";
             $msg[] = "【<S>병종</>】";
 
-            foreach($typecount as $crewtype->$cnt){
+            foreach($typecount as $crewtype=>$cnt){
                 $crewtypeText = mb_substr(GameUnitConst::byID($crewtype)->name, 0, 2);
                 $msg[] = "{$crewtypeText}:{$cnt}";
             }

From c0ec82051fa2484c859079ad5fd7e27f24f858de Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 00:04:30 +0900
Subject: [PATCH 062/184] =?UTF-8?q?$cities=20=EB=B3=80=EC=88=98=20?=
 =?UTF-8?q?=EC=97=86=EC=9D=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hwe/func_process.php b/hwe/func_process.php
index 12c049b1..0b91c39a 100644
--- a/hwe/func_process.php
+++ b/hwe/func_process.php
@@ -1758,6 +1758,9 @@ function process_31(&$general) {
         { 
             $cities = array_map('intval', explode("|", $nation['spy'])); 
         }
+        else{
+            $cities = [];
+        }
         $exist = 0;
         for($i=0; $i < count($cities); $i++) {
             if(intdiv($cities[$i], 10) == $destination) {

From f6ffc20a238af31c1daa7f8c633f60e31e98b5f6 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 00:10:19 +0900
Subject: [PATCH 063/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EC=9E=A5?=
 =?UTF-8?q?=EC=88=98=EC=97=B4=EC=A0=84=20=EA=B8=B0=EB=A1=9D=20=EC=95=88?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/ScoutMessage.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php
index e2f7dd0f..fc9053e0 100644
--- a/hwe/sammo/ScoutMessage.php
+++ b/hwe/sammo/ScoutMessage.php
@@ -96,6 +96,13 @@ class ScoutMessage extends Message{
             ['no'=>$this->src->generalID], 
             ["<C>●</><Y>{$this->dest->generalName}</> 등용에 성공했습니다."]
         );
+        pushGeneralHistory(
+            ['no'=>$this->src->generalID],
+            ["<C>●</>{$helper->year}년 {$helper->month}월:<Y>{$this->dest->generalName}</> 등용에 성공"]);
+        pushGeneralHistory(
+            ['no'=>$this->dest->generalID],
+            ["<C>●</>{$helper->year}년 {$helper->month}월:<D>{$this->src->nationName}</>(으)로 망명"]
+        );
         pushGeneralPublicRecord(
             ["<C>●</>{$helper->month}월:<Y>{$this->dest->generalName}</>(이)가 <D><b>{$this->src->nationName}</b></>(으)로 <S>망명</>하였습니다."], 
             $helper->year, 

From de9738442422f26a30986f15bbff6894cfa188e2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 00:17:30 +0900
Subject: [PATCH 064/184] =?UTF-8?q?=EB=B2=A0=ED=8C=85=EC=B0=BD=20warning?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_betting.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hwe/b_betting.php b/hwe/b_betting.php
index a1ab5642..43ff0d02 100644
--- a/hwe/b_betting.php
+++ b/hwe/b_betting.php
@@ -184,7 +184,11 @@ for ($i=0; $i < 4; $i++) {
     $cent[$i] = "<font color=white>";
 }
 for ($i=0; $i < 8; $i++) {
-    $general = MYDB_fetch_array($result);
+    $general = MYDB_fetch_array($result)??[
+        'npc'=>0,
+        'name'=>'',
+        'win'=>0
+    ];
     if ($general['name'] == "") {
         $general['name'] = "-";
     }

From 889ced68ed80273c63d27f99964b57b239b67204 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 00:18:31 +0900
Subject: [PATCH 065/184] =?UTF-8?q?=EB=B2=A0=ED=8C=85=EC=9E=A5=20warning?=
 =?UTF-8?q?=20=EC=9A=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_betting.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/hwe/b_betting.php b/hwe/b_betting.php
index 43ff0d02..8ffa78d5 100644
--- a/hwe/b_betting.php
+++ b/hwe/b_betting.php
@@ -102,7 +102,11 @@ for ($i=0; $i < 1; $i++) {
     $cent[$i] = "<font color=white>";
 }
 for ($i=0; $i < 2; $i++) {
-    $general = MYDB_fetch_array($result);
+    $general = MYDB_fetch_array($result)??[
+        'npc'=>0,
+        'name'=>'',
+        'win'=>0
+    ];
     if ($general['name'] == "") {
         $general['name'] = "-";
     }
@@ -143,7 +147,11 @@ for ($i=0; $i < 2; $i++) {
     $cent[$i] = "<font color=white>";
 }
 for ($i=0; $i < 4; $i++) {
-    $general = MYDB_fetch_array($result);
+    $general = MYDB_fetch_array($result)??[
+        'npc'=>0,
+        'name'=>'',
+        'win'=>0
+    ];
     if ($general['name'] == "") {
         $general['name'] = "-";
     }
@@ -229,7 +237,11 @@ for ($i=0; $i < 8; $i++) {
     $cent[$i] = "<font color=white>";
 }
 for ($i=0; $i < 16; $i++) {
-    $general = MYDB_fetch_array($result);
+    $general = MYDB_fetch_array($result)??[
+        'npc'=>0,
+        'name'=>'',
+        'win'=>0
+    ];
     if ($general['name'] == "") {
         $general['name'] = "-";
     }

From 938c819e9aafff2529432b63eab91ab62d87e951 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 00:19:56 +0900
Subject: [PATCH 066/184] =?UTF-8?q?=EB=B2=A0=ED=8C=85=EC=9E=A5=20INF=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_betting.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/hwe/b_betting.php b/hwe/b_betting.php
index 8ffa78d5..4c9a9e1a 100644
--- a/hwe/b_betting.php
+++ b/hwe/b_betting.php
@@ -77,7 +77,11 @@ select { font-family:'굴림'; line-height:100%; }
 $query = "select npc,name,win from tournament where grp>=60 order by grp, grp_no";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 for ($i=0; $i < 1; $i++) {
-    $general = MYDB_fetch_array($result);
+    $general = MYDB_fetch_array($result)??[
+        'npc'=>0,
+        'name'=>'',
+        'win'=>0
+    ];
     if ($general['name'] == "") {
         $general['name'] = "-";
     }
@@ -284,10 +288,12 @@ for ($i=0; $i < 16; $i++) {
 }
 
 for ($i=0; $i < 16; $i++) {
-    $bet[$i]  = @round($admin['bet'] /  $admin["bet{$i}"], 2);
-    if ($bet[$i] == 0) {
+    if($admin["bet{$i}"] == 0){
         $bet[$i] = "∞";
     }
+    else{
+        $bet[$i]  = round($admin['bet'] /  $admin["bet{$i}"], 2);
+    }
 }
 
 for ($i=0; $i < 16; $i++) {

From 3d43690303ce73412e3c1c33f273967e991e349c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 00:22:26 +0900
Subject: [PATCH 067/184] =?UTF-8?q?=ED=9B=88=EC=82=AC=2080=20=EB=AA=BB=20?=
 =?UTF-8?q?=EA=B3=A0=EC=B9=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_myPage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php
index 56a82064..8eb82ff7 100644
--- a/hwe/b_myPage.php
+++ b/hwe/b_myPage.php
@@ -10,8 +10,8 @@ $tnmt = Util::getReq('tnmt', 'int', 1);
 
 extractMissingPostToGlobals();
 
-if($mode < 0 || $mode > 1){
-    $mode = 1;
+if($mode < 0 || $mode > 2){
+    $mode = 2;
 }
 
 if($tnmt < 0 || $tnmt > 1){

From 0beb00c5e5aaf98b91e31b01a48774b028b2c1a9 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 00:26:09 +0900
Subject: [PATCH 068/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=ED=83=88?=
 =?UTF-8?q?=EB=95=8C=20=EC=82=AD=ED=84=B4=20NULL=EB=90=98=EB=8A=94=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Engine/Personnel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/sammo/Engine/Personnel.php b/hwe/sammo/Engine/Personnel.php
index c6b574d0..925b9ec1 100644
--- a/hwe/sammo/Engine/Personnel.php
+++ b/hwe/sammo/Engine/Personnel.php
@@ -180,7 +180,7 @@ class Personnel{
         }
 
         if($me['npc'] < 2){
-            $setValues['killturn'] = $killturn;
+            $setValues['killturn'] = $this->killturn;
         }
 
         $db->update('general', $setValues, 'no=%i', $generalID);

From a4ead74cb25af7811916afab7da175e960bbb064 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 00:27:35 +0900
Subject: [PATCH 069/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=20=EC=9D=B4=EC=83=81=ED=95=98=EA=B2=8C=20=EB=9C=A8?=
 =?UTF-8?q?=EB=8A=94=EA=B2=83=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/ScoutMessage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php
index fc9053e0..4decb80f 100644
--- a/hwe/sammo/ScoutMessage.php
+++ b/hwe/sammo/ScoutMessage.php
@@ -98,10 +98,10 @@ class ScoutMessage extends Message{
         );
         pushGeneralHistory(
             ['no'=>$this->src->generalID],
-            ["<C>●</>{$helper->year}년 {$helper->month}월:<Y>{$this->dest->generalName}</> 등용에 성공"]);
+            "<C>●</>{$helper->year}년 {$helper->month}월:<Y>{$this->dest->generalName}</> 등용에 성공");
         pushGeneralHistory(
             ['no'=>$this->dest->generalID],
-            ["<C>●</>{$helper->year}년 {$helper->month}월:<D>{$this->src->nationName}</>(으)로 망명"]
+            "<C>●</>{$helper->year}년 {$helper->month}월:<D>{$this->src->nationName}</>(으)로 망명"
         );
         pushGeneralPublicRecord(
             ["<C>●</>{$helper->month}월:<Y>{$this->dest->generalName}</>(이)가 <D><b>{$this->src->nationName}</b></>(으)로 <S>망명</>하였습니다."], 

From a8796edbd36942347e4cc1e47ed48045d7104982 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 01:16:38 +0900
Subject: [PATCH 070/184] =?UTF-8?q?=EC=B2=B4=ED=81=AC=20=EB=B0=A9=EC=8B=9D?=
 =?UTF-8?q?=20=EC=9C=A0=ED=98=95=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/join.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/join.js b/js/join.js
index 534d6d4e..4d50dc4d 100644
--- a/js/join.js
+++ b/js/join.js
@@ -98,9 +98,9 @@ $(document).ready( function () {
             url:'j_join_process.php',
             dataType:'json',
             data:{
-                'secret_agree':$('#secret_agree').val(),
-                'secret_agree2':$('#secret_agree2').val(),
-                'third_use':$('#third_use').val(),
+                'secret_agree':$('#secret_agree').prop("checked"),
+                'secret_agree2':$('#secret_agree2').prop("checked"),
+                'third_use':$('#third_use').prop("checked"),
                 'username':$('#username').val(),
                 'password':hash_pw,
                 'nickname':$('#nickname').val(),

From c798ac49b971bddd6e8c07c660370958a7cd0208 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 01:21:28 +0900
Subject: [PATCH 071/184] =?UTF-8?q?=EC=84=A0=ED=8F=AC=20=EB=A9=94=EC=8B=9C?=
 =?UTF-8?q?=EC=A7=80=20=EB=B2=84=EA=B7=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process_chief.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php
index fac6e7b4..5751ef3e 100644
--- a/hwe/func_process_chief.php
+++ b/hwe/func_process_chief.php
@@ -772,8 +772,7 @@ function process_62(&$general) {
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
         //국메로 저장
-        $msg = "【외교】{$admin['year']}년 {$admin['month']}월:{$younation['name']}에 선전포고";
-        $youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:{$nation['name']}에서 선전포고";
+        $text = "【외교】{$admin['year']}년 {$admin['month']}월:{$nation['name']}에서 {$younation['name']}에 선전포고";
 
         $src = new MessageTarget(
             $general['no'], 
@@ -794,7 +793,7 @@ function process_62(&$general) {
             Message::MSGTYPE_NATIONAL, 
             $src,
             $dest,
-            $str,
+            $text,
             new \DateTime($general['turntime']),
             new \DateTime('9999-12-31')
         );

From 2cc2f7eb2312b10750540c877fb4f33754dd475b Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 01:30:31 +0900
Subject: [PATCH 072/184] =?UTF-8?q?NPC=20=EB=AA=B0=EC=88=98=EB=A5=BC=20?=
 =?UTF-8?q?=EB=8D=94=20=EC=9E=98=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 5e741a2f..c0479d1b 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -585,7 +585,7 @@ function processAI($no) {
                     if(rand() % 2 == 0) { $type = "gold"; $type2 = 1; }
                     else { $type = "rice"; $type2 = 2; }
 
-                    if($nation[$type] < 1000) {  // 몰수
+                    if($nation[$type] < $type2*2000) {  // 몰수
                         // 몰수 대상
                         list($npcGenID, $npcGenValue) = $db->queryFirstList(
                             'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND %b>3000 AND npc >= 2 ORDER BY %b DESC LIMIT 1',

From 07130e6022175dcff91d452cee2cec90b25ee21e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 01:38:28 +0900
Subject: [PATCH 073/184] =?UTF-8?q?=EC=84=A0=ED=8F=AC=20=EC=98=B5=EC=85=98?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process_chief.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php
index 5751ef3e..a912f537 100644
--- a/hwe/func_process_chief.php
+++ b/hwe/func_process_chief.php
@@ -795,7 +795,8 @@ function process_62(&$general) {
             $dest,
             $text,
             new \DateTime($general['turntime']),
-            new \DateTime('9999-12-31')
+            new \DateTime('9999-12-31'),
+            []
         );
         $msg->send(true);
     }

From 1ab7b5788579a9e414c476cad4296bf5ec72c703 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 01:40:20 +0900
Subject: [PATCH 074/184] =?UTF-8?q?=EC=88=99=EB=A0=A8=20=EB=8B=A8=EB=A0=A8?=
 =?UTF-8?q?=20=EB=A1=9C=EA=B7=B8=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/func_process.php b/hwe/func_process.php
index 0b91c39a..d4c55c40 100644
--- a/hwe/func_process.php
+++ b/hwe/func_process.php
@@ -1821,7 +1821,7 @@ function process_41(&$general) {
     } elseif($crewexp == 0) {
         $log[] = "<C>●</>{$admin['month']}월:병사가 모자랍니다. 단련 실패. <1>$date</>";
     } else {
-        $type = intdiv($general['crewtype'], 10) * 10;
+        $type = intdiv($general['crewtype'], 10);
         switch($type) {
         case 0: $crewstr = '보병'; break;
         case 1: $crewstr = '궁병'; break;

From 595c11a9a7e7c140cb28d4b1e324808ce0b9c946 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 01:45:35 +0900
Subject: [PATCH 075/184] =?UTF-8?q?NPC=20=EC=82=AC=EB=A0=B9=ED=84=B4?=
 =?UTF-8?q?=EC=9D=B4=20'=EB=AF=B8=EC=84=A4=EC=A0=95'=EC=9D=BC=EB=95=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index c0479d1b..724e3953 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -667,8 +667,10 @@ function processAI($no) {
                     }
                 }
             }
-            $query = "update nation set l{$general['level']}turn0='$command' where nation='{$general['nation']}'";
-            MYDB_query($query, $connect) or Error("processAI09 ".MYDB_error($connect),"");
+            if(isset($command)){
+                $query = "update nation set l{$general['level']}turn0='$command' where nation='{$general['nation']}'";
+                MYDB_query($query, $connect) or Error("processAI09 ".MYDB_error($connect),"");
+            }
         }
     }
 

From 3b6e7c5c2851d5aeecc70f9587d6c8c257096ba2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 01:50:01 +0900
Subject: [PATCH 076/184] =?UTF-8?q?=EB=AA=B0=EC=88=98=20=EC=8B=9C=20NPC=20?=
 =?UTF-8?q?=EB=B0=98=ED=95=AD=20=EC=97=90=EB=9F=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process_chief.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php
index a912f537..87ff34c1 100644
--- a/hwe/func_process_chief.php
+++ b/hwe/func_process_chief.php
@@ -187,7 +187,8 @@ function process_24(&$general) {
                 $src,
                 $str,
                 new \DateTime(),
-                new \DateTime('9999-12-31')
+                new \DateTime('9999-12-31'),
+                []
             );
             $msg->send();
         }

From 8c2f4f9dc972d1dab1271fca1426d0d48a41643f Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 01:51:27 +0900
Subject: [PATCH 077/184] =?UTF-8?q?Message=20=EB=A7=88=EC=A7=80=EB=A7=89?=
 =?UTF-8?q?=20=EC=9D=B8=EC=9E=90=EA=B0=80=20=EC=97=86=EC=97=87=20=E3=85=93?=
 =?UTF-8?q?=ED=84=B0=EC=A7=80=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/c_myBossInfo.php | 3 ++-
 hwe/func_npc.php     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hwe/c_myBossInfo.php b/hwe/c_myBossInfo.php
index 795b5bdd..07ba31d8 100644
--- a/hwe/c_myBossInfo.php
+++ b/hwe/c_myBossInfo.php
@@ -179,7 +179,8 @@ if($btn == "추방") {
                 $src,
                 $str,
                 new \DateTime(),
-                new \DateTime('9999-12-31')
+                new \DateTime('9999-12-31'),
+                []
             );
             $msg->send();
         }
diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 724e3953..3aea1334 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -301,7 +301,8 @@ function processAI($no) {
             $src,
             $general['npcmsg'],
             new \DateTime(),
-            new \DateTime('9999-12-31')
+            new \DateTime('9999-12-31'),
+            []
         );
         $msg->send();
     }

From f33fefd18850b336473358ea1d94bd9d7a45e2bb Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 01:53:02 +0900
Subject: [PATCH 078/184] =?UTF-8?q?=EB=8F=84=EC=8B=9C=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=ED=84=B4=EC=9D=B4=204=EA=B0=9C=EB=A7=8C=20=EB=B3=B4=EC=9D=B4?=
 =?UTF-8?q?=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_currentCity.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index ca04b706..cc9c80b1 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -307,7 +307,7 @@ for($j=0; $j < $gencount; $j++) {
             <font size=1>";
             $turn = getTurn($general, 1);
 
-            for($i=0; $i < 4; $i++) {
+            for($i=0; $i < 5; $i++) {
                 $k = $i+1;
                 echo "
                     &nbsp;&nbsp;$k : $turn[$i]<br>";

From f872113e994b9615bc2b3019811ccb73cf81f90f Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 01:55:31 +0900
Subject: [PATCH 079/184] =?UTF-8?q?=ED=86=A0=EB=84=88=EB=A8=BC=ED=8A=B8=20?=
 =?UTF-8?q?warning=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/c_tournament.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/c_tournament.php b/hwe/c_tournament.php
index b240ff68..0b5cd2ec 100644
--- a/hwe/c_tournament.php
+++ b/hwe/c_tournament.php
@@ -60,7 +60,7 @@ if($btn == '참가') {
     }
     $map = [];
     for($i=0; $i < 8; $i++) {
-        if($occupied[$i] == 0) {
+        if(!Util::array_get($occupied[$i])) {
             $map[] = $i;
         }
     }

From 4af10fb48538eb8f914ee4c39cd1fbb112e0c798 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 02:34:28 +0900
Subject: [PATCH 080/184] =?UTF-8?q?=EC=9C=A0=EB=8B=88=ED=81=AC=20=EC=95=84?=
 =?UTF-8?q?=EC=9D=B4=ED=85=9C=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index 62207e58..599e2168 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -2186,7 +2186,7 @@ function uniqueItem($general, $log, $vote=0) {
                 $occupied[$gen[$type]] = 1;
             }
             for($i=7; $i <= 26; $i++) {
-                if($occupied[$i] == 0) {
+                if(!Util::array_get($occupied[$i])) {
                     $item[] = $i;
                 }
             }
@@ -2203,13 +2203,13 @@ function uniqueItem($general, $log, $vote=0) {
                 $alllog[0] = "<C>●</>{$game['month']}월:<Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
                 pushGeneralHistory($general, "<C>●</>{$game['year']}년 {$game['month']}월:<C>".getWeapName($it)."</>(을)를 습득");
                 if($vote == 0) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 1) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 2) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 3) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
                 }
                 break;
             case 1:
@@ -2217,13 +2217,13 @@ function uniqueItem($general, $log, $vote=0) {
                 $alllog[0] = "<C>●</>{$game['month']}월:<Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
                 pushGeneralHistory($general, "<C>●</>{$game['year']}년 {$game['month']}월:<C>".getBookName($it)."</>(을)를 습득");
                 if($vote == 0) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 1) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 2) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 3) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
                 }
                 break;
             case 2:
@@ -2231,13 +2231,13 @@ function uniqueItem($general, $log, $vote=0) {
                 $alllog[0] = "<C>●</>{$game['month']}월:<Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
                 pushGeneralHistory($general, "<C>●</>{$game['year']}년 {$game['month']}월:<C>".getHorseName($it)."</>(을)를 습득");
                 if($vote == 0) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 1) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 2) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 3) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
                 }
                 break;
             case 3:
@@ -2245,13 +2245,13 @@ function uniqueItem($general, $log, $vote=0) {
                 $alllog[0] = "<C>●</>{$game['month']}월:<Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
                 pushGeneralHistory($general, "<C>●</>{$game['year']}년 {$game['month']}월:<C>".getItemName($it)."</>(을)를 습득");
                 if($vote == 0) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 1) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 2) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 3) {
-                    $history[0] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
                 }
                 break;
             }

From 0ce5a88e49e513c799ca26c1fe5dd06979843636 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 02:34:38 +0900
Subject: [PATCH 081/184] =?UTF-8?q?NPC=20=EC=B6=94=EB=B0=A9=EC=8B=9C=20war?=
 =?UTF-8?q?ning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/c_myBossInfo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/c_myBossInfo.php b/hwe/c_myBossInfo.php
index 07ba31d8..4dc89fad 100644
--- a/hwe/c_myBossInfo.php
+++ b/hwe/c_myBossInfo.php
@@ -20,7 +20,7 @@ $userID = Session::getUserID();
 $db = DB::db();
 $connect=$db->get();
 
-$query = "select startyear,year,month from game limit 1";
+$query = "select startyear,year,month,scenario from game limit 1";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $admin = MYDB_fetch_array($result);
 

From 20d7e005a084b871fc5f5f7f460c75437ff0188e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 02:34:44 +0900
Subject: [PATCH 082/184] =?UTF-8?q?=EB=8F=84=EC=9B=80=EB=A7=90=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i_other/help.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i_other/help.php b/i_other/help.php
index 7f88f271..02d337e4 100644
--- a/i_other/help.php
+++ b/i_other/help.php
@@ -4,7 +4,7 @@ namespace sammo;
 require(__dir__.'/../vendor/autoload.php');
 
 WebUtil::setHeaderNoCache();
-$category = Util::getReq('category', 0);
+$category = Util::getReq('category', 'int', 0);
 //FIXME: 겨우 category 구분을 위해 php를 써야하는가? JavaScript로 바꾸자
 ?>
 <!DOCTYPE html>

From 2f9d2e2bc27494facbef07c444ffb99f62da7445 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 02:36:11 +0900
Subject: [PATCH 083/184] =?UTF-8?q?=EC=B6=94=EB=B0=A9=EC=8B=9C=20color=20?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=98=EB=8D=98=20=EC=A0=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/c_myBossInfo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/c_myBossInfo.php b/hwe/c_myBossInfo.php
index 4dc89fad..f56dba4f 100644
--- a/hwe/c_myBossInfo.php
+++ b/hwe/c_myBossInfo.php
@@ -80,7 +80,7 @@ if($me['nation'] != $general['nation']){
 }
 
 if($btn == "추방") {
-    $query = "select name,l{$meLevel}set,chemi from nation where nation='{$me['nation']}'";
+    $query = "select name,l{$meLevel}set,chemi,color from nation where nation='{$me['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $nation = MYDB_fetch_array($result);
 

From c1842703d7570e634aba141b986ac3b6b5ad21c1 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 02:43:10 +0900
Subject: [PATCH 084/184] =?UTF-8?q?Session=20ID=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sammo/Session.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sammo/Session.php b/src/sammo/Session.php
index bd88ab20..6bd6de08 100644
--- a/src/sammo/Session.php
+++ b/src/sammo/Session.php
@@ -47,7 +47,8 @@ class Session
         ini_set('session.use_cookies', false);
         ini_set('session.use_trans_sid', false);
         ini_set('session.cache_limiter', "none");
-        session_start($this->sessionID); // second session_start
+        session_id($this->sessionID);
+        session_start(); // second session_start
         $this->writeClosed = false;
         return $this;
     }

From 910526ba449afa5e215e13c93cc10f714833fb43 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 02:50:00 +0900
Subject: [PATCH 085/184] =?UTF-8?q?oauth=20=EB=B2=84=EA=B7=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oauth_kakao/oauth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oauth_kakao/oauth.php b/oauth_kakao/oauth.php
index 7ffe10a9..cd358d33 100644
--- a/oauth_kakao/oauth.php
+++ b/oauth_kakao/oauth.php
@@ -27,7 +27,7 @@ $result = $restAPI->create_access_token($auth_code);
 
 
 if (Util::array_get($result['expires_in'], -1) <= 0) {
-    die('알 수 없는 에러:'.$me['msg']);
+    die('알 수 없는 에러:'.$result['msg']);
 }
 
 $session = Session::getInstance();

From d617203c057a8f89c0932b4c0e7a6ee9cc6624cd Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 02:55:35 +0900
Subject: [PATCH 086/184] =?UTF-8?q?reply=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/c_nationboard.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hwe/c_nationboard.php b/hwe/c_nationboard.php
index 68a0b03f..ba254a09 100644
--- a/hwe/c_nationboard.php
+++ b/hwe/c_nationboard.php
@@ -7,6 +7,7 @@ include "func.php";
 $title = Util::getReq('title');
 $msg = Util::getReq('msg');
 $num = Util::getReq('num', 'int');
+$reply = Util::getReq('reply');
 
 extractMissingPostToGlobals();
 

From 7359237da46e83dffe81fa6e0205ece02a7d4d47 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 02:56:55 +0900
Subject: [PATCH 087/184] =?UTF-8?q?=ED=95=AD=EB=B3=B5=20=EA=B6=8C=EA=B3=A0?=
 =?UTF-8?q?=EC=8B=9C=20divide=200=20=EB=82=98=EC=98=AC=20=EC=88=98=20?=
 =?UTF-8?q?=EC=9E=88=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=9A=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/processing.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/processing.php b/hwe/processing.php
index 71c900c4..ff27ec54 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -1789,7 +1789,7 @@ function command_51($turn, $command) {
     for($i=1; $i <= $count; $i++) {
         $nation = MYDB_fetch_array($result);
 
-        if($myNation['power'] / $nation['power'] <= 3 || !isClose($me['nation'], $nation['nation'])) {
+        if($myNation['power'] <= $nation['power'] * 3 || !isClose($me['nation'], $nation['nation'])) {
             echo "<option style=color:{$nation['color']};background-color:red; value={$nation['nation']}>【 {$nation['name']} 】</option>";
         } else {
             echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";

From f7e3966310484049c11115d1be87870633d631d7 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Thu, 19 Apr 2018 10:35:49 +0900
Subject: [PATCH 088/184] =?UTF-8?q?=EB=B6=80=EC=9A=B4=EC=98=81=EC=9E=90=20?=
 =?UTF-8?q?=EA=B3=84=EC=A0=95=20=EA=B6=8C=ED=95=9C=20=EC=A7=80=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i_entrance/j_server_change_status.php | 2 +-
 i_entrance/j_set_userlist.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/i_entrance/j_server_change_status.php b/i_entrance/j_server_change_status.php
index 4afc66a6..9e6af502 100644
--- a/i_entrance/j_server_change_status.php
+++ b/i_entrance/j_server_change_status.php
@@ -20,7 +20,7 @@ $db = RootDB::db();
 $userGrade = $session->userGrade;
 $session->setReadOnly();
 
-if($userGrade < 6) {
+if($userGrade < 5) {
     Json::die([
         'result'=>'FAIL',
         'msg'=>'운영자 권한이 없습니다.'
diff --git a/i_entrance/j_set_userlist.php b/i_entrance/j_set_userlist.php
index 64969dcb..d16ee794 100644
--- a/i_entrance/j_set_userlist.php
+++ b/i_entrance/j_set_userlist.php
@@ -5,7 +5,7 @@ require(__dir__.'/../vendor/autoload.php');
 
 $session = Session::requireLogin([])->setReadOnly();
 
-if($session->userGrade < 6){
+if($session->userGrade < 5){
     Json::die([
         'result'=>false,
         'reason'=>'운영자 권한이 없습니다.'

From c7560f9113ffe69a5feb0e48a0dfd98591517322 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 20:08:05 +0900
Subject: [PATCH 089/184] =?UTF-8?q?=EC=B2=B4=EC=84=AD=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=84=B8=EC=85=98=20=EC=8B=9C=EA=B0=84=20=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 f_config/config.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/f_config/config.php b/f_config/config.php
index dc8536ff..217c995b 100644
--- a/f_config/config.php
+++ b/f_config/config.php
@@ -7,6 +7,9 @@ mb_internal_encoding("UTF-8");
 mb_http_output('UTF-8');
 mb_regex_encoding('UTF-8'); 
 
+ini_set("session.cache_expire", 10080);      // minutes
+ini_set("session.gc_maxlifetime", 604800);    // seconds
+
 function getFriendlyErrorType($type) 
 { 
     switch($type) 

From 688b839315c49271ad63dfbd1dac45b28a7ba404 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 22:50:40 +0900
Subject: [PATCH 090/184] =?UTF-8?q?=EC=A7=80=EB=8F=84=20=EB=B0=B0=EA=B2=BD?=
 =?UTF-8?q?=20=EA=B7=B8=EB=A6=BC=EC=9D=B4=20=EC=98=AC=EB=B0=94=EB=A5=B4?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/js/map.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/js/map.js b/hwe/js/map.js
index 615eb905..23ac1e9a 100644
--- a/hwe/js/map.js
+++ b/hwe/js/map.js
@@ -84,7 +84,7 @@ function reloadWorldMap(option){
         else if(month <= 6){
             $world_map.addClass('map_summer');
         }
-        else if(month <= 6){
+        else if(month <= 9){
             $world_map.addClass('map_fall');
         }
         else{

From 31468d5425b85d574466bd888ac59076827ac809 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 19 Apr 2018 22:55:11 +0900
Subject: [PATCH 091/184] =?UTF-8?q?=EC=A0=84=EB=A0=A5=EC=A0=84=20=EB=B9=84?=
 =?UTF-8?q?=EC=9C=A8=EC=9D=84=2050%=20->=2040%=EB=A1=9C=20=EB=82=B4?=
 =?UTF-8?q?=EB=A6=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index 599e2168..f1326a77 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1803,8 +1803,8 @@ function triggerTournament() {
 
     //현재 토너먼트 없고, 자동개시 걸려있을때, 40%확률
     if($admin['tournament'] == 0 && $admin['tnmt_trig'] > 0 && rand() % 100 < 40) {
-        $type = rand() % 6; //  0 : 전력전, 1 : 통솔전, 2 : 일기토, 3 : 설전
-        //전력전 50%, 통, 일, 설 각 17%
+        $type = rand() % 5; //  0 : 전력전, 1 : 통솔전, 2 : 일기토, 3 : 설전
+        //전력전 40%, 통, 일, 설 각 20%
         if($type > 3) { $type = 0; }
         startTournament($admin['tnmt_trig'], $type);
     }

From 31d6850e6e3c369edb2aa09658cd4cc0b1536ae9 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 20 Apr 2018 02:17:38 +0900
Subject: [PATCH 092/184] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=A6=AC?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                  |  1 +
 hwe/func_template.php       |  8 +++++++-
 hwe/templates/allButton.php | 32 ++++++++++++++++----------------
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index f160c7b6..b11fcef9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ d_pic/*.png
 
 d_setting/*.php
 */d_setting/*.php
+*/d_setting/templates/*.php
 
 **/old/*
 test.php
diff --git a/hwe/func_template.php b/hwe/func_template.php
index 7d3de5b6..e712dfa7 100644
--- a/hwe/func_template.php
+++ b/hwe/func_template.php
@@ -75,7 +75,13 @@ function allButton() {
         $call = "설문조사";
     }
 
-    $templates = new \League\Plates\Engine('templates');
+    if(\file_exists("d_setting/templates/allButton.php")){
+        $templates = new \League\Plates\Engine('d_setting/templates');
+    }
+    else{
+        $templates = new \League\Plates\Engine('templates');
+    }
+    
 
     return $templates->render('allButton', [
         'call' => $call,
diff --git a/hwe/templates/allButton.php b/hwe/templates/allButton.php
index f8e3d0b2..2c21905a 100644
--- a/hwe/templates/allButton.php
+++ b/hwe/templates/allButton.php
@@ -1,22 +1,22 @@
 <div class="buttonPlate bg1">
     <div>
-        <button class="toolbarButton" onclick="window.open('a_status.php')">세력도</button>
-        <button class="toolbarButton" onclick="window.open('a_kingdomList.php')">세력일람</button>
-        <button class="toolbarButton" onclick="window.open('a_genList.php')">장수일람</button>
-        <button class="toolbarButton" onclick="window.open('a_bestGeneral.php')">명장일람</button>
-        <button class="toolbarButton" onclick="window.open('a_history.php')">연감</button>
-        <button class="toolbarButton" onclick="window.open('a_hallOfFame.php')">명예의전당</button>
-        <button class="toolbarButton" onclick="window.open('a_emperior.php')">왕조일람</button>
-        <button class="toolbarButton" onclick="window.open('a_traffic.php')">접속량정보</button>
+        <a href="a_status.php" target="_blank"><button class="toolbarButton">세력도</button></a>
+        <a href="a_kingdomList.php" target="_blank"><button class="toolbarButton">세력일람</button></a>
+        <a href="a_genList.php" target="_blank"><button class="toolbarButton">장수일람</button></a>
+        <a href="a_bestGeneral.php" target="_blank"><button class="toolbarButton">명장일람</button></a>
+        <a href="a_history.php" target="_blank"><button class="toolbarButton">연감</button></a>
+        <a href="a_hallOfFame.php" target="_blank"><button class="toolbarButton">명예의전당</button></a>
+        <a href="a_emperior.php" target="_blank"><button class="toolbarButton">왕조일람</button></a>
+        <a href="a_traffic.php" target="_blank"><button class="toolbarButton">접속량정보</button></a>
     </div>
     <div>
-        <button class="toolbarButton2" onclick="window.open('/bbs/bbs/board.php?bo_table=0free')">삼모게시판</button>
-        <button class="toolbarButton" onclick="window.open('/bbs/bbs/board.php?bo_table=1news')">삼국일보</button>
-        <button class="toolbarButton" onclick="window.open('/bbs/bbs/board.php?bo_table=2reference')">레퍼런스</button>
-        <button class="toolbarButton" onclick="window.open('/bbs/bbs/board.php?bo_table=3patch')">패치게시판</button>
-        <button class="toolbarButton">-</button>
-        <button class="toolbarButton" onclick="window.open('/bbs/bbs/board.php?bo_table=4donation')">참여게시판</button>
-        <button class="toolbarButton" onclick="window.open('../i_other/help.php')">튜토리얼</button>
-        <button class="toolbarButton" onclick="window.open('<?=$site?>')"><?=$call?></button>
+        <a href="/bbs/board" target="_blank"><button class="toolbarButton2">삼모게시판</button></a>
+        <a href="/bbs/tip" target="_blank"><button class="toolbarButton">팁/강좌</button></a>
+        <a href="/bbs/news" target="_blank"><button class="toolbarButton">삼국 일보</button></a>
+        <a href="/bbs/history2" target="_blank"><button class="toolbarButton">개인 열전</button></a>
+        <a href="/bbs/history3" target="_blank"><button class="toolbarButton">국가 열전</button></a>
+        <a href="/bbs/patch" target="_blank"><button class="toolbarButton">패치 내역</button></a>
+        <a href="../i_other/help.php" target="_blank"><button class="toolbarButton">튜토리얼</button></a>
+        <a href="<?=$site?>" target="_blank"><button class="toolbarButton"><?=$call?></button></a>
     </div>
 </div>

From f2537b20de69c8afbf885ea2d4de89b269f50df0 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 20 Apr 2018 02:19:42 +0900
Subject: [PATCH 093/184] =?UTF-8?q?allButton=20=EC=98=88=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/d_setting/templates/allButton.php.orig | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 hwe/d_setting/templates/allButton.php.orig

diff --git a/hwe/d_setting/templates/allButton.php.orig b/hwe/d_setting/templates/allButton.php.orig
new file mode 100644
index 00000000..2c21905a
--- /dev/null
+++ b/hwe/d_setting/templates/allButton.php.orig
@@ -0,0 +1,22 @@
+<div class="buttonPlate bg1">
+    <div>
+        <a href="a_status.php" target="_blank"><button class="toolbarButton">세력도</button></a>
+        <a href="a_kingdomList.php" target="_blank"><button class="toolbarButton">세력일람</button></a>
+        <a href="a_genList.php" target="_blank"><button class="toolbarButton">장수일람</button></a>
+        <a href="a_bestGeneral.php" target="_blank"><button class="toolbarButton">명장일람</button></a>
+        <a href="a_history.php" target="_blank"><button class="toolbarButton">연감</button></a>
+        <a href="a_hallOfFame.php" target="_blank"><button class="toolbarButton">명예의전당</button></a>
+        <a href="a_emperior.php" target="_blank"><button class="toolbarButton">왕조일람</button></a>
+        <a href="a_traffic.php" target="_blank"><button class="toolbarButton">접속량정보</button></a>
+    </div>
+    <div>
+        <a href="/bbs/board" target="_blank"><button class="toolbarButton2">삼모게시판</button></a>
+        <a href="/bbs/tip" target="_blank"><button class="toolbarButton">팁/강좌</button></a>
+        <a href="/bbs/news" target="_blank"><button class="toolbarButton">삼국 일보</button></a>
+        <a href="/bbs/history2" target="_blank"><button class="toolbarButton">개인 열전</button></a>
+        <a href="/bbs/history3" target="_blank"><button class="toolbarButton">국가 열전</button></a>
+        <a href="/bbs/patch" target="_blank"><button class="toolbarButton">패치 내역</button></a>
+        <a href="../i_other/help.php" target="_blank"><button class="toolbarButton">튜토리얼</button></a>
+        <a href="<?=$site?>" target="_blank"><button class="toolbarButton"><?=$call?></button></a>
+    </div>
+</div>

From 8fe3d0258a8a254519d81a49c56919ecb3330547 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 07:57:26 +0900
Subject: [PATCH 094/184] =?UTF-8?q?=EA=B1=B4=EA=B5=AD=EB=90=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EC=95=98=EC=9D=84=20=EB=95=8C=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_template.php           | 3 ++-
 hwe/templates/commandButton.php | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hwe/func_template.php b/hwe/func_template.php
index e712dfa7..c313a3a0 100644
--- a/hwe/func_template.php
+++ b/hwe/func_template.php
@@ -101,7 +101,7 @@ function commandButton() {
     $db = DB::db();
     $me = $db->queryFirstRow("select no,nation,level,belong from general where owner=%i", $userID);
 
-    $nation = $db->queryFirstRow("select nation,color,secretlimit from nation where nation=%i",$me['nation']);
+    $nation = $db->queryFirstRow("select nation,level,color,secretlimit from nation where nation=%i",$me['nation']);
 
     if($nation['color'] == "") { $nation['color'] = "#000000"; }
 
@@ -125,6 +125,7 @@ function commandButton() {
         'bgColor'=>$bgColor,
         'fgColor'=>$fgColor,
         'meLevel'=>$me['level'],
+        'nationLevel'=>$nation['level'],
         'showSecret'=>$showSecret
     ]);
 }
diff --git a/hwe/templates/commandButton.php b/hwe/templates/commandButton.php
index 9a0c1585..583aa89c 100644
--- a/hwe/templates/commandButton.php
+++ b/hwe/templates/commandButton.php
@@ -2,8 +2,8 @@
     <div>
     <a href='b_nationboard.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>회 의 실</button></a>
     <a href='b_chiefboard.php'><button class='commandButton' <?=$meLevel>=5?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>기 밀 실</button></a>
-    <a href='b_troop.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>부대 편성</button></a>
-    <a href='b_myBossInfo.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>인 사 부</button></a>
+    <a href='b_troop.php'><button class='commandButton' <?=($meLevel>=1&&$nationLevel>=1)?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>부대 편성</button></a>
+    <a href='b_myBossInfo.php'><button class='commandButton' <?=($meLevel>=1&&$nationLevel>=1)?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>인 사 부</button></a>
     <a href='b_dipcenter.php'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>내 무 부</button></a>
     <a href='b_chiefcenter.php'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>사 령 부</button></a>
     <a href='b_genList.php' target='_blank'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>암 행 부</button></a>

From 50582a0e8b3c2cc5855e583e46471a38b08279a6 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 07:57:41 +0900
Subject: [PATCH 095/184] =?UTF-8?q?=EB=82=B4=EB=AC=B4=EB=B6=80=EC=97=90=20?=
 =?UTF-8?q?textarea=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_dipcenter.php | 87 ++++++++++++++++++++++-----------------------
 hwe/c_dipcenter.php | 46 +++++++++++++-----------
 hwe/func_string.php |  2 +-
 3 files changed, 69 insertions(+), 66 deletions(-)

diff --git a/hwe/b_dipcenter.php b/hwe/b_dipcenter.php
index 72d37097..e94afcca 100644
--- a/hwe/b_dipcenter.php
+++ b/hwe/b_dipcenter.php
@@ -55,20 +55,20 @@ if ($me['level'] >= 5) {
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
     <tr><td>내 무 부<br><?=backButton()?></td></tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
     <tr><td colspan=9 align=center bgcolor=blue>외 교 관 계</td></tr>
     <tr>
-        <td width=100 align=center id=bg1>국 가 명</td>
-        <td width=50  align=center id=bg1>국력</td>
-        <td width=40  align=center id=bg1>장수</td>
-        <td width=40  align=center id=bg1>속령</td>
-        <td width=80  align=center id=bg1>상태</td>
-        <td width=60  align=center id=bg1>기간</td>
-        <td width=100 align=center id=bg1>종 료 시 점</td>
-        <td align=center id=bg1>비 고</td>
+        <td width=100 align=center class=bg1>국 가 명</td>
+        <td width=50  align=center class=bg1>국력</td>
+        <td width=40  align=center class=bg1>장수</td>
+        <td width=40  align=center class=bg1>속령</td>
+        <td width=80  align=center class=bg1>상태</td>
+        <td width=60  align=center class=bg1>기간</td>
+        <td width=100 align=center class=bg1>종 료 시 점</td>
+        <td align=center class=bg1>비 고</td>
     </tr>
 <?php
 $query = "select year,month from game limit 1";
@@ -220,65 +220,62 @@ if ($budgetricediff > 0) {
 }
 
 ?>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
 <form name=form1 method=post action=c_dipcenter.php>
     <tr><td colspan=2 height=10></td></tr>
     <tr><td colspan=2 align=center bgcolor=orange>국 가 방 침 &amp; 임관 권유 메세지</td></tr>
-    <tr><td colspan=2 id=bg1>국가 방침 <input type=text <?=$read?> maxlength=500 style=color:white;background-color:black;width:830px; name=msg value='<?=$nation['msg']?>'><input type=<?=$btn?> name=btn value=국가방침></td></tr>
-    <tr><td colspan=2 id=bg1>임관 권유 <input type=text <?=$read?> maxlength=500 style=color:white;background-color:black;width:830px; name=scoutmsg value='<?=$nation['scoutmsg']?>'><input type=<?=$btn?> name=btn value=임관권유></td></tr>
+    <tr><td colspan=2 class=bg1>국가 방침 <textarea <?=$read?> maxlength=1000 rows="5" style="color:white;background-color:black;width:830px;" name=msg><?=$nation['msg']?></textarea><input type=<?=$btn?> name=btn value=국가방침></td></tr>
+    <tr><td colspan=2 class=bg1>임관 권유 <input type=text <?=$read?> maxlength=500 style=color:white;background-color:black;width:830px; name=scoutmsg value='<?=$nation['scoutmsg']?>'><input type=<?=$btn?> name=btn value=임관권유></td></tr>
     <tr><td colspan=2>900 x 200px 넘는 크기를 점유할 시 통보없이 제한될 수 있습니다.</td></tr>
     <tr><td colspan=2 height=10></td></tr>
     <tr><td colspan=2 align=center bgcolor=green>예 산 &amp; 정 책</td></tr>
     <tr>
         <td colspan=2>
-            <table width=998 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-<?php
-echo "
+            <table width=998 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
                 <tr>
-                    <td colspan=2 align=center id=bg1>자금 예산</td>
-                    <td colspan=2 align=center id=bg1>병량 예산</td>
+                    <td colspan=2 align=center class=bg1>자금 예산</td>
+                    <td colspan=2 align=center class=bg1>병량 예산</td>
                 </tr>
                 <tr>
-                    <td width=248 align=right id=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
-                    <td width=248 align=center>{$nation['gold']}</td>
-                    <td width=248 align=right id=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
-                    <td width=248 align=center>{$nation['rice']}</td>
+                    <td width=248 align=right class=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
+                    <td width=248 align=center><?=$nation['gold']?></td>
+                    <td width=248 align=right class=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
+                    <td width=248 align=center><?=$nation['rice']?></td>
                 </tr>
                 <tr>
-                    <td align=right id=bg1>단기수입&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$deadIncome</td>
-                    <td align=right id=bg1>둔전수입&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$riceincomeList[1]</td>
+                    <td align=right class=bg1>단기수입&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center>+<?=$deadIncome?></td>
+                    <td align=right class=bg1>둔전수입&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center>+<?=$riceincomeList[1]?></td>
                 </tr>
                 <tr>
-                    <td align=right id=bg1>세 금&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$goldincomeList[0]</td>
-                    <td align=right id=bg1>세 곡&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$riceincomeList[0]</td>
+                    <td align=right class=bg1>세 금&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center>+<?=$goldincomeList[0]?></td>
+                    <td align=right class=bg1>세 곡&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center>+<?=$riceincomeList[0]?></td>
                 </tr>
                 <tr>
-                    <td align=right id=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$goldincome / -$goldoutcome</td>
-                    <td align=right id=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$riceincome / -$riceoutcome</td>
+                    <td align=right class=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center>+<?=$goldincome?> / -<?=$goldoutcome?></td>
+                    <td align=right class=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center>+<?=$riceincome?> / -<?=$riceoutcome?></td>
                 </tr>
                 <tr>
-                    <td align=right id=bg1>국고 예산&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>{$budgetgold} ({$budgetgolddiff})</td>
-                    <td align=right id=bg1>병량 예산&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>{$budgetrice} ({$budgetricediff})</td>
-                </tr>";
-?>
+                    <td align=right class=bg1>국고 예산&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center><?=$budgetgold?> (<?=$budgetgolddiff?>)</td>
+                    <td align=right class=bg1>병량 예산&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center><?=$budgetrice?> (<?=$budgetricediff?>)</td>
+                </tr>
                 <tr>
-                    <td align=right id=bg1>세율 (5 ~ 30%)&nbsp;&nbsp;&nbsp;</td>
+                    <td align=right class=bg1>세율 (5 ~ 30%)&nbsp;&nbsp;&nbsp;</td>
                     <td align=center><input type=text <?=$read?> name=rate style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['rate']?>>% <input type=<?=$btn?> name=btn value=세율></td>
-                    <td align=right id=bg1>봉급 지급율 (20 ~ 200%)&nbsp;&nbsp;&nbsp;</td>
+                    <td align=right class=bg1>봉급 지급율 (20 ~ 200%)&nbsp;&nbsp;&nbsp;</td>
                     <td align=center><input type=text <?=$read?> name=bill style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['bill']?>>% <input type=<?=$btn?> name=btn value=지급율></td>
                 </tr>
                 <tr>
-                    <td align=right id=bg1>기밀 권한 (1 ~ 99년)&nbsp;&nbsp;&nbsp;</td>
+                    <td align=right class=bg1>기밀 권한 (1 ~ 99년)&nbsp;&nbsp;&nbsp;</td>
                     <td align=center><input type=text <?=$read?> name=secretlimit style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['secretlimit']?>>년 <input type=<?=$btn?> name=btn value=기밀권한></td>
-                    <td align=right id=bg1>임관&전쟁 변경 가능</td>
+                    <td align=right class=bg1>임관&amp;전쟁 변경 가능</td>
                     <td align=center>무제한</td>
                 </tr>
                 <tr>
@@ -307,7 +304,7 @@ if ($nation['war'] == 0) {
     <tr><td colspan=2 height=10></td></tr>
 </form>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
diff --git a/hwe/c_dipcenter.php b/hwe/c_dipcenter.php
index 70d66542..929543ee 100644
--- a/hwe/c_dipcenter.php
+++ b/hwe/c_dipcenter.php
@@ -32,37 +32,43 @@ if($me['level'] < 5) {
 }
 
 if($btn == "국가방침") {
-    $msg = BadTag2Code(addslashes(SQ2DQ($msg)));
-    $query = "update nation set msg='$msg' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $msg == mb_substr($msg, 0, 1000);
+    //$msg = StringUtil::
+    $db->update('nation', [
+        'msg'=>BadTag2Code($msg)
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "임관권유") {
-    $scoutmsg = BadTag2Code(addslashes(SQ2DQ($scoutmsg)));
-    $query = "update nation set scoutmsg='$scoutmsg' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $scoutmsg == mb_substr($msg, 0, 500);
+    $db->update('nation', [
+        'scoutmsg'=>BadTag2Code($scoutmsg)
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "세율") {
     if($rate < 5)  { $rate = 5; }
     if($rate > 30) { $rate = 30; }
     $query = "update nation set rate='$rate' where nation='{$me['nation']}'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 } elseif($btn == "지급율") {
-    if($bill < 20)  { $bill = 20; }
-    if($bill > 200) { $bill = 200; }
-    $query = "update nation set bill='$bill' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $bill = Util::valueFit($bill, 20, 200);
+    $db->update('nation', [
+        'bill'=>$bill
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "기밀권한") {
-    if($secretlimit < 1)   { $secretlimit = 1; }
-    if($secretlimit > 99) { $secretlimit = 99; }
-    $query = "update nation set secretlimit='$secretlimit' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $secretlimit = Util::valueFit($secretlimit, 1, 99);
+    $db->update('nation', [
+        'secretlimit'=>$secretlimit
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "임관 금지") {
-    $query = "update nation set scout='1' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('nation', [
+        'scout'=>1
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "임관 허가") {
-    $query = "update nation set scout='0' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('nation', [
+        'scout'=>0
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "전쟁 금지") {
-    $query = "update nation set war='1' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('nation', [
+        'war'=>1
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "전쟁 허가") {
     $query = "update nation set war='0' where nation='{$me['nation']}'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/hwe/func_string.php b/hwe/func_string.php
index c8219a3a..fb50e16e 100644
--- a/hwe/func_string.php
+++ b/hwe/func_string.php
@@ -27,7 +27,7 @@ function Tag2Code(string $str) {
 function BadTag2Code(string $str) {
     /* FIXME: 제대로된 tag 변환 코드 사용 */
     $str = str_replace("<script", "<sorry", $str);
-    $str = str_replace("<embed", "<sorry", $str);
+    $str = str_replace("</script", "</sorry", $str);
     return $str;
 }
 

From fb1ae6ea8822f26f72fa3110b9cae6cb12acd115 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 08:56:54 +0900
Subject: [PATCH 096/184] =?UTF-8?q?=ED=88=AC=ED=91=9C=EC=9C=A8=20=EC=95=88?=
 =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/a_vote.php | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/hwe/a_vote.php b/hwe/a_vote.php
index 0ee75066..14d4ff64 100644
--- a/hwe/a_vote.php
+++ b/hwe/a_vote.php
@@ -198,22 +198,19 @@ if ($admin['voteopen'] >= 1 || $session->userGrade >= 5) {
                 <tr>
     ";
 
-    $memCount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
-    if ($memCount == 0) {
-        $memCount = 1;
-    }
+    $memCount = max(1, $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2'));
 
     $totalVote = [];
-    $nationVoteCount = [[0]];
-    $nationVote = [[]];
+    $nationVoteCount = [];
+    $nationVote = [];
 
     foreach ($db->query("SELECT nation, vote, count(`no`) as cnt FROM general WHERE npc<2 GROUP BY nation, vote") as $row) {
         $nation = $row['nation'];
-        $vote = $row['vote'];
+        $ownVote = $row['vote'];
         $cnt = $row['cnt'];
 
-        if (!isset($totalVote[$vote])) {
-            $totalVote[$vote] = 0;
+        if (!isset($totalVote[$ownVote])) {
+            $totalVote[$ownVote] = 0;
         }
 
         if (!isset($nationVoteCount[$nation])) {
@@ -221,20 +218,20 @@ if ($admin['voteopen'] >= 1 || $session->userGrade >= 5) {
             $nationVote[$nation] = [];
         }
 
-        if (!isset($nationVote[$nation][$vote])) {
-            $nationVote[$nation][$vote] = 0;
+        if (!isset($nationVote[$nation][$ownVote])) {
+            $nationVote[$nation][$ownVote] = 0;
         }
 
-        $totalVote[$vote] += $cnt;
+        $totalVote[$ownVote] += $cnt;
         $nationVoteCount[$nation] += $cnt;
-        $nationVote[$nation][$vote] += $cnt;
+        $nationVote[$nation][$ownVote] += $cnt;
     }
 
     for ($i=0; $i < $voteTypeCount; $i++) {
-        $per = round(($totalVote[$i]??0) / $memCount * 100, 1);
+        $per = round(($totalVote[$i]??0) * 100 / $memCount, 1);
 //        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
         echo "
-                    <td width={$per}% align=center style=color:".getNewColor($i)."; bgcolor=".getVoteColor($i).">{$totalVote[$i]}</td>
+        <td width={$per}% align=center style=color:".getNewColor($i)."; bgcolor=".getVoteColor($i).">{$totalVote[$i]}</td>
         ";
     }
 
@@ -293,8 +290,16 @@ if ($admin['voteopen'] >= 2 || $session->userGrade >= 5) {
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
         $memCount = MYDB_num_rows($result);
 
+        
+
         $voteCount = $nationVoteCount[$nation['nation']] ?? 0;
-        $percentage = round($voteCount / $memCount * 100, 1);
+        if($memCount == 0){
+            $percentage = 100;
+        }
+        else{
+            $percentage = round($voteCount / $memCount * 100, 1);
+        }
+        
 
         echo "
     <tr>

From 5b6f456d5ce669431c9a1b50d2a22afa4873bc9f Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 10:15:04 +0900
Subject: [PATCH 097/184] =?UTF-8?q?=EB=8F=84=EC=8B=9C=20=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_currentCity.php         | 260 ++++++++++++++++++++++------------
 hwe/func_command.php          |   1 +
 hwe/func_template.php         |  32 +++++
 hwe/templates/cityGeneral.php |  53 +++++++
 4 files changed, 254 insertions(+), 92 deletions(-)
 create mode 100644 hwe/templates/cityGeneral.php

diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index cc9c80b1..53c6ec29 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -25,6 +25,8 @@ $query = "select nation,level,spy from nation where nation='{$me['nation']}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $myNation = MYDB_fetch_array($result);
 
+$templates = new \League\Plates\Engine('templates');
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -34,15 +36,28 @@ $myNation = MYDB_fetch_array($result);
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <link href="../d_shared/common.css" rel="stylesheet">
 <link href="css/common.css" rel="stylesheet">
+<style>
+#general_list tr td{
+    text-align:center;
+}
 
+#general_list tr td:last-child{
+    text-align:left;
+    padding-left:1em;
+}
+
+.general_turn_text{
+    font-size:x-small;
+}
+</style>
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
     <tr><td>도 시 정 보<br><?=backButton()?></td></tr>
 </table>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
     <tr>
         <td width=998>
             <form name=cityselect method=get>도시선택 :
@@ -160,44 +175,44 @@ if($city['trade'] == 0) {
 }
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
     <tr><td><?=backButton()?></td></tr>
 </table>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
+<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg2>
     <tr>
         <td colspan=12 align=center style=color:"<?=newColor($nation['color'])?>"; bgcolor=<?=$nation['color']?>>【 <?=CityConst::$regionMap[$city['region']]?> | <?=CityConst::$levelMap[$city['level']]?> 】 <?=$city['name']?></td>
     </tr>
     <tr>
-        <td align=center width=48 id=bg1>주민</td>
+        <td align=center width=48 class=bg1>주민</td>
         <td align=center width=112><?=$city['pop']?>/<?=$city['pop2']?></td>
-        <td align=center width=48 id=bg1>농업</td>
+        <td align=center width=48 class=bg1>농업</td>
         <td align=center width=108><?=$city['agri']?>/<?=$city['agri2']?></td>
-        <td align=center width=48 id=bg1>상업</td>
+        <td align=center width=48 class=bg1>상업</td>
         <td align=center width=108><?=$city['comm']?>/<?=$city['comm2']?></td>
-        <td align=center width=48 id=bg1>치안</td>
+        <td align=center width=48 class=bg1>치안</td>
         <td align=center width=108><?=$city['secu']?>/<?=$city['secu2']?></td>
-        <td align=center width=48 id=bg1>수비</td>
+        <td align=center width=48 class=bg1>수비</td>
         <td align=center width=108><?=$city['def']?>/<?=$city['def2']?></td>
-        <td align=center width=48 id=bg1>성벽</td>
+        <td align=center width=48 class=bg1>성벽</td>
         <td align=center width=108><?=$city['wall']?>/<?=$city['wall2']?></td>
     </tr>
     <tr>
-        <td align=center id=bg1>민심</td>
+        <td align=center class=bg1>민심</td>
         <td align=center><?=$city['rate']?></td>
-        <td align=center id=bg1>시세</td>
+        <td align=center class=bg1>시세</td>
         <td align=center><?=$city['trade']?>%</td>
-        <td align=center id=bg1>인구</td>
+        <td align=center class=bg1>인구</td>
         <td align=center><?=round($city['pop']/$city['pop2']*100, 2)?>%</td>
-        <td align=center id=bg1>태수</td>
+        <td align=center class=bg1>태수</td>
         <td align=center><?=$gen1['name']??'-'?></td>
-        <td align=center id=bg1>군사</td>
+        <td align=center class=bg1>군사</td>
         <td align=center><?=$gen2['name']??'-'?></td>
-        <td align=center id=bg1>시중</td>
+        <td align=center class=bg1>시중</td>
         <td align=center><?=$gen3['name']??'-'?></td>
     </tr>
     <tr>
-        <td align=center id=bg1>장수</td>
+        <td align=center class=bg1>장수</td>
         <td colspan=11>
 <?php
     $query = "select name, npc from general where city='{$city['city']}' and nation='{$city['nation']}'";    // 장수 목록
@@ -212,6 +227,26 @@ if($city['trade'] == 0) {
         </td>
     </tr>
 </table>
+
+
+<br>
+<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
+<thead>
+    <tr>
+        <td width=64 align=center class=bg1>얼 굴</td>
+        <td width=98 align=center class=bg1>이 름</td>
+        <td width=48 align=center class=bg1>통솔</td>
+        <td width=48 align=center class=bg1>무력</td>
+        <td width=48 align=center class=bg1>지력</td>
+        <td width=78 align=center class=bg1>관 직</td>
+        <td width=28 align=center class=bg1>守</td>
+        <td width=78 align=center class=bg1>병 종</td>
+        <td width=78 align=center class=bg1>병 사</td>
+        <td width=48 align=center class=bg1>훈련</td>
+        <td width=48 align=center class=bg1>사기</td>
+        <td width=310 align=center class=bg1>명 령</td>
+    </tr></thead><tbody class='bg0' id='general_list'>
+
 <?php
 $query = "select npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level,nation,crewtype,crew,train,atmos,term,turn0,turn1,turn2,turn3,turn4,turn5 from general where city='{$city['city']}' order by dedication desc";    // 장수 목록
 $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -224,66 +259,116 @@ foreach(getAllNationStaticInfo() as $nation){
     $nationlevel[$nation['nation']] = $nation['level'];
 }
 
-if($gencount != 0) {
-    echo "
-<br>
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=64 align=center id=bg1>얼 굴</td>
-        <td width=98 align=center id=bg1>이 름</td>
-        <td width=48 align=center id=bg1>통솔</td>
-        <td width=48 align=center id=bg1>무력</td>
-        <td width=48 align=center id=bg1>지력</td>
-        <td width=78 align=center id=bg1>관 직</td>
-        <td width=28 align=center id=bg1>守</td>
-        <td width=78 align=center id=bg1>병 종</td>
-        <td width=78 align=center id=bg1>병 사</td>
-        <td width=48 align=center id=bg1>훈련</td>
-        <td width=48 align=center id=bg1>사기</td>
-        <td width=310 align=center id=bg1>명 령</td>
-    </tr>";
-}
 
 for($j=0; $j < $gencount; $j++) {
     $general = MYDB_fetch_array($genresult);
 
+    $nationInfo = getNationStaticInfo($general['nation']);
+
+    if($general['nation'] != 0 && $general['nation'] == $myNation['nation']){
+        $ourGeneral = true;
+    }
+    else{
+        $ourGeneral = false;
+    }
+
+    $isNPC = $general['npc']>1;
+    $wounded = $general['injury'];
+    
+
+    $name = $general['name'];
+    $nameText = formatName($name, $general['npc']);
+
+    $leadership = $general['leader'];
+    $power = $general['power'];
+    $intel = $general['intel'];
+
+    $leadershipText = formatWounded($leadership, $general['injury']);
+    $powerText = formatWounded($power, $general['injury']);
+    $intelText = formatWounded($intel, $general['injury']);
+
+    $level = $general['level'];
+    $levelText = getLevel($general['level']);
+
     if($general['level'] == 12) {
-        $lbonus = $nationlevel[$general['nation']] * 2;
+        $leadershipBonus = $nationInfo['level'] * 2;
     } elseif($general['level'] >= 5) {
-        $lbonus = $nationlevel[$general['nation']];
+        $leadershipBonus = $nationInfo['level'];
     } else {
-        $lbonus = 0;
+        $leadershipBonus = 0;
     }
-    if($lbonus > 0) {
-        $lbonus = "<font color=cyan>+{$lbonus}</font>";
-    } else {
-        $lbonus = "";
+    $leadershipBonusText = formatLeadershipBonus($leadershipBonus);
+
+    if($ourGeneral){
+        $defenceMode = $general['mode'];
+        $defenceModeText = formatDefenceMode($defenceMode);
+        $crewType = $general['crewtype'];
+        $crewTypeText = GameUnitConst::byId($crewType)->name;
+        $crew = $general['crew'];
+        $train = $general['train'];
+        $atmos = $general['atmos'];
+    }
+    else{
+        $defenceMode = 0;
+        $defenceModeText = '';
+        $crewType = 0;
+        $crewTypeText = '';
+        $crew = $general['crew'];
+        $train = -1;
+        $atmos = -1;
     }
 
-    if($general['injury'] > 0) {
-        $leader = intdiv($general['leader'] * (100 - $general['injury']), 100);
-        $power = intdiv($general['power'] * (100 - $general['injury']), 100);
-        $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
-        $leader = "<font color=red>{$leader}</font>{$lbonus}";
-        $power = "<font color=red>{$power}</font>";
-        $intel = "<font color=red>{$intel}</font>";
-    } else {
-        $leader = "{$general['leader']}{$lbonus}";
-        $power = "{$general['power']}";
-        $intel = "{$general['intel']}";
-    }
+    $nation = $general['nation'];
+    $nationName = $nationInfo['name'];
 
-    if($general['npc'] >= 2) { $general['name'] = "<font color=cyan>{$general['name']}</font>"; }
-    elseif($general['npc'] == 1) { $general['name'] = "<font color=skyblue>{$general['name']}</font>"; }
-    $imageTemp = GetImageURL($general['imgsvr']);
+    if($ourGeneral && !$isNPC){
+        $turnText = [];
+        foreach(getTurn($general, 1) as $turnIdx=>$turn){
+            $turnText[] = "{$turnIdx} : $turn";
+        }
+        $turnText = join('<br>', $turnText);
+    }
+    else{
+        $turnText = '';
+    }
+    
+    echo $templates->render('cityGeneral', [
+        'ourGeneral'=>$ourGeneral,
+        'isNPC'=>$isNPC,
+        'wounded'=>$wounded,
+        'name'=>$name,
+        'nameText'=>$nameText,
+        'leadership'=>$leadership,
+        'leadershipText'=>$leadershipText,
+        'leadershipBonus'=>$leadershipBonus,
+        'leadershipBonusText'=>$leadershipBonusText,
+        'level'=>$level,
+        'levelText'=>$levelText,
+        'power'=>$power,
+        'powerText'=>$powerText,
+        'intel'=>$intel,
+        'intelText'=>$intelText,
+        'defenceMode'=>$defenceMode,
+        'defenceModeText'=>$defenceModeText,
+        'crewType'=>$crewType,
+        'crewTypeText'=>$crewTypeText,
+        'crew'=>$crew,
+        'train'=>$train,
+        'atmos'=>$atmos,
+        'nation'=>$nation,
+        'nationName'=>$nationName,
+        'turnText'=>$turnText
+    ]);
+
+/*
     echo "
     <tr>
-        <td align=center height=64></td>
-        <td align=center>{$general['name']}</td>
-        <td align=center>$leader</td>
-        <td align=center>$power</td>
-        <td align=center>$intel</td>
-        <td align=center>".getLevel($general['level'])."</td>";
+        <td height=64></td>
+        <td>{$general['name']}</td>
+        <td>$leadership</td>
+        <td>$power</td>
+        <td>$intel</td>
+        <td>".getLevel($general['level'])."</td>";
     //아국장수이거나 보는 사람이 운영자일때 보여줌
     if(($general['nation'] != 0 && $general['nation'] == $myNation['nation']) || $session->userGrade >= 5) {
         switch($general['mode']) {
@@ -293,54 +378,45 @@ for($j=0; $j < $gencount; $j++) {
         }
 
         echo "
-        <td align=center>$mode</td>
-        <td align=center>".GameUnitConst::byId($general['crewtype'])->name."</td>
-        <td align=center>{$general['crew']}</td>
-        <td align=center>{$general['train']}</td>
-        <td align=center>{$general['atmos']}</td>";
+        <td>$mode</td>
+        <td>".GameUnitConst::byId($general['crewtype'])->name."</td>
+        <td>{$general['crew']}</td>
+        <td>{$general['train']}</td>
+        <td>{$general['atmos']}</td>";
         if($general['npc'] >= 2) {
             echo "
         <td>NPC 장수";
         } else {
             echo "
-        <td>
-            <font size=1>";
-            $turn = getTurn($general, 1);
-
-            for($i=0; $i < 5; $i++) {
-                $k = $i+1;
-                echo "
-                    &nbsp;&nbsp;$k : $turn[$i]<br>";
-            }
-            echo "
-            </font>";
+        <td class='general_turn_text'>$turnText";
         }
     } elseif($general['nation'] != 0) {
         echo "
-        <td align=center>?</td>
-        <td align=center>?</td>
-        <td align=center>{$general['crew']}</td>
-        <td align=center>?</td>
-        <td align=center>?</td>
+        <td>?</td>
+        <td>?</td>
+        <td>{$general['crew']}</td>
+        <td>?</td>
+        <td>?</td>
         <td>【{$nationname[$general['nation']]}】 장수";
     } else {
         echo "
-        <td align=center>?</td>
-        <td align=center>?</td>
-        <td align=center>{$general['crew']}</td>
-        <td align=center>?</td>
-        <td align=center>?</td>
+        <td>?</td>
+        <td>?</td>
+        <td>{$general['crew']}</td>
+        <td>?</td>
+        <td>?</td>
         <td>&nbsp; 재 야";
     }
 
     echo "
         </td>
-    </tr>";
+    </tr>";*/
 }
 ?>
+</tbody>
 </table>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
diff --git a/hwe/func_command.php b/hwe/func_command.php
index 871219ee..485c1b57 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -2,6 +2,7 @@
 namespace sammo;
 
 function getTurn($general, $type, $font=1) {
+    //TODO: 왜 'Type' 인가. 그냥 count로 하자.
     $str = [];
     $db = DB::db();
     $connect=$db->get();
diff --git a/hwe/func_template.php b/hwe/func_template.php
index c313a3a0..4fbd7692 100644
--- a/hwe/func_template.php
+++ b/hwe/func_template.php
@@ -130,7 +130,39 @@ function commandButton() {
     ]);
 }
 
+function formatWounded(int $value, int $wound): string{
+    if($wound == 0){
+        return "$value";
+    }
+    $woundedValue = intdiv($value * (100 - $wound), 100);
+    return "<font color=red>$woundedvalue</font>";
+}
 
+function formatDefenceMode(int $value): string{
+    switch($value) {
+    case 0: return "×"; break;
+    case 1: return "○"; break;
+    case 2: return "◎"; break;
+    }
+    return '??';
+}
+
+function formatLeadershipBonus(int $value): string{
+    if($value == 0){
+        return '';
+    }
+    return "<font color=cyan>+{$value}</font>";
+}
+
+function formatName(string $name, int $npc): string{
+    if($npc==1){
+        $name = "<font color='skyblue'>$name</font>";
+    }
+    else if($npc>1){
+        $name = "<font color='cyan'>$name</font>";
+    }
+    return $name;
+}
 
 function getMapHtml(){
     //NOTE: 필요한가?
diff --git a/hwe/templates/cityGeneral.php b/hwe/templates/cityGeneral.php
new file mode 100644
index 00000000..7aa86c74
--- /dev/null
+++ b/hwe/templates/cityGeneral.php
@@ -0,0 +1,53 @@
+<tr
+    data-is-our-general="<?=$ourGeneral?'true':'false'?>"
+    data-is-npc="<?=$isNPC?'true':'false'?>"
+    data-general-wounded="<?=$wounded?>"
+    data-general-name="<?=$this->e($name)?>"
+    data-general-leadership="<?=$leadership?>"
+    data-general-power="<?=$power?>"
+    data-general-intel="<?=$intel?>"
+    data-general-level="<?=$level?>"
+    data-general-leadership-bonus="<?=$leadershipBonus?>"
+<?php if($ourGeneral): ?>
+    data-general-defence-mode="<?=$defenceMode?>"
+    data-general-crew-type="<?=$crewType?>"
+    data-general-crew="<?=$crew?>"
+    data-general-train="<?=$train?>"
+    data-general-atmos="<?=$atmos?>"
+<?php else: ?>
+    data-general-crew="<?=$crew?>"
+<?php endif; ?>
+    data-general-nation="<?=$nation?>"
+    data-general-nation-name="<?=$nationName?>"
+>
+    <td height="64"></td>
+    <td><?=$nameText?></td>
+    <td><?=$leadershipText?><?=$leadershipBonusText?></td>
+    <td><?=$powerText?></td>
+    <td><?=$intelText?></td>
+    <td class="general_level"><?=$levelText?></td>
+<?php if($ourGeneral): ?>
+    <td><?=$defenceModeText?></td>
+    <td class="general_crew_type"><?=$crewTypeText?></td>
+    <td><?=$crew?></td>
+    <td><?=$train?></td>
+    <td><?=$atmos?></td>
+    <?php if($isNPC): ?>
+    <td>NPC 장수</td>    
+    <?php else: ?>
+    <td class="general_turn_text"><?=$turnText?></td>
+    <?php endif; ?>
+<?php else: ?>
+    <td>?</td>
+    <td class="general_crew_type">?</td>
+    <td><?=$crew?></td>
+    <td>?</td>
+    <td>?</td>
+    <?php if($nation!==0): ?>
+    <td>【<?=$nationName?>】 장수</td>
+    <?php else: ?>
+    <td>재 야</td>
+    <?php endif; ?>
+<?php endif; ?>
+    
+</tr>
\ No newline at end of file

From 3a281807002ab05416bf381d89252daf63bbd9a0 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 10:17:24 +0900
Subject: [PATCH 098/184] =?UTF-8?q?=EB=8F=84=EC=8B=9C=20=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=20=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_currentCity.php | 52 -------------------------------------------
 1 file changed, 52 deletions(-)

diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index 53c6ec29..bb594fce 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -359,58 +359,6 @@ for($j=0; $j < $gencount; $j++) {
         'nationName'=>$nationName,
         'turnText'=>$turnText
     ]);
-
-/*
-    echo "
-    <tr>
-        <td height=64></td>
-        <td>{$general['name']}</td>
-        <td>$leadership</td>
-        <td>$power</td>
-        <td>$intel</td>
-        <td>".getLevel($general['level'])."</td>";
-    //아국장수이거나 보는 사람이 운영자일때 보여줌
-    if(($general['nation'] != 0 && $general['nation'] == $myNation['nation']) || $session->userGrade >= 5) {
-        switch($general['mode']) {
-        case 0: $mode = "×"; break;
-        case 1: $mode = "○"; break;
-        case 2: $mode = "◎"; break;
-        }
-
-        echo "
-        <td>$mode</td>
-        <td>".GameUnitConst::byId($general['crewtype'])->name."</td>
-        <td>{$general['crew']}</td>
-        <td>{$general['train']}</td>
-        <td>{$general['atmos']}</td>";
-        if($general['npc'] >= 2) {
-            echo "
-        <td>NPC 장수";
-        } else {
-            echo "
-        <td class='general_turn_text'>$turnText";
-        }
-    } elseif($general['nation'] != 0) {
-        echo "
-        <td>?</td>
-        <td>?</td>
-        <td>{$general['crew']}</td>
-        <td>?</td>
-        <td>?</td>
-        <td>【{$nationname[$general['nation']]}】 장수";
-    } else {
-        echo "
-        <td>?</td>
-        <td>?</td>
-        <td>{$general['crew']}</td>
-        <td>?</td>
-        <td>?</td>
-        <td>&nbsp; 재 야";
-    }
-
-    echo "
-        </td>
-    </tr>";*/
 }
 ?>
 </tbody>

From b9fa0bea6e4a5704fdec67af0326e5e8a3491b6c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 10:42:30 +0900
Subject: [PATCH 099/184] =?UTF-8?q?mkdir=20=EA=B6=8C=ED=95=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 j_updateServer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/j_updateServer.php b/j_updateServer.php
index 8d187a02..e967308d 100644
--- a/j_updateServer.php
+++ b/j_updateServer.php
@@ -78,12 +78,12 @@ if(!file_exists($server)){
             'reason'=>$server.' 디렉토리가 없지만 생성할 권한이 없습니다.'
         ]);
     }
-    mkdir($server, 0644);
+    mkdir($server, 0755);
 }
 
 
 if($server == $baseServerName){
-    exec("git pull 2>&1", $output);
+    exec("git -q pull 2>&1", $output);
     if($output && $output[0] != 'Already up-to-date.'){
         Json::die([
             'result'=>false,

From d11920028713d276a36c54f39de40d9acbf7e1e0 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 10:43:21 +0900
Subject: [PATCH 100/184] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=97=85=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20=EC=88=9C=EC=84=9C=20=ED=8B=80=EB=A6=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 j_updateServer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/j_updateServer.php b/j_updateServer.php
index e967308d..3f8a5c5c 100644
--- a/j_updateServer.php
+++ b/j_updateServer.php
@@ -83,7 +83,7 @@ if(!file_exists($server)){
 
 
 if($server == $baseServerName){
-    exec("git -q pull 2>&1", $output);
+    exec("git pull -q 2>&1", $output);
     if($output && $output[0] != 'Already up-to-date.'){
         Json::die([
             'result'=>false,

From 0f45de8384b1fa11bae3275f99be0800bc52bdbe Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 10:47:09 +0900
Subject: [PATCH 101/184] =?UTF-8?q?=EB=B6=80=EC=83=81=20=EC=BD=94=EB=93=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/func_template.php b/hwe/func_template.php
index 4fbd7692..908e0cf2 100644
--- a/hwe/func_template.php
+++ b/hwe/func_template.php
@@ -135,7 +135,7 @@ function formatWounded(int $value, int $wound): string{
         return "$value";
     }
     $woundedValue = intdiv($value * (100 - $wound), 100);
-    return "<font color=red>$woundedvalue</font>";
+    return "<font color=red>$woundedValue</font>";
 }
 
 function formatDefenceMode(int $value): string{

From a5875be39b4bac061422d0676a8296d3424b20fd Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 10:48:55 +0900
Subject: [PATCH 102/184] =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EC=9D=B8=EB=8D=B1?=
 =?UTF-8?q?=EC=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sql/schema.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index d3014e4c..2b81ca2b 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -151,7 +151,7 @@ CREATE TABLE `general` (
 	`recturn` CHAR(14) NULL DEFAULT '',
 	`resturn` CHAR(14) NULL DEFAULT '',
 	PRIMARY KEY (`no`),
-	INDEX `nation` (`nation`, `npc`)
+	INDEX `nation` (`nation`, `npc`),
 	INDEX `city` (`city`),
 	INDEX `turntime` (`turntime`, `no`),
 	INDEX `no_member` (`owner`),

From 953b609b32bb022a1a7b3f5aa9af4b4eef08fefd Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 10:54:07 +0900
Subject: [PATCH 103/184] =?UTF-8?q?=EC=9E=84=EA=B4=80,=20=EC=9E=A5?=
 =?UTF-8?q?=EC=88=98=20=EC=84=A0=ED=83=9D=EC=8B=9C=20=EC=84=A4=EB=AA=85=20?=
 =?UTF-8?q?=EC=83=89=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/join.php       | 4 ++--
 hwe/select_npc.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hwe/join.php b/hwe/join.php
index 759c1373..9f5a7dca 100644
--- a/hwe/join.php
+++ b/hwe/join.php
@@ -71,10 +71,10 @@ for ($i=0; $i < $nationcount; $i++) {
     $nation = MYDB_fetch_array($nationresult);
     if ($nation['scoutmsg'] == "") {
         echo "
-    <tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:{newColor({$nation['color']})};background-color:{$nation['color']}>-</td></tr>";
+    <tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>-</td></tr>";
     } else {
         echo "
-    <tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:{newColor({$nation['color']})};background-color:{$nation['color']}>{$nation['scoutmsg']}</td></tr>";
+    <tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['scoutmsg']}</td></tr>";
     }
 }
 ?>
diff --git a/hwe/select_npc.php b/hwe/select_npc.php
index 9fca674a..d2a145cb 100644
--- a/hwe/select_npc.php
+++ b/hwe/select_npc.php
@@ -71,10 +71,10 @@ for($i=0; $i < $nationcount; $i++) {
     $nation = MYDB_fetch_array($nationresult);
     if($nation['scoutmsg'] == "") {
         echo "
-    <tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:{newColor({$nation['color']})};background-color:{$nation['color']}>-</td></tr>";
+    <tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>-</td></tr>";
     } else {
         echo "
-    <tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:{newColor({$nation['color']})};background-color:{$nation['color']}>{$nation['scoutmsg']}</td></tr>";
+    <tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['scoutmsg']}</td></tr>";
     }
 }
 ?>

From 00ac67e8ac4a34a18a49802ab91cfce24095e109 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 11:11:25 +0900
Subject: [PATCH 104/184] =?UTF-8?q?=EC=8B=9C=EB=82=98=EB=A6=AC=EC=98=A4=20?=
 =?UTF-8?q?=EC=8B=9C=EC=9E=91=20=EB=85=84=EB=8F=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/scenario/scenario_1.json  | 2 +-
 hwe/scenario/scenario_10.json | 2 +-
 hwe/scenario/scenario_11.json | 2 +-
 hwe/scenario/scenario_12.json | 2 +-
 hwe/scenario/scenario_2.json  | 2 +-
 hwe/scenario/scenario_22.json | 4 ++--
 hwe/scenario/scenario_3.json  | 2 +-
 hwe/scenario/scenario_4.json  | 2 +-
 hwe/scenario/scenario_5.json  | 2 +-
 hwe/scenario/scenario_6.json  | 2 +-
 hwe/scenario/scenario_7.json  | 2 +-
 hwe/scenario/scenario_8.json  | 2 +-
 hwe/scenario/scenario_9.json  | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/hwe/scenario/scenario_1.json b/hwe/scenario/scenario_1.json
index 58a8f223..833e6379 100644
--- a/hwe/scenario/scenario_1.json
+++ b/hwe/scenario/scenario_1.json
@@ -1,6 +1,6 @@
 {
     "title":"【역사모드1】 황건적의 난",
-    "startYear":184,
+    "startYear":181,
     "life":1,
     "fiction":0,
     "nation":[
diff --git a/hwe/scenario/scenario_10.json b/hwe/scenario/scenario_10.json
index 6469941b..beac190b 100644
--- a/hwe/scenario/scenario_10.json
+++ b/hwe/scenario/scenario_10.json
@@ -1,6 +1,6 @@
 {
     "title":"【역사모드10】 칠종칠금",
-    "startYear":225,
+    "startYear":222,
     "life":1,
     "fiction":0,
     "nation":[
diff --git a/hwe/scenario/scenario_11.json b/hwe/scenario/scenario_11.json
index 8dd896b9..46b5072b 100644
--- a/hwe/scenario/scenario_11.json
+++ b/hwe/scenario/scenario_11.json
@@ -1,6 +1,6 @@
 {
     "title":"【역사모드11】 출사표",
-    "startYear":228,
+    "startYear":225,
     "life":1,
     "fiction":0,
     "nation":[
diff --git a/hwe/scenario/scenario_12.json b/hwe/scenario/scenario_12.json
index d2ec17d4..e5d99440 100644
--- a/hwe/scenario/scenario_12.json
+++ b/hwe/scenario/scenario_12.json
@@ -1,6 +1,6 @@
 {
     "title":"【IF모드1】 백마장군의 위세",
-    "startYear":191,
+    "startYear":188,
     "life":1,
     "fiction":0,
     "nation":[
diff --git a/hwe/scenario/scenario_2.json b/hwe/scenario/scenario_2.json
index 8fbbb5d8..8e810e0b 100644
--- a/hwe/scenario/scenario_2.json
+++ b/hwe/scenario/scenario_2.json
@@ -1,6 +1,6 @@
 {
     "title":"【역사모드2】 반동탁연합 결성",
-    "startYear":190,
+    "startYear":187,
     "life":1,
     "fiction":0,
     "nation":[
diff --git a/hwe/scenario/scenario_22.json b/hwe/scenario/scenario_22.json
index 4661e708..16ee161d 100644
--- a/hwe/scenario/scenario_22.json
+++ b/hwe/scenario/scenario_22.json
@@ -102,8 +102,8 @@
 
     ],
     "history":[
-        "<C>●</>179년 1월:<L><b>【가상모드2】</b>훼신 집결</>",
-        "<C>●</>179년 1월:<L><b>【이벤트】</b></>삼모전 역대 훼신들이 등장합니다."
+        "<C>●</>180년 1월:<L><b>【가상모드2】</b>훼신 집결</>",
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>삼모전 역대 훼신들이 등장합니다."
     ],
     "initialEvents":[
 
diff --git a/hwe/scenario/scenario_3.json b/hwe/scenario/scenario_3.json
index 0849eb17..31beb5f2 100644
--- a/hwe/scenario/scenario_3.json
+++ b/hwe/scenario/scenario_3.json
@@ -1,6 +1,6 @@
 {
     "title":"【역사모드3】 군웅할거",
-    "startYear":194,
+    "startYear":191,
     "life":1,
     "fiction":0,
     "nation":[
diff --git a/hwe/scenario/scenario_4.json b/hwe/scenario/scenario_4.json
index 61f6af67..8408fc18 100644
--- a/hwe/scenario/scenario_4.json
+++ b/hwe/scenario/scenario_4.json
@@ -1,6 +1,6 @@
 {
     "title":"【역사모드4】 황제는 허도로",
-    "startYear":196,
+    "startYear":193,
     "life":1,
     "fiction":0,
     "nation":[
diff --git a/hwe/scenario/scenario_5.json b/hwe/scenario/scenario_5.json
index 7e17e45e..028810fc 100644
--- a/hwe/scenario/scenario_5.json
+++ b/hwe/scenario/scenario_5.json
@@ -1,6 +1,6 @@
 {
     "title":"【역사모드5】 관도대전",
-    "startYear":200,
+    "startYear":197,
     "life":1,
     "fiction":0,
     "nation":[
diff --git a/hwe/scenario/scenario_6.json b/hwe/scenario/scenario_6.json
index 143cd44c..b65c9645 100644
--- a/hwe/scenario/scenario_6.json
+++ b/hwe/scenario/scenario_6.json
@@ -1,6 +1,6 @@
 {
     "title":"【역사모드6】 원가의 분열",
-    "startYear":202,
+    "startYear":199,
     "life":1,
     "fiction":0,
     "nation":[
diff --git a/hwe/scenario/scenario_7.json b/hwe/scenario/scenario_7.json
index 897a8cbb..4d074e28 100644
--- a/hwe/scenario/scenario_7.json
+++ b/hwe/scenario/scenario_7.json
@@ -1,6 +1,6 @@
 {
     "title":"【역사모드7】 적벽대전",
-    "startYear":207,
+    "startYear":204,
     "life":1,
     "fiction":0,
     "nation":[
diff --git a/hwe/scenario/scenario_8.json b/hwe/scenario/scenario_8.json
index 7cc9e6cc..dc657f09 100644
--- a/hwe/scenario/scenario_8.json
+++ b/hwe/scenario/scenario_8.json
@@ -1,6 +1,6 @@
 {
     "title":"【역사모드8】 익주 공방전",
-    "startYear":213,
+    "startYear":210,
     "life":1,
     "fiction":0,
     "nation":[
diff --git a/hwe/scenario/scenario_9.json b/hwe/scenario/scenario_9.json
index 09f6a310..8bee3452 100644
--- a/hwe/scenario/scenario_9.json
+++ b/hwe/scenario/scenario_9.json
@@ -1,6 +1,6 @@
 {
     "title":"【역사모드9】 삼국정립",
-    "startYear":219,
+    "startYear":216,
     "life":1,
     "fiction":0,
     "nation":[

From e6b4832b5d0d7c5878e8b84f8dfe434988ea5ddd Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 11:49:55 +0900
Subject: [PATCH 105/184] =?UTF-8?q?index.php=EC=97=90=20level=20=EC=97=86?=
 =?UTF-8?q?=EB=8A=94=20=EB=B2=84=EA=B7=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/index.php b/hwe/index.php
index 96174ff4..04e8f270 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -18,7 +18,7 @@ if (!$userID) {
 }
 
 $me = $db->queryFirstRow(
-    'SELECT no,con,turntime,newmsg,newvote from general where owner = %i',
+    'SELECT no,con,turntime,newmsg,newvote,`level` from general where owner = %i',
     $userID
 );
 

From dc97c71e0bfdc9f4e83c5fa60634507ac1574d43 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 12:20:55 +0900
Subject: [PATCH 106/184] =?UTF-8?q?1=EC=9B=94=EC=9D=84=20=EB=86=93?=
 =?UTF-8?q?=EC=B9=98=EB=A9=B4=20=ED=83=9C=EC=96=B4=EB=82=98=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EC=9C=BC=EB=AF=80=EB=A1=9C=20Date=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A4=80=EC=9D=84=20=3D=3D=EC=97=90=EC=84=9C=20>=3D=EB=A1=9C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Scenario.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/sammo/Scenario.php b/hwe/sammo/Scenario.php
index 77bd7283..b3cad337 100644
--- a/hwe/sammo/Scenario.php
+++ b/hwe/sammo/Scenario.php
@@ -321,7 +321,7 @@ class Scenario{
 
             $actions[] = ['DeleteEvent'];
             $this->events[] = [
-                'cond'=>['Date', '==', $targetYear, '1'],
+                'cond'=>['Date', '>=', $targetYear, '1'],
                 'action'=>$actions
             ];
         }

From 243604d6c1946f399717e902ed7dba42e3917127 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 12:28:32 +0900
Subject: [PATCH 107/184] =?UTF-8?q?30=EC=B4=88=EB=A7=88=EB=8B=A4=20?=
 =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=ED=8F=B4=EB=A7=81!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/index.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hwe/index.php b/hwe/index.php
index 04e8f270..fd49d6a0 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -74,6 +74,10 @@ $(function(){
     reloadWorldMap({
         hrefTemplate:'b_currentCity.php?citylist={0}'
     });
+
+    setInterval(function(){
+        refreshMsg();
+    }, 30000);
 });
 </script>
 <link href="css/normalize.css" rel="stylesheet">

From 481494a885303708d781b8f6e3c9ba7cc25450e1 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 13:06:10 +0900
Subject: [PATCH 108/184] =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EB=A9=94=EC=8B=9C?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=88=20=EB=B3=B4=EB=82=B4=EC=A7=80=EB=8D=98=20?=
 =?UTF-8?q?=EA=B2=83=20=EC=88=98=EC=A0=95=2010=EC=B4=88=EB=A7=88=EB=8B=A4?=
 =?UTF-8?q?=20=EB=A9=94=EC=8B=9C=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/_admin2_submit.php | 26 +++++++++++++-------------
 hwe/index.php          |  2 +-
 hwe/sql/schema.sql     |  2 +-
 tmp_msg/msg.js         |  3 ---
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/hwe/_admin2_submit.php b/hwe/_admin2_submit.php
index c36380c2..9d60588f 100644
--- a/hwe/_admin2_submit.php
+++ b/hwe/_admin2_submit.php
@@ -101,7 +101,7 @@ switch($btn) {
         $text = "특기 부여!";
 
         foreach($db->query("SELECT `no`,leader,power,intel,dex0,dex10,dex20,dex30,dex40 FROM general WHERE `no` IN %li", $genlist) as $general){    
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($general['no']), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($general['no']), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
 
             $specialWar = SpecialityConst::pickSpecialWar($general);
@@ -119,7 +119,7 @@ switch($btn) {
         $src = MessageTarget::buildQuick($session->generalID);
         $text = $btn." 지급!";
         foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general',[
@@ -131,7 +131,7 @@ switch($btn) {
         $src = MessageTarget::buildQuick($session->generalID);
         $text = $btn." 지급!";
         foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general',[
@@ -143,7 +143,7 @@ switch($btn) {
         $src = MessageTarget::buildQuick($session->generalID);
         $text = "보병숙련도+10000 지급!";
         foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general',[
@@ -154,7 +154,7 @@ switch($btn) {
         $src = MessageTarget::buildQuick($session->generalID);
         $text = "궁병숙련도+10000 지급!";
         foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general',[
@@ -165,7 +165,7 @@ switch($btn) {
         $src = MessageTarget::buildQuick($session->generalID);
         $text = "기병숙련도+10000 지급!";
         foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general',[
@@ -176,7 +176,7 @@ switch($btn) {
         $src = MessageTarget::buildQuick($session->generalID);
         $text = "귀병숙련도+10000 지급!";
         foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general',[
@@ -187,7 +187,7 @@ switch($btn) {
         $src = MessageTarget::buildQuick($session->generalID);
         $text = "차병숙련도+10000 지급!";
         foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         $db->update('general',[
@@ -207,7 +207,7 @@ switch($btn) {
     case "메세지 전달":
         $text = $msg;
         foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
         break;
@@ -221,7 +221,7 @@ switch($btn) {
         }
 
         foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
 
@@ -245,7 +245,7 @@ switch($btn) {
         }
 
         foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
 
@@ -269,7 +269,7 @@ switch($btn) {
         }
 
         foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
 
@@ -293,7 +293,7 @@ switch($btn) {
         }
 
         foreach($genlist as $generalID){
-            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new DateTime(), new DateTime('9999-12-31'), []);
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
         }
 
diff --git a/hwe/index.php b/hwe/index.php
index fd49d6a0..ee0752c7 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -77,7 +77,7 @@ $(function(){
 
     setInterval(function(){
         refreshMsg();
-    }, 30000);
+    }, 10000);
 });
 </script>
 <link href="css/normalize.css" rel="stylesheet">
diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index 2b81ca2b..afe1c197 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -419,7 +419,7 @@ CREATE TABLE `message` (
 	`valid_until` DATETIME NOT NULL DEFAULT '9999-12-31 23:59:59',
 	`message` TEXT NOT NULL COMMENT 'json',
 	PRIMARY KEY (`id`),
-	INDEX `by_mailbox` (`mailbox`, `type`, `time`)
+	INDEX `by_mailbox` (`mailbox`, `type`, `id`)
 )
 DEFAULT CHARSET=utf8mb4
 ENGINE=InnoDB;
diff --git a/tmp_msg/msg.js b/tmp_msg/msg.js
index 9cea74b8..6edb5e9d 100644
--- a/tmp_msg/msg.js
+++ b/tmp_msg/msg.js
@@ -59,9 +59,6 @@ function fetchMsg(){
 }
 
 function redrawMsg(deferred){
-    
-    console.log(deferred);
-
     function registerSequence(obj){
         if(!obj.result){
             deferred.reject();

From 4b956385bdf952e48788d86ecfe9eb3f58a6f00b Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 13:16:50 +0900
Subject: [PATCH 109/184] =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=EC=9D=84=20=EC=9C=84=ED=95=B4=20=EC=9D=BC=EA=B4=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/_admin2_submit.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/hwe/_admin2_submit.php b/hwe/_admin2_submit.php
index 9d60588f..a14bab7f 100644
--- a/hwe/_admin2_submit.php
+++ b/hwe/_admin2_submit.php
@@ -24,6 +24,8 @@ if(!$generalID){
 $db = DB::db();
 $connect=$db->get();
 
+$src = MessageTarget::buildQuick($session->generalID);
+
 switch($btn) {
     case "전체 접속허용":
         $db->update('general', [
@@ -96,8 +98,6 @@ switch($btn) {
         break;
     case "특기 부여":
         list($year, $month) = $db->queryFirstList('select `year`, `month` from `game` where `no`=1');
-
-        $src = MessageTarget::buildQuick($session->generalID);
         $text = "특기 부여!";
 
         foreach($db->query("SELECT `no`,leader,power,intel,dex0,dex10,dex20,dex30,dex40 FROM general WHERE `no` IN %li", $genlist) as $general){    
@@ -116,7 +116,6 @@ switch($btn) {
         
         break;
     case "경험치1000":
-        $src = MessageTarget::buildQuick($session->generalID);
         $text = $btn." 지급!";
         foreach($genlist as $generalID){
             $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
@@ -128,7 +127,6 @@ switch($btn) {
 
         break;
     case "공헌치1000":
-        $src = MessageTarget::buildQuick($session->generalID);
         $text = $btn." 지급!";
         foreach($genlist as $generalID){
             $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
@@ -140,7 +138,6 @@ switch($btn) {
 
         break;
     case "보숙10000":
-        $src = MessageTarget::buildQuick($session->generalID);
         $text = "보병숙련도+10000 지급!";
         foreach($genlist as $generalID){
             $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
@@ -151,7 +148,6 @@ switch($btn) {
         ], '`no` IN %li', $genlist);
         break;
     case "궁숙10000":
-        $src = MessageTarget::buildQuick($session->generalID);
         $text = "궁병숙련도+10000 지급!";
         foreach($genlist as $generalID){
             $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);

From 473cae169e04a11466e2f730206c4a449b84d381 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 14:14:41 +0900
Subject: [PATCH 110/184] =?UTF-8?q?=ED=80=98=EC=84=AD=20=EB=B9=99=EC=9D=98?=
 =?UTF-8?q?=EC=8B=9C=20=EA=B3=84=EC=A0=95=EC=9D=B4=EB=A6=84=EC=9D=B4=20?=
 =?UTF-8?q?=EC=95=84=EB=8B=88=EB=9D=BC=20=EB=8B=89=EB=84=A4=EC=9E=84?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EA=B8=B0=EB=A1=9D=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/select_npc_post.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hwe/select_npc_post.php b/hwe/select_npc_post.php
index 489d0970..4387baf7 100644
--- a/hwe/select_npc_post.php
+++ b/hwe/select_npc_post.php
@@ -95,9 +95,11 @@ if($npc['npc'] != 2) {
 
 } */
 
+$userNick = RootDB::db()->queryFirstField('SELECT `NAME` FROM member WHERE `NO`=%i',Session::getUserID());
+
 $npcID = $npc['no'];
 $db->update('general', [
-    'name2'=>$session->userName,
+    'name2'=>$userNick,
     'npc'=>1,
     'killturn'=>6,
     'mode'=>2,
@@ -112,14 +114,13 @@ if(!$affected){
     exit;
 }
 
-
 $me = [
     'no'=>$npcID
 ];
 
-pushGeneralHistory($me, "<C>●</>{$year}년 {$month}월:<Y>{$npc['name']}</>의 육체에 <Y>{$session->userName}</>(이)가 빙의되다.");
+pushGeneralHistory($me, "<C>●</>{$year}년 {$month}월:<Y>{$npc['name']}</>의 육체에 <Y>{$userNick}</>(이)가 빙의되다.");
 //pushGenLog($me, $mylog);
-pushGeneralPublicRecord(["<C>●</>{$month}월:<Y>{$npc['name']}</>의 육체에 <Y>{$session->userName}</>(이)가 <S>빙의</>됩니다!"], $year, $month);
+pushGeneralPublicRecord(["<C>●</>{$month}월:<Y>{$npc['name']}</>의 육체에 <Y>{$userNick}</>(이)가 <S>빙의</>됩니다!"], $year, $month);
 
 pushAdminLog(["가입 : {$userID} // {$session->userName} // {$npcID} // ".getenv("REMOTE_ADDR")]);
 

From f58736277f7506ac6742b465d2c86bd204b3dffe Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 15:58:41 +0900
Subject: [PATCH 111/184] =?UTF-8?q?=EC=82=AD=ED=84=B4=20=EB=B2=84=EA=B7=B8?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_command.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/hwe/func_command.php b/hwe/func_command.php
index 485c1b57..4d2eee76 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -533,13 +533,11 @@ function processCommand($no) {
         if($general['npc'] >= 2 || $general['killturn'] > $admin['killturn']) {
             $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        } elseif(intval($command[0]) == 0 && $session->userGrade < 5) {
+        } elseif($command[0] == 0) {
             $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        } else {
-            $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn='{$admin['killturn']}' where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         }
+        
         //연속턴 아닌경우 텀 리셋
         if($general['term']%100 != $command[0]) {
             $query = "update general set term=0 where no='{$general['no']}'";

From a0ca3dc3f651e2e00632ec22787767113ad338bd Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 15:59:05 +0900
Subject: [PATCH 112/184] =?UTF-8?q?TODO=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_command.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hwe/func_command.php b/hwe/func_command.php
index 4d2eee76..89c09e4c 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -537,7 +537,8 @@ function processCommand($no) {
             $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         }
-        
+        //FIXME: 운영자 같이 사망하면 안되는 인물에 대한 처리가 필요
+
         //연속턴 아닌경우 텀 리셋
         if($general['term']%100 != $command[0]) {
             $query = "update general set term=0 where no='{$general['no']}'";

From 4f262a03e418b7ffd2c2a10f7d2aad01522a43d7 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 16:18:07 +0900
Subject: [PATCH 113/184] =?UTF-8?q?command=5FSingle=20=EB=8F=99=EC=9E=91?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_command.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/hwe/func_command.php b/hwe/func_command.php
index 89c09e4c..f9e96d55 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -681,19 +681,21 @@ where nation='{$general['nation']}'
 
 
 function command_Single($turn, $command) {
+    if(!$turn){
+        header('location:commandlist.php');
+        return;
+    }
+
     $db = DB::db();
-    $connect=$db->get();
     $userID = Session::getUserID();
 
     $command = EncodeCommand(0, 0, 0, $command);
 
-    $count = count($turn);
-    $str = "con=con";
-    for($i=0; $i < $count; $i++) {
-        $str .= ",turn{$turn[$i]}='{$command}'";
+    $setValues = [];
+    foreach($turn as $turnIdx){
+        $setValues["turn{$turnIdx}"] = $command;
     }
-    $query = "update general set {$str} where owner='{$userID}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('general', $setValues, 'owner=%i',$userID);
     
     header('location:commandlist.php');
 }

From b26c6a04c0eec4661bcc3d30c4c15da4cf25bb35 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 17:27:45 +0900
Subject: [PATCH 114/184] =?UTF-8?q?=EC=82=AD=ED=84=B4=20=EB=B2=84=EA=B7=B8?=
 =?UTF-8?q?=EB=A1=9C=20=EC=83=9D=EA=B8=B4=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_command.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hwe/func_command.php b/hwe/func_command.php
index f9e96d55..579bab88 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -536,6 +536,9 @@ function processCommand($no) {
         } elseif($command[0] == 0) {
             $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        } else {
+            $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn='{$admin['killturn']}' where no='{$general['no']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         }
         //FIXME: 운영자 같이 사망하면 안되는 인물에 대한 처리가 필요
 

From 70b6997436932f07d4bab0aca0e3504ffba117f4 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 21:10:03 +0900
Subject: [PATCH 115/184] =?UTF-8?q?=EC=97=B0=EA=B0=90=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=9E=A5=EC=88=98=20=EB=A1=9C=EA=B7=B8=20=EC=BB=AC=EB=9F=BC=20?=
 =?UTF-8?q?=EA=B8=B8=EC=9D=B4=20=EC=97=B0=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sql/schema.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index afe1c197..25e12be8 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -595,7 +595,7 @@ create table history (
   month   int(2) default 0,
   map     mediumtext default '',
   log     text default '',
-  genlog  text default '',
+  genlog  mediumtext default '',
   nation  text default '',
   power   text default '',
   gen     text default '',

From bf746393b86e0b1eb1a01d434aa028cc01378dc2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 21:52:17 +0900
Subject: [PATCH 116/184] =?UTF-8?q?=EC=B2=9C=EC=9D=B8=EA=B0=95=EB=A6=BC=20?=
 =?UTF-8?q?=EC=8B=9C=EB=82=98=EB=A6=AC=EC=98=A4=20=EB=A6=AC=20=EB=B0=B8?=
 =?UTF-8?q?=EB=9F=B0=EC=8B=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/scenario/scenario_29.json | 1364 ++++++++++++++++-----------------
 1 file changed, 682 insertions(+), 682 deletions(-)

diff --git a/hwe/scenario/scenario_29.json b/hwe/scenario/scenario_29.json
index ea8d0352..b0919dc0 100644
--- a/hwe/scenario/scenario_29.json
+++ b/hwe/scenario/scenario_29.json
@@ -2,691 +2,691 @@
     "title":"【가상모드9】 천인 강림",
     "life":1,
     "fiction":1,
-    "nation":[  
+    "nation":[
     ],
     "diplomacy":[
     ],
-    "general":[																												
-		[1,	"소제1",	1001,	0,	null,	20,	11,	42,	0,	160,	300,	"유지",	null],		
-		[1,	"헌제",	1002,	0,	null,	17,	13,	51,	0,	160,	300,	"안전",	null],		
-		[999,	"사마휘",	1003,	0,	null,	52,	11,	74,	0,	160,	300,	"은둔",	"신산",	"좋지, 좋아~"],
-		[999,	"우길",	1004,	0,	null,	17,	13,	65,	0,	160,	300,	"은둔",	"신산"],		
-		[999,	"화타",	1005,	0,	null,	45,	25,	57,	0,	160,	300,	"은둔",	"의술",	"아픈 사람들은 모두 내게 오시오. 껄껄껄."],
-		[999,	"길평",	1006,	0,	null,	27,	15,	58,	0,	160,	300,	"은둔",	"의술"],		
-		[29,	"가규",	1007,	0,	null,	46,	47,	59,	0,	160,	300,	"재간",	null],		
-		[136,	"가범",	1008,	0,	null,	47,	42,	59,	0,	160,	300,	"유지",	null],		
-		[49,	"가비능",	1009,	0,	null,	47,	65,	31,	0,	160,	300,	"정복",	null],		
-		[31,	"가충",	1010,	0,	null,	44,	25,	68,	0,	160,	300,	"출세",	null],		
-		[20,	"가후",	1011,	0,	null,	52,	30,	73,	0,	160,	300,	"할거",	"귀병"],		
-		[73,	"간옹",	1012,	0,	null,	31,	32,	57,	0,	160,	300,	"안전",	"경작"],		
-		[129,	"감녕",	1013,	0,	null,	55,	73,	57,	0,	160,	300,	"출세",	"무쌍"],		
-		[127,	"감택",	1014,	0,	null,	49,	39,	63,	0,	160,	300,	"유지",	null],		
-		[60,	"강단",	1015,	0,	null,	40,	59,	39,	0,	160,	300,	"재간",	null],		
-		[73,	"강유",	1016,	0,	null,	62,	70,	73,	0,	160,	300,	"왕좌",	"집중",	"갈고 닦은 무예와 승상께 배운 책략을 발휘해 보이겠다!"],
-		[102,	"고간",	1017,	0,	null,	48,	48,	44,	0,	160,	300,	"유지",	null],		
-		[27,	"고람",	1018,	0,	null,	53,	55,	49,	0,	160,	300,	"출세",	"기병"],		
-		[69,	"고상",	1019,	0,	null,	40,	37,	35,	0,	160,	300,	"재간",	null],		
-		[144,	"고순",	1020,	0,	null,	56,	65,	53,	0,	160,	300,	"의협",	"기병"],		
-		[7,	"고승",	1021,	0,	null,	41,	59,	24,	0,	160,	300,	"출세",	null],		
-		[120,	"고옹",	1022,	0,	null,	47,	21,	63,	0,	160,	300,	"출세",	null],		
-		[63,	"고정",	1023,	0,	null,	51,	53,	47,	0,	160,	300,	"정복",	null],		
-		[53,	"고패",	1024,	0,	null,	45,	47,	28,	0,	160,	300,	"유지",	null],		
-		[74,	"공도",	1025,	0,	null,	26,	59,	19,	0,	160,	300,	"재간",	null],		
-		[142,	"공손강",	1026,	0,	null,	50,	58,	51,	0,	160,	300,	"정복",	null],		
-		[142,	"공손공",	1027,	0,	null,	51,	37,	60,	0,	160,	300,	"정복",	null],		
-		[142,	"공손도",	1028,	0,	null,	49,	58,	37,	0,	160,	300,	"정복",	"기병"],		
-		[65,	"공손범",	1029,	0,	null,	48,	55,	51,	0,	160,	300,	"출세",	null],		
-		[65,	"공손속",	1030,	0,	null,	48,	61,	37,	0,	160,	300,	"정복",	null],		
-		[10,	"공손연",	1031,	0,	null,	54,	63,	53,	0,	160,	300,	"패권",	"돌격"],		
-		[65,	"공손월",	1032,	0,	null,	43,	52,	41,	0,	160,	300,	"정복",	null],		
-		[65,	"공손찬",	1033,	0,	null,	48,	68,	55,	0,	160,	300,	"패권",	"기병"],		
-		[43,	"공융",	1034,	0,	null,	49,	42,	67,	0,	160,	300,	"왕좌",	"경작"],		
-		[35,	"공주",	1035,	0,	null,	50,	33,	62,	0,	160,	300,	"재간",	null],		
-		[83,	"공지",	1036,	0,	null,	47,	46,	53,	0,	160,	300,	"대의",	null],		
-		[26,	"곽가",	1037,	0,	null,	43,	23,	76,	0,	160,	300,	"패권",	"귀모"],		
-		[111,	"곽도",	1038,	0,	null,	49,	55,	64,	0,	160,	300,	"재간",	null],		
-		[2,	"곽사",	1039,	0,	null,	47,	55,	31,	0,	160,	300,	"패권",	null],		
-		[80,	"곽유지",	1040,	0,	null,	37,	22,	57,	0,	160,	300,	"재간",	"상재"],		
-		[67,	"곽익",	1041,	0,	null,	51,	50,	55,	0,	160,	300,	"재간",	null],		
-		[67,	"곽준",	1042,	0,	null,	54,	56,	59,	0,	160,	300,	"출세",	null],		
-		[27,	"곽혁",	1043,	0,	null,	40,	29,	63,	0,	160,	300,	"안전",	null],		
-		[20,	"곽회",	1044,	0,	null,	55,	60,	57,	0,	160,	300,	"정복",	null],		
-		[39,	"관구검",	1045,	0,	null,	53,	55,	61,	0,	160,	300,	"대의",	null],		
-		[76,	"관색",	1046,	0,	null,	52,	67,	55,	0,	160,	300,	"의협",	"징병"],		
-		[76,	"관우",	1047,	0,	null,	62,	75,	63,	0,	160,	300,	"의협",	"위압",	"나의 청룡 언월도를 과연 막아낼 수 있겠소?"],
-		[76,	"관이",	1048,	0,	null,	43,	50,	49,	0,	160,	300,	"안전",	null],		
-		[76,	"관통",	1049,	0,	null,	44,	52,	50,	0,	160,	300,	"대의",	null],		
-		[76,	"관평",	1050,	0,	null,	55,	63,	57,	0,	160,	300,	"의협",	"보병"],		
-		[7,	"관해",	1051,	0,	null,	50,	70,	33,	0,	160,	300,	"출세",	null],		
-		[76,	"관흥",	1052,	0,	null,	52,	66,	58,	0,	160,	300,	"의협",	"돌격"],		
-		[40,	"괴량",	1053,	0,	null,	40,	28,	64,	0,	160,	300,	"안전",	"신중"],		
-		[40,	"괴월",	1054,	0,	null,	26,	30,	66,	0,	160,	300,	"유지",	"귀병"],		
-		[98,	"교모",	1055,	0,	null,	48,	49,	51,	0,	160,	300,	"안전",	null],		
-		[98,	"교현",	1056,	0,	null,	44,	18,	50,	0,	160,	300,	"재간",	null],		
-		[6,	"구역거",	1057,	0,	null,	44,	58,	43,	0,	160,	300,	"안전",	null],		
-		[80,	"극정",	1058,	0,	null,	38,	25,	60,	0,	160,	300,	"유지",	null],		
-		[46,	"금선",	1059,	0,	null,	46,	43,	34,	0,	160,	300,	"할거",	null],		
-		[62,	"금환삼결",	1060,	0,	null,	42,	61,	17,	0,	160,	300,	"출세",	null],		
-		[141,	"기령",	1061,	0,	null,	54,	64,	32,	0,	160,	300,	"대의",	"무쌍"],		
-		[122,	"낙통",	1062,	0,	null,	47,	39,	56,	0,	160,	300,	"유지",	null],		
-		[124,	"노숙1",	1063,	0,	null,	60,	38,	73,	0,	160,	300,	"왕좌",	"상재"],		
-		[75,	"노식",	1064,	0,	null,	60,	46,	63,	0,	160,	300,	"왕좌",	"징병"],		
-		[59,	"뇌동",	1065,	0,	null,	52,	61,	40,	0,	160,	300,	"출세",	"궁병"],		
-		[142,	"뇌박",	1066,	0,	null,	46,	46,	32,	0,	160,	300,	"유지",	null],		
-		[127,	"능조",	1067,	0,	null,	51,	63,	39,	0,	160,	300,	"재간",	"공성"],		
-		[127,	"능통",	1068,	0,	null,	52,	62,	49,	0,	160,	300,	"의협",	"궁병"],		
-		[64,	"단경",	1069,	0,	null,	51,	51,	55,	0,	160,	300,	"정복",	null],		
-		[132,	"담웅",	1070,	0,	null,	45,	61,	19,	0,	160,	300,	"출세",	null],		
-		[99,	"답둔",	1071,	0,	null,	48,	57,	31,	0,	160,	300,	"유지",	null],		
-		[132,	"당자",	1072,	0,	null,	48,	47,	40,	0,	160,	300,	"안전",	null],		
-		[60,	"대래동주",	1073,	0,	null,	40,	53,	24,	0,	160,	300,	"안전",	null],		
-		[82,	"도겸",	1074,	0,	null,	44,	31,	51,	0,	160,	300,	"할거",	"인덕"],		
-		[120,	"도준",	1075,	0,	null,	50,	48,	43,	0,	160,	300,	"안전",	null],		
-		[73,	"동궐",	1076,	0,	null,	50,	43,	61,	0,	160,	300,	"대의",	null],		
-		[62,	"동다나",	1077,	0,	null,	44,	57,	27,	0,	160,	300,	"유지",	null],		
-		[2,	"동민",	1078,	0,	null,	45,	53,	43,	0,	160,	300,	"안전",	null],		
-		[21,	"동소",	1079,	0,	null,	42,	41,	51,	0,	160,	300,	"패권",	null],		
-		[127,	"동습",	1080,	0,	null,	45,	53,	31,	0,	160,	300,	"출세",	null],		
-		[89,	"동승",	1081,	0,	null,	54,	54,	53,	0,	160,	300,	"왕좌",	null],		
-		[78,	"동윤",	1082,	0,	null,	50,	26,	62,	0,	160,	300,	"왕좌",	null],		
-		[2,	"동탁",	1083,	0,	null,	59,	71,	46,	0,	160,	300,	"패권",	"기병"],		
-		[66,	"동화",	1084,	0,	null,	43,	53,	45,	0,	160,	300,	"대의",	null],		
-		[32,	"두예",	1085,	0,	null,	59,	63,	66,	0,	160,	300,	"정복",	null],		
-		[7,	"등무",	1086,	0,	null,	41,	59,	19,	0,	160,	300,	"정복",	null],		
-		[41,	"등애",	1087,	0,	null,	62,	65,	71,	0,	160,	300,	"패권",	"신산"],		
-		[116,	"등윤",	1088,	0,	null,	34,	38,	55,	0,	160,	300,	"안전",	null],		
-		[73,	"등지",	1089,	0,	null,	54,	44,	63,	0,	160,	300,	"할거",	"경작"],		
-		[41,	"등충",	1090,	0,	null,	48,	65,	47,	0,	160,	300,	"출세",	null],		
-		[54,	"등현",	1091,	0,	null,	50,	49,	51,	0,	160,	300,	"출세",	null],		
-		[29,	"마균",	1092,	0,	null,	33,	35,	63,	0,	160,	300,	"안전",	null],		
-		[71,	"마대",	1093,	0,	null,	55,	63,	43,	0,	160,	300,	"대의",	"기병"],		
-		[70,	"마등",	1094,	0,	null,	56,	68,	47,	0,	160,	300,	"왕좌",	"기병"],		
-		[80,	"마속",	1095,	0,	null,	53,	53,	65,	0,	160,	300,	"패권",	"집중"],		
-		[77,	"마량",	1096,	0,	null,	47,	25,	68,	0,	160,	300,	"왕좌",	null],		
-		[48,	"마완",	1097,	0,	null,	44,	53,	26,	0,	160,	300,	"안전",	"기병"],		
-		[19,	"마준",	1098,	0,	null,	42,	52,	51,	0,	160,	300,	"안전",	null],		
-		[71,	"마철",	1099,	0,	null,	52,	50,	31,	0,	160,	300,	"대의",	"기병"],		
-		[70,	"마초",	1100,	0,	null,	55,	75,	37,	0,	160,	300,	"대의",	"기병",	"금마초 나가신닷!"],
-		[131,	"마충1",	1101,	0,	null,	51,	51,	44,	0,	160,	300,	"재간",	null],		
-		[69,	"마충2",	1102,	0,	null,	48,	55,	44,	0,	160,	300,	"출세",	null],		
-		[71,	"마휴",	1103,	0,	null,	52,	50,	31,	0,	160,	300,	"대의",	"기병"],		
-		[116,	"만총",	1104,	0,	null,	56,	37,	62,	0,	160,	300,	"할거",	"신중"],		
-		[51,	"망아장",	1105,	0,	null,	29,	53,	20,	0,	160,	300,	"출세",	null],		
-		[44,	"맹달",	1106,	0,	null,	52,	54,	58,	0,	160,	300,	"할거",	"귀병"],		
-		[60,	"맹우",	1107,	0,	null,	49,	63,	26,	0,	160,	300,	"정복",	null],		
-		[60,	"맹획",	1108,	0,	null,	55,	71,	43,	0,	160,	300,	"왕좌",	"격노"],		
-		[29,	"모개",	1109,	0,	null,	42,	47,	47,	0,	160,	300,	"대의",	null],		
-		[51,	"목록대왕",	1110,	0,	null,	47,	57,	53,	0,	160,	300,	"재간",	"척사"],		
-		[96,	"목순",	1111,	0,	null,	17,	21,	55,	0,	160,	300,	"왕좌",	null],		
-		[43,	"무안국",	1112,	0,	null,	44,	59,	18,	0,	160,	300,	"재간",	null],		
-		[28,	"문빙",	1113,	0,	null,	52,	61,	39,	0,	160,	300,	"유지",	null],		
-		[38,	"문앙",	1114,	0,	null,	52,	71,	41,	0,	160,	300,	"대의",	null],		
-		[102,	"문추",	1115,	0,	null,	53,	73,	25,	0,	160,	300,	"출세",	"무쌍"],		
-		[38,	"문흠",	1116,	0,	null,	54,	61,	39,	0,	160,	300,	"대의",	null],		
-		[49,	"미당대왕",	1117,	0,	null,	50,	60,	31,	0,	160,	300,	"유지",	null],		
-		[108,	"미방",	1118,	0,	null,	47,	53,	35,	0,	160,	300,	"패권",	"징병"],		
-		[77,	"미축",	1119,	0,	null,	26,	30,	53,	0,	160,	300,	"왕좌",	"상재"],		
-		[94,	"반봉",	1120,	0,	null,	48,	60,	17,	0,	160,	300,	"출세",	null],		
-		[44,	"반준",	1121,	0,	null,	40,	21,	55,	0,	160,	300,	"안전",	null],		
-		[65,	"방덕",	1122,	0,	null,	54,	70,	55,	0,	160,	300,	"의협",	"기병"],		
-		[73,	"방통",	1123,	0,	null,	58,	37,	75,	0,	160,	300,	"패권",	"반계"],		
-		[65,	"방회",	1124,	0,	null,	25,	32,	49,	0,	160,	300,	"안전",	null],		
-		[68,	"배원소",	1125,	0,	null,	42,	56,	32,	0,	160,	300,	"재간",	null],		
-		[78,	"번건",	1126,	0,	null,	28,	31,	55,	0,	160,	300,	"대의",	null],		
-		[149,	"번주",	1127,	0,	null,	51,	61,	21,	0,	160,	300,	"할거",	null],		
-		[72,	"법정",	1128,	0,	null,	56,	29,	72,	0,	160,	300,	"패권",	"신산"],		
-		[8,	"변희",	1129,	0,	null,	50,	53,	27,	0,	160,	300,	"안전",	null],		
-		[121,	"보질",	1130,	0,	null,	47,	28,	61,	0,	160,	300,	"유지",	null],		
-		[113,	"복양흥",	1131,	0,	null,	47,	44,	57,	0,	160,	300,	"유지",	null],		
-		[110,	"봉기",	1132,	0,	null,	51,	45,	63,	0,	160,	300,	"패권",	"집중"],		
-		[74,	"부동",	1133,	0,	null,	47,	56,	56,	0,	160,	300,	"대의",	null],		
-		[108,	"부사인",	1134,	0,	null,	46,	49,	44,	0,	160,	300,	"출세",	null],		
-		[38,	"부손",	1135,	0,	null,	24,	39,	55,	0,	160,	300,	"안전",	null],		
-		[74,	"부첨",	1136,	0,	null,	48,	59,	40,	0,	160,	300,	"대의",	null],		
-		[66,	"비시",	1137,	0,	null,	18,	34,	51,	0,	160,	300,	"재간",	null],		
-		[141,	"비연",	1138,	0,	null,	50,	53,	45,	0,	160,	300,	"출세",	null],		
-		[77,	"비위",	1139,	0,	null,	53,	26,	59,	0,	160,	300,	"대의",	null],		
-		[144,	"사광",	1140,	0,	null,	47,	43,	54,	0,	160,	300,	"안전",	null],		
-		[71,	"사마가",	1141,	0,	null,	48,	67,	18,	0,	160,	300,	"정복",	"돌격"],		
-		[20,	"사마랑",	1142,	0,	null,	25,	31,	52,	0,	160,	300,	"대의",	null],		
-		[24,	"사마망",	1143,	0,	null,	52,	51,	53,	0,	160,	300,	"정복",	null],		
-		[24,	"사마부",	1144,	0,	null,	46,	31,	59,	0,	160,	300,	"대의",	null],		
-		[31,	"사마사",	1145,	0,	null,	59,	53,	71,	0,	160,	300,	"정복",	null],		
-		[31,	"사마소",	1146,	0,	null,	61,	52,	66,	0,	160,	300,	"정복",	null],		
-		[31,	"사마염",	1147,	0,	null,	61,	62,	58,	0,	160,	300,	"패권",	null],		
-		[30,	"사마유",	1148,	0,	null,	49,	40,	63,	0,	160,	300,	"왕좌",	null],		
-		[31,	"사마의",	1149,	0,	null,	63,	55,	75,	0,	160,	300,	"패권",	"반계"],		
-		[139,	"사섭",	1150,	0,	null,	49,	51,	57,	0,	160,	300,	"안전",	null],		
-		[139,	"사일",	1151,	0,	null,	48,	39,	55,	0,	160,	300,	"유지",	null],		
-		[132,	"사정",	1152,	0,	null,	51,	57,	20,	0,	160,	300,	"안전",	null],		
-		[146,	"사지",	1153,	0,	null,	48,	43,	57,	0,	160,	300,	"안전",	null],		
-		[144,	"사휘",	1154,	0,	null,	51,	57,	51,	0,	160,	300,	"유지",	null],		
-		[35,	"서막",	1155,	0,	null,	46,	37,	58,	0,	160,	300,	"유지",	null],		
-		[76,	"서서",	1156,	0,	null,	60,	57,	74,	0,	160,	300,	"의협",	"귀병"],		
-		[124,	"서성",	1157,	0,	null,	57,	61,	65,	0,	160,	300,	"대의",	null],		
-		[142,	"서영",	1158,	0,	null,	43,	52,	32,	0,	160,	300,	"안전",	null],		
-		[23,	"서질",	1159,	0,	null,	46,	59,	33,	0,	160,	300,	"재간",	null],		
-		[23,	"서황",	1160,	0,	null,	56,	69,	55,	0,	160,	300,	"의협",	"필살"],		
-		[32,	"석포",	1161,	0,	null,	52,	52,	49,	0,	160,	300,	"정복",	null],		
-		[131,	"설영",	1162,	0,	null,	42,	23,	53,	0,	160,	300,	"유지",	null],		
-		[128,	"설종",	1163,	0,	null,	27,	32,	55,	0,	160,	300,	"유지",	null],		
-		[69,	"성의",	1164,	0,	null,	42,	53,	22,	0,	160,	300,	"재간",	null],		
-		[129,	"소비",	1165,	0,	null,	51,	52,	43,	0,	160,	300,	"대의",	null],		
-		[76,	"손건",	1166,	0,	null,	41,	32,	59,	0,	160,	300,	"대의",	"거상"],		
-		[125,	"손견",	1167,	0,	null,	62,	73,	61,	0,	160,	300,	"왕좌",	"무쌍"],		
-		[126,	"손광",	1168,	0,	null,	49,	46,	49,	0,	160,	300,	"유지",	null],		
-		[125,	"손권",	1169,	0,	null,	60,	61,	65,	0,	160,	300,	"할거",	"수비"],		
-		[126,	"손랑",	1170,	0,	null,	27,	46,	28,	0,	160,	300,	"안전",	null],		
-		[126,	"손등",	1171,	0,	null,	45,	36,	61,	0,	160,	300,	"할거",	null],		
-		[125,	"손량",	1172,	0,	null,	24,	23,	63,	0,	160,	300,	"할거",	null],		
-		[20,	"손례",	1173,	0,	null,	50,	53,	56,	0,	160,	300,	"안전",	null],		
-		[124,	"손소",	1174,	0,	null,	54,	63,	55,	0,	160,	300,	"정복",	null],		
-		[130,	"손수",	1175,	0,	null,	51,	48,	49,	0,	160,	300,	"안전",	null],		
-		[126,	"손유",	1176,	0,	null,	55,	50,	55,	0,	160,	300,	"정복",	null],		
-		[122,	"손이",	1177,	0,	null,	47,	51,	48,	0,	160,	300,	"안전",	null],		
-		[126,	"손정",	1178,	0,	null,	48,	47,	51,	0,	160,	300,	"유지",	null],		
-		[115,	"손준",	1179,	0,	null,	48,	56,	44,	0,	160,	300,	"정복",	null],		
-		[7,	"손중",	1180,	0,	null,	45,	52,	24,	0,	160,	300,	"안전",	null],		
-		[125,	"손책",	1181,	0,	null,	62,	74,	62,	0,	160,	300,	"패권",	"필살",	"소패왕 손책이 나가신다! 길을 비켜라!"],
-		[115,	"손침",	1182,	0,	null,	44,	57,	37,	0,	160,	300,	"패권",	null],		
-		[114,	"손호",	1183,	0,	null,	20,	62,	55,	0,	160,	300,	"패권",	null],		
-		[126,	"손화",	1184,	0,	null,	35,	25,	57,	0,	160,	300,	"왕좌",	null],		
-		[127,	"손환",	1185,	0,	null,	56,	53,	57,	0,	160,	300,	"정복",	null],		
-		[126,	"손휴",	1186,	0,	null,	49,	39,	53,	0,	160,	300,	"정복",	null],		
-		[117,	"손흠",	1187,	0,	null,	50,	52,	32,	0,	160,	300,	"정복",	null],		
-		[147,	"송헌",	1188,	0,	null,	41,	52,	37,	0,	160,	300,	"안전",	null],		
-		[95,	"순우경",	1189,	0,	null,	53,	55,	50,	0,	160,	300,	"할거",	null],		
-		[22,	"순욱1",	1190,	0,	null,	46,	29,	75,	0,	160,	300,	"왕좌",	"집중"],		
-		[22,	"순유",	1191,	0,	null,	53,	37,	70,	0,	160,	300,	"대의",	"신중"],		
-		[29,	"신비",	1192,	0,	null,	43,	28,	59,	0,	160,	300,	"재간",	null],		
-		[37,	"신의",	1193,	0,	null,	46,	51,	44,	0,	160,	300,	"출세",	null],		
-		[37,	"신탐",	1194,	0,	null,	46,	49,	48,	0,	160,	300,	"출세",	null],		
-		[85,	"신평",	1195,	0,	null,	51,	44,	60,	0,	160,	300,	"왕좌",	null],		
-		[102,	"심배",	1196,	0,	null,	54,	54,	55,	0,	160,	300,	"패권",	"귀병"],		
-		[126,	"심영",	1197,	0,	null,	45,	58,	44,	0,	160,	300,	"재간",	null],		
-		[47,	"아하소과",	1198,	0,	null,	45,	60,	15,	0,	160,	300,	"안전",	"척사"],		
-		[62,	"아회남",	1199,	0,	null,	44,	59,	30,	0,	160,	300,	"출세",	"척사"],		
-		[23,	"악진",	1200,	0,	null,	53,	55,	47,	0,	160,	300,	"대의",	"돌격"],		
-		[23,	"악침",	1201,	0,	null,	42,	45,	32,	0,	160,	300,	"대의",	null],		
-		[63,	"악환",	1202,	0,	null,	46,	65,	47,	0,	160,	300,	"재간",	null],		
-		[102,	"안량",	1203,	0,	null,	53,	72,	34,	0,	160,	300,	"출세",	"위압"],		
-		[14,	"양백",	1204,	0,	null,	46,	46,	45,	0,	160,	300,	"안전",	null],		
-		[92,	"양봉1",	1205,	0,	null,	47,	53,	34,	0,	160,	300,	"유지",	null],		
-		[91,	"양봉2",	1206,	0,	null,	49,	62,	51,	0,	160,	300,	"정복",	null],		
-		[13,	"양송",	1207,	0,	null,	15,	33,	33,	0,	160,	300,	"안전",	null],		
-		[43,	"양수",	1208,	0,	null,	18,	31,	71,	0,	160,	300,	"재간",	"귀병"],		
-		[61,	"양의",	1209,	0,	null,	51,	47,	57,	0,	160,	300,	"유지",	null],		
-		[141,	"양조1",	1210,	0,	null,	51,	46,	50,	0,	160,	300,	"출세",	null],		
-		[9,	"양추1",	1211,	0,	null,	44,	55,	16,	0,	160,	300,	"정복",	null],		
-		[31,	"양호",	1212,	0,	null,	60,	56,	63,	0,	160,	300,	"패권",	null],		
-		[53,	"양회",	1213,	0,	null,	48,	55,	37,	0,	160,	300,	"출세",	null],		
-		[141,	"양흥",	1214,	0,	null,	45,	55,	17,	0,	160,	300,	"안전",	null],		
-		[6,	"어부라",	1215,	0,	null,	55,	63,	51,	0,	160,	300,	"정복",	null],		
-		[64,	"엄강",	1216,	0,	null,	47,	53,	39,	0,	160,	300,	"재간",	null],		
-		[10,	"엄백호",	1217,	0,	null,	43,	55,	30,	0,	160,	300,	"할거",	null],		
-		[10,	"엄여",	1218,	0,	null,	35,	54,	24,	0,	160,	300,	"할거",	null],		
-		[69,	"엄안",	1219,	0,	null,	53,	66,	55,	0,	160,	300,	"왕좌",	null],		
-		[7,	"엄정",	1220,	0,	null,	31,	55,	43,	0,	160,	300,	"출세",	null],		
-		[121,	"엄준",	1221,	0,	null,	42,	24,	57,	0,	160,	300,	"재간",	null],		
-		[71,	"여개",	1222,	0,	null,	44,	38,	55,	0,	160,	300,	"유지",	null],		
-		[29,	"여건",	1223,	0,	null,	42,	55,	29,	0,	160,	300,	"출세",	null],		
-		[107,	"여광",	1224,	0,	null,	48,	55,	27,	0,	160,	300,	"유지",	null],		
-		[124,	"여몽",	1225,	0,	null,	61,	62,	72,	0,	160,	300,	"패권",	"궁병"],		
-		[123,	"여범",	1226,	0,	null,	41,	33,	57,	0,	160,	300,	"할거",	null],		
-		[107,	"여상",	1227,	0,	null,	49,	55,	26,	0,	160,	300,	"유지",	null],		
-		[105,	"여위황",	1228,	0,	null,	41,	51,	35,	0,	160,	300,	"정복",	null],		
-		[145,	"여포",	1229,	0,	null,	54,	77,	29,	0,	160,	300,	"패권",	"돌격",	"다 죽여버리겠다! 으하하."],
-		[50,	"염우",	1230,	0,	null,	47,	44,	18,	0,	160,	300,	"출세",	null],		
-		[40,	"염유",	1231,	0,	null,	48,	60,	44,	0,	160,	300,	"출세",	null],		
-		[18,	"염포",	1232,	0,	null,	33,	33,	61,	0,	160,	300,	"유지",	null],		
-		[40,	"예형",	1233,	0,	null,	55,	31,	73,	0,	160,	300,	"은둔",	"통찰"],		
-		[133,	"오강",	1234,	0,	null,	43,	35,	51,	0,	160,	300,	"안전",	null],		
-		[59,	"오란",	1235,	0,	null,	51,	60,	38,	0,	160,	300,	"재간",	null],		
-		[72,	"오반",	1236,	0,	null,	52,	54,	40,	0,	160,	300,	"재간",	null],		
-		[128,	"오언",	1237,	0,	null,	52,	50,	45,	0,	160,	300,	"재간",	null],		
-		[126,	"오연",	1238,	0,	null,	36,	57,	31,	0,	160,	300,	"정복",	null],		
-		[69,	"오의",	1239,	0,	null,	54,	58,	59,	0,	160,	300,	"유지",	null],		
-		[19,	"오질",	1240,	0,	null,	41,	35,	56,	0,	160,	300,	"출세",	null],		
-		[51,	"올돌골",	1241,	0,	null,	55,	71,	15,	0,	160,	300,	"출세",	"척사"],		
-		[52,	"옹개",	1242,	0,	null,	47,	55,	44,	0,	160,	300,	"안전",	null],		
-		[20,	"왕경",	1243,	0,	null,	46,	41,	53,	0,	160,	300,	"재간",	null],		
-		[97,	"왕광",	1244,	0,	null,	53,	55,	46,	0,	160,	300,	"유지",	null],		
-		[30,	"왕기1",	1245,	0,	null,	54,	51,	57,	0,	160,	300,	"유지",	null],		
-		[34,	"왕랑",	1246,	0,	null,	44,	29,	44,	0,	160,	300,	"할거",	null],		
-		[57,	"왕루",	1247,	0,	null,	40,	28,	61,	0,	160,	300,	"유지",	null],		
-		[76,	"왕보",	1248,	0,	null,	43,	33,	60,	0,	160,	300,	"대의",	null],		
-		[86,	"왕수",	1249,	0,	null,	34,	33,	55,	0,	160,	300,	"재간",	null],		
-		[26,	"왕쌍",	1250,	0,	null,	47,	69,	15,	0,	160,	300,	"정복",	"보병"],		
-		[46,	"왕위",	1251,	0,	null,	48,	50,	55,	0,	160,	300,	"안전",	null],		
-		[92,	"왕윤",	1252,	0,	null,	16,	18,	61,	0,	160,	300,	"왕좌",	null],		
-		[40,	"왕융",	1253,	0,	null,	49,	37,	61,	0,	160,	300,	"재간",	null],		
-		[32,	"왕준",	1254,	0,	null,	56,	65,	61,	0,	160,	300,	"대의",	null],		
-		[30,	"왕찬",	1255,	0,	null,	28,	28,	62,	0,	160,	300,	"안전",	null],		
-		[33,	"왕창",	1256,	0,	null,	54,	48,	45,	0,	160,	300,	"정복",	null],		
-		[69,	"왕평",	1257,	0,	null,	55,	61,	57,	0,	160,	300,	"재간",	null],		
-		[71,	"왕항",	1258,	0,	null,	44,	39,	50,	0,	160,	300,	"대의",	null],		
-		[33,	"왕혼",	1259,	0,	null,	52,	31,	49,	0,	160,	300,	"정복",	null],		
-		[71,	"요립",	1260,	0,	null,	50,	37,	66,	0,	160,	300,	"출세",	null],		
-		[74,	"요화",	1261,	0,	null,	51,	49,	50,	0,	160,	300,	"의협",	null],		
-		[22,	"우금1",	1262,	0,	null,	56,	59,	57,	0,	160,	300,	"정복",	null],		
-		[27,	"우금2",	1263,	0,	null,	49,	61,	35,	0,	160,	300,	"대의",	null],		
-		[122,	"우번",	1264,	0,	null,	23,	38,	59,	0,	160,	300,	"유지",	null],		
-		[126,	"우전",	1265,	0,	null,	49,	47,	37,	0,	160,	300,	"안전",	null],		
-		[86,	"원담",	1266,	0,	null,	51,	49,	47,	0,	160,	300,	"왕좌",	null],		
-		[101,	"원상",	1267,	0,	null,	46,	58,	55,	0,	160,	300,	"패권",	null],		
-		[101,	"원소",	1268,	0,	null,	58,	55,	61,	0,	160,	300,	"패권",	"위압"],		
-		[140,	"원술",	1269,	0,	null,	55,	49,	57,	0,	160,	300,	"패권",	"축성"],		
-		[140,	"원윤",	1270,	0,	null,	40,	33,	50,	0,	160,	300,	"패권",	null],		
-		[101,	"원희",	1271,	0,	null,	52,	48,	58,	0,	160,	300,	"할거",	null],		
-		[131,	"위소",	1272,	0,	null,	39,	24,	65,	0,	160,	300,	"재간",	null],		
-		[147,	"위속",	1273,	0,	null,	47,	49,	37,	0,	160,	300,	"안전",	null],		
-		[81,	"위연",	1274,	0,	null,	55,	73,	51,	0,	160,	300,	"패권",	"보병"],		
-		[96,	"위유",	1275,	0,	null,	45,	56,	57,	0,	160,	300,	"재간",	null],		
-		[76,	"유기",	1276,	0,	null,	47,	19,	59,	0,	160,	300,	"왕좌",	null],		
-		[36,	"유대",	1277,	0,	null,	48,	48,	51,	0,	160,	300,	"재간",	null],		
-		[134,	"유도",	1278,	0,	null,	35,	32,	55,	0,	160,	300,	"재간",	null],		
-		[46,	"유벽",	1279,	0,	null,	49,	57,	23,	0,	160,	300,	"출세",	null],		
-		[75,	"유봉",	1280,	0,	null,	48,	53,	51,	0,	160,	300,	"출세",	null],		
-		[75,	"유비",	1281,	0,	null,	58,	60,	57,	0,	160,	300,	"왕좌",	"인덕"],		
-		[75,	"유선1",	1282,	0,	null,	24,	17,	21,	0,	160,	300,	"대의",	null],		
-		[55,	"유순",	1283,	0,	null,	51,	51,	46,	0,	160,	300,	"출세",	null],		
-		[75,	"유심",	1284,	0,	null,	49,	41,	57,	0,	160,	300,	"왕좌",	null],		
-		[129,	"유약",	1285,	0,	null,	51,	52,	51,	0,	160,	300,	"유지",	null],		
-		[55,	"유언",	1286,	0,	null,	48,	37,	59,	0,	160,	300,	"할거",	null],		
-		[27,	"유엽",	1287,	0,	null,	40,	29,	63,	0,	160,	300,	"유지",	null],		
-		[11,	"유요",	1288,	0,	null,	23,	22,	42,	0,	160,	300,	"안전",	"발명"],		
-		[96,	"유우",	1289,	0,	null,	51,	33,	58,	0,	160,	300,	"왕좌",	null],		
-		[55,	"유장",	1290,	0,	null,	38,	31,	52,	0,	160,	300,	"할거",	"수비"],		
-		[45,	"유종",	1291,	0,	null,	22,	26,	51,	0,	160,	300,	"할거",	null],		
-		[56,	"유파",	1292,	0,	null,	43,	31,	57,	0,	160,	300,	"대의",	null],		
-		[45,	"유표1",	1293,	0,	null,	52,	48,	57,	0,	160,	300,	"할거",	null],		
-		[27,	"유표2",	1294,	0,	null,	54,	47,	57,	0,	160,	300,	"안전",	null],		
-		[134,	"유현",	1295,	0,	null,	32,	47,	47,	0,	160,	300,	"안전",	null],		
-		[122,	"육개",	1296,	0,	null,	50,	30,	58,	0,	160,	300,	"재간",	null],		
-		[122,	"육손",	1297,	0,	null,	63,	55,	75,	0,	160,	300,	"왕좌",	"귀병"],		
-		[121,	"육적",	1298,	0,	null,	42,	29,	59,	0,	160,	300,	"안전",	null],		
-		[122,	"육항",	1299,	0,	null,	62,	56,	73,	0,	160,	300,	"왕좌",	null],		
-		[38,	"윤대목",	1300,	0,	null,	49,	43,	56,	0,	160,	300,	"재간",	null],		
-		[80,	"윤묵",	1301,	0,	null,	19,	28,	59,	0,	160,	300,	"대의",	null],		
-		[72,	"윤상",	1302,	0,	null,	30,	31,	38,	0,	160,	300,	"대의",	null],		
-		[136,	"윤직",	1303,	0,	null,	42,	49,	52,	0,	160,	300,	"재간",	null],		
-		[2,	"이각",	1304,	0,	null,	46,	61,	39,	0,	160,	300,	"패권",	null],		
-		[146,	"이숙",	1305,	0,	null,	27,	40,	55,	0,	160,	300,	"재간",	null],		
-		[71,	"이엄",	1306,	0,	null,	56,	66,	64,	0,	160,	300,	"패권",	null],		
-		[2,	"이유",	1307,	0,	null,	50,	22,	70,	0,	160,	300,	"패권",	"귀모"],		
-		[132,	"이이",	1308,	0,	null,	46,	60,	20,	0,	160,	300,	"정복",	null],		
-		[77,	"이적",	1309,	0,	null,	46,	27,	61,	0,	160,	300,	"할거",	null],		
-		[22,	"이전",	1310,	0,	null,	54,	55,	65,	0,	160,	300,	"왕좌",	null],		
-		[71,	"이풍1",	1311,	0,	null,	48,	47,	51,	0,	160,	300,	"재간",	null],		
-		[66,	"이회",	1312,	0,	null,	51,	43,	63,	0,	160,	300,	"유지",	null],		
-		[114,	"잠혼",	1313,	0,	null,	15,	16,	39,	0,	160,	300,	"할거",	null],		
-		[7,	"장각",	1314,	0,	null,	61,	25,	72,	0,	160,	300,	"패권",	"환술"],		
-		[34,	"장간",	1315,	0,	null,	19,	20,	57,	0,	160,	300,	"재간",	null],		
-		[7,	"장개",	1316,	0,	null,	43,	56,	19,	0,	160,	300,	"안전",	null],		
-		[122,	"장굉",	1317,	0,	null,	25,	21,	67,	0,	160,	300,	"왕좌",	null],		
-		[7,	"장량",	1318,	0,	null,	51,	64,	55,	0,	160,	300,	"정복",	"환술"],		
-		[15,	"장로",	1319,	0,	null,	54,	39,	63,	0,	160,	300,	"유지",	"축성"],		
-		[23,	"장료",	1320,	0,	null,	60,	72,	65,	0,	160,	300,	"의협",	"견고"],		
-		[7,	"장보",	1321,	0,	null,	55,	64,	61,	0,	160,	300,	"패권",	"환술"],		
-		[76,	"장비",	1322,	0,	null,	56,	76,	42,	0,	160,	300,	"의협",	"무쌍",	"어쭈. 해보자 이거냐?"],
-		[62,	"장서",	1323,	0,	null,	42,	42,	33,	0,	160,	300,	"출세",	null],		
-		[120,	"장소1",	1324,	0,	null,	41,	24,	71,	0,	160,	300,	"안전",	null],		
-		[78,	"장소2",	1325,	0,	null,	44,	39,	57,	0,	160,	300,	"재간",	null],		
-		[72,	"장송",	1326,	0,	null,	44,	28,	72,	0,	160,	300,	"할거",	"통찰"],		
-		[148,	"장수",	1327,	0,	null,	52,	58,	56,	0,	160,	300,	"할거",	null],		
-		[145,	"장양1",	1328,	0,	null,	49,	54,	53,	0,	160,	300,	"출세",	null],		
-		[8,	"장연",	1329,	0,	null,	55,	54,	41,	0,	160,	300,	"안전",	null],		
-		[11,	"장영",	1330,	0,	null,	46,	53,	37,	0,	160,	300,	"재간",	null],		
-		[118,	"장온",	1331,	0,	null,	21,	30,	56,	0,	160,	300,	"할거",	null],		
-		[78,	"장완",	1332,	0,	null,	52,	47,	67,	0,	160,	300,	"할거",	"상재"],		
-		[15,	"장위",	1333,	0,	null,	50,	57,	29,	0,	160,	300,	"대의",	null],		
-		[36,	"장윤",	1334,	0,	null,	51,	49,	50,	0,	160,	300,	"정복",	null],		
-		[104,	"장의거",	1335,	0,	null,	51,	49,	33,	0,	160,	300,	"대의",	null],		
-		[68,	"장익",	1336,	0,	null,	54,	55,	52,	0,	160,	300,	"유지",	null],		
-		[56,	"장임",	1337,	0,	null,	57,	65,	59,	0,	160,	300,	"대의",	"견고"],		
-		[148,	"장제1",	1338,	0,	null,	52,	53,	49,	0,	160,	300,	"할거",	null],		
-		[32,	"장제2",	1339,	0,	null,	30,	32,	66,	0,	160,	300,	"유지",	null],		
-		[126,	"장제3",	1340,	0,	null,	54,	43,	51,	0,	160,	300,	"할거",	null],		
-		[17,	"장패",	1341,	0,	null,	42,	62,	39,	0,	160,	300,	"할거",	null],		
-		[76,	"장포1",	1342,	0,	null,	52,	67,	43,	0,	160,	300,	"재간",	"징병"],		
-		[113,	"장포2",	1343,	0,	null,	49,	54,	44,	0,	160,	300,	"유지",	null],		
-		[27,	"장합",	1344,	0,	null,	57,	71,	52,	0,	160,	300,	"출세",	"궁병"],		
-		[23,	"장호",	1345,	0,	null,	46,	51,	46,	0,	160,	300,	"정복",	null],		
-		[31,	"장화",	1346,	0,	null,	44,	24,	67,	0,	160,	300,	"유지",	null],		
-		[48,	"장횡",	1347,	0,	null,	45,	55,	25,	0,	160,	300,	"재간",	null],		
-		[141,	"장훈",	1348,	0,	null,	51,	51,	50,	0,	160,	300,	"안전",	null],		
-		[120,	"장휴",	1349,	0,	null,	41,	33,	57,	0,	160,	300,	"재간",	null],		
-		[126,	"장흠",	1350,	0,	null,	50,	54,	55,	0,	160,	300,	"대의",	"저격"],		
-		[96,	"저수",	1351,	0,	null,	57,	46,	69,	0,	160,	300,	"할거",	"반계"],		
-		[130,	"전단",	1352,	0,	null,	50,	59,	51,	0,	160,	300,	"출세",	null],		
-		[42,	"전속",	1353,	0,	null,	50,	48,	43,	0,	160,	300,	"안전",	null],		
-		[26,	"전위1",	1354,	0,	null,	48,	74,	33,	0,	160,	300,	"의협",	"필살"],		
-		[130,	"전위2",	1355,	0,	null,	54,	56,	51,	0,	160,	300,	"출세",	null],		
-		[128,	"전종",	1356,	0,	null,	56,	61,	59,	0,	160,	300,	"패권",	null],		
-		[42,	"전주",	1357,	0,	null,	52,	55,	44,	0,	160,	300,	"의협",	null],		
-		[96,	"전풍",	1358,	0,	null,	56,	37,	74,	0,	160,	300,	"왕좌",	null],		
-		[24,	"정무",	1359,	0,	null,	46,	35,	59,	0,	160,	300,	"출세",	null],		
-		[119,	"정병",	1360,	0,	null,	22,	25,	55,	0,	160,	300,	"유지",	null],		
-		[126,	"정보",	1361,	0,	null,	56,	53,	61,	0,	160,	300,	"패권",	null],		
-		[123,	"정봉1",	1362,	0,	null,	52,	61,	53,	0,	160,	300,	"패권",	null],		
-		[24,	"정욱",	1363,	0,	null,	56,	36,	70,	0,	160,	300,	"패권",	"신중"],		
-		[88,	"정원",	1364,	0,	null,	50,	61,	49,	0,	160,	300,	"왕좌",	"기병"],		
-		[7,	"정원지",	1365,	0,	null,	40,	59,	35,	0,	160,	300,	"출세",	null],		
-		[69,	"정은",	1366,	0,	null,	45,	51,	26,	0,	160,	300,	"재간",	null],		
-		[121,	"제갈각",	1367,	0,	null,	48,	45,	71,	0,	160,	300,	"왕좌",	null],		
-		[76,	"제갈균",	1368,	0,	null,	48,	40,	59,	0,	160,	300,	"안전",	"상재"],		
-		[121,	"제갈근",	1369,	0,	null,	48,	38,	69,	0,	160,	300,	"왕좌",	"경작"],		
-		[76,	"제갈량",	1370,	0,	null,	63,	47,	77,	0,	160,	300,	"왕좌",	"집중",	"슬슬 나의 지모를 발휘해 보겠습니다..."],
-		[76,	"제갈상",	1371,	0,	null,	45,	60,	57,	0,	160,	300,	"대의",	null],		
-		[135,	"제갈정",	1372,	0,	null,	46,	48,	46,	0,	160,	300,	"안전",	null],		
-		[76,	"제갈첨",	1373,	0,	null,	53,	45,	61,	0,	160,	300,	"대의",	null],		
-		[135,	"제갈탄",	1374,	0,	null,	56,	63,	59,	0,	160,	300,	"패권",	null],		
-		[76,	"조광",	1375,	0,	null,	50,	55,	46,	0,	160,	300,	"재간",	null],		
-		[74,	"조루",	1376,	0,	null,	44,	35,	50,	0,	160,	300,	"대의",	null],		
-		[24,	"조모",	1377,	0,	null,	45,	31,	30,	0,	160,	300,	"할거",	null],		
-		[127,	"조무",	1378,	0,	null,	52,	55,	57,	0,	160,	300,	"의협",	null],		
-		[26,	"조방",	1379,	0,	null,	44,	20,	31,	0,	160,	300,	"정복",	null],		
-		[83,	"조범",	1380,	0,	null,	47,	37,	52,	0,	160,	300,	"유지",	null],		
-		[26,	"조비",	1381,	0,	null,	53,	56,	60,	0,	160,	300,	"패권",	"징병"],		
-		[19,	"조상",	1382,	0,	null,	51,	51,	31,	0,	160,	300,	"패권",	null],		
-		[147,	"조성",	1383,	0,	null,	42,	56,	44,	0,	160,	300,	"안전",	null],		
-		[26,	"조순",	1384,	0,	null,	50,	48,	58,	0,	160,	300,	"정복",	null],		
-		[25,	"조식",	1385,	0,	null,	19,	19,	70,	0,	160,	300,	"왕좌",	"귀모"],		
-		[25,	"조앙",	1386,	0,	null,	42,	53,	51,	0,	160,	300,	"왕좌",	null],		
-		[25,	"조예",	1387,	0,	null,	47,	47,	65,	0,	160,	300,	"정복",	null],		
-		[26,	"조우",	1388,	0,	null,	51,	47,	55,	0,	160,	300,	"대의",	null],		
-		[76,	"조운",	1389,	0,	null,	62,	75,	68,	0,	160,	300,	"왕좌",	"무쌍",	"창술의 달인 상산 조자룡 여기 있소!"],
-		[25,	"조웅",	1390,	0,	null,	48,	27,	39,	0,	160,	300,	"안전",	null],		
-		[26,	"조인",	1391,	0,	null,	54,	63,	51,	0,	160,	300,	"패권",	"보병"],		
-		[25,	"조조",	1392,	0,	null,	64,	63,	73,	0,	160,	300,	"패권",	"반계"],		
-		[26,	"조진",	1393,	0,	null,	57,	55,	53,	0,	160,	300,	"정복",	null],		
-		[25,	"조창",	1394,	0,	null,	54,	69,	35,	0,	160,	300,	"정복",	"돌격"],		
-		[76,	"조통",	1395,	0,	null,	50,	53,	47,	0,	160,	300,	"재간",	null],		
-		[84,	"조표",	1396,	0,	null,	34,	57,	16,	0,	160,	300,	"안전",	null],		
-		[7,	"조홍1",	1397,	0,	null,	45,	54,	38,	0,	160,	300,	"유지",	null],		
-		[24,	"조홍2",	1398,	0,	null,	53,	56,	39,	0,	160,	300,	"패권",	null],		
-		[26,	"조환",	1399,	0,	null,	34,	24,	38,	0,	160,	300,	"정복",	null],		
-		[19,	"조훈",	1400,	0,	null,	51,	52,	30,	0,	160,	300,	"출세",	null],		
-		[26,	"조휴",	1401,	0,	null,	54,	57,	57,	0,	160,	300,	"패권",	null],		
-		[19,	"조희",	1402,	0,	null,	50,	48,	57,	0,	160,	300,	"대의",	null],		
-		[22,	"종요",	1403,	0,	null,	16,	20,	59,	0,	160,	300,	"유지",	null],		
-		[20,	"종회",	1404,	0,	null,	58,	49,	72,	0,	160,	300,	"패권",	null],		
-		[128,	"주거",	1405,	0,	null,	53,	57,	58,	0,	160,	300,	"유지",	null],		
-		[118,	"주방",	1406,	0,	null,	46,	34,	61,	0,	160,	300,	"할거",	null],		
-		[126,	"주연",	1407,	0,	null,	53,	58,	44,	0,	160,	300,	"할거",	null],		
-		[126,	"주유",	1408,	0,	null,	63,	59,	75,	0,	160,	300,	"패권",	"신산"],		
-		[128,	"주이",	1409,	0,	null,	48,	47,	51,	0,	160,	300,	"안전",	null],		
-		[88,	"주준",	1410,	0,	null,	57,	60,	53,	0,	160,	300,	"왕좌",	null],		
-		[32,	"주지",	1411,	0,	null,	45,	61,	41,	0,	160,	300,	"안전",	null],		
-		[76,	"주창",	1412,	0,	null,	41,	63,	30,	0,	160,	300,	"의협",	"궁병"],		
-		[126,	"주치",	1413,	0,	null,	47,	47,	47,	0,	160,	300,	"안전",	null],		
-		[41,	"주태1",	1414,	0,	null,	49,	47,	51,	0,	160,	300,	"안전",	null],		
-		[126,	"주태2",	1415,	0,	null,	54,	69,	50,	0,	160,	300,	"정복",	"필살"],		
-		[128,	"주환",	1416,	0,	null,	58,	67,	59,	0,	160,	300,	"정복",	null],		
-		[29,	"진건",	1417,	0,	null,	49,	57,	51,	0,	160,	300,	"정복",	null],		
-		[29,	"진교",	1418,	0,	null,	21,	25,	55,	0,	160,	300,	"유지",	null],		
-		[28,	"진군",	1419,	0,	null,	48,	35,	68,	0,	160,	300,	"대의",	null],		
-		[143,	"진궁",	1420,	0,	null,	55,	44,	70,	0,	160,	300,	"할거",	"신중"],		
-		[79,	"진규",	1421,	0,	null,	22,	19,	57,	0,	160,	300,	"할거",	null],		
-		[72,	"진도",	1422,	0,	null,	52,	67,	57,	0,	160,	300,	"대의",	null],		
-		[79,	"진등",	1423,	0,	null,	50,	51,	57,	0,	160,	300,	"할거",	null],		
-		[37,	"진림",	1424,	0,	null,	44,	28,	65,	0,	160,	300,	"재간",	null],		
-		[124,	"진무",	1425,	0,	null,	49,	59,	49,	0,	160,	300,	"재간",	null],		
-		[66,	"진복",	1426,	0,	null,	36,	27,	61,	0,	160,	300,	"재간",	null],		
-		[50,	"진수",	1427,	0,	null,	25,	29,	65,	0,	160,	300,	"대의",	null],		
-		[81,	"진식",	1428,	0,	null,	43,	55,	45,	0,	160,	300,	"출세",	null],		
-		[79,	"진진",	1429,	0,	null,	47,	35,	53,	0,	160,	300,	"재간",	null],		
-		[28,	"진태",	1430,	0,	null,	56,	61,	57,	0,	160,	300,	"대의",	null],		
-		[11,	"진횡",	1431,	0,	null,	38,	49,	41,	0,	160,	300,	"출세",	null],		
-		[21,	"차주",	1432,	0,	null,	46,	54,	51,	0,	160,	300,	"안전",	null],		
-		[11,	"착융",	1433,	0,	null,	49,	49,	21,	0,	160,	300,	"출세",	null],		
-		[36,	"채모",	1434,	0,	null,	56,	56,	55,	0,	160,	300,	"정복",	"궁병"],		
-		[36,	"채중",	1435,	0,	null,	47,	39,	47,	0,	160,	300,	"출세",	null],		
-		[36,	"채화",	1436,	0,	null,	46,	41,	43,	0,	160,	300,	"안전",	null],		
-		[66,	"초주",	1437,	0,	null,	22,	26,	64,	0,	160,	300,	"대의",	null],		
-		[20,	"최염",	1438,	0,	null,	41,	46,	55,	0,	160,	300,	"대의",	null],		
-		[60,	"축융",	1439,	0,	null,	48,	68,	25,	0,	160,	300,	"정복",	"척사"],		
-		[60,	"타사대왕",	1440,	0,	null,	48,	58,	55,	0,	160,	300,	"출세",	"척사"],		
-		[124,	"태사자",	1441,	0,	null,	52,	75,	53,	0,	160,	300,	"대의",	"무쌍"],		
-		[124,	"태사향",	1442,	0,	null,	44,	56,	43,	0,	160,	300,	"재간",	null],		
-		[12,	"포륭",	1443,	0,	null,	45,	59,	20,	0,	160,	300,	"안전",	null],		
-		[74,	"풍습",	1444,	0,	null,	36,	53,	39,	0,	160,	300,	"재간",	null],		
-		[7,	"하의",	1445,	0,	null,	44,	55,	25,	0,	160,	300,	"출세",	null],		
-		[121,	"하제",	1446,	0,	null,	54,	59,	53,	0,	160,	300,	"재간",	null],		
-		[90,	"하진",	1447,	0,	null,	44,	56,	35,	0,	160,	300,	"왕좌",	null],		
-		[24,	"하후덕",	1448,	0,	null,	51,	53,	36,	0,	160,	300,	"출세",	null],		
-		[26,	"하후돈",	1449,	0,	null,	59,	71,	57,	0,	160,	300,	"의협",	"돌격",	"다 나오거라! 상대해 주마!"],
-		[19,	"하후무",	1450,	0,	null,	38,	32,	35,	0,	160,	300,	"안전",	null],		
-		[24,	"하후상",	1451,	0,	null,	51,	51,	57,	0,	160,	300,	"출세",	null],		
-		[26,	"하후연",	1452,	0,	null,	56,	70,	49,	0,	160,	300,	"패권",	"궁병",	"궁술로 날 당해낼 자가 있을까? 후후."],
-		[26,	"하후위",	1453,	0,	null,	53,	61,	57,	0,	160,	300,	"정복",	null],		
-		[26,	"하후은",	1454,	0,	null,	44,	44,	36,	0,	160,	300,	"안전",	null],		
-		[23,	"하후패",	1455,	0,	null,	55,	69,	56,	0,	160,	300,	"대의",	null],		
-		[20,	"하후현",	1456,	0,	null,	47,	23,	60,	0,	160,	300,	"유지",	null],		
-		[26,	"하후혜",	1457,	0,	null,	54,	54,	62,	0,	160,	300,	"정복",	null],		
-		[26,	"하후화",	1458,	0,	null,	55,	51,	63,	0,	160,	300,	"정복",	null],		
-		[22,	"학소",	1459,	0,	null,	60,	64,	67,	0,	160,	300,	"대의",	"견고"],		
-		[126,	"한당",	1460,	0,	null,	51,	55,	53,	0,	160,	300,	"할거",	null],		
-		[93,	"한복",	1461,	0,	null,	50,	49,	38,	0,	160,	300,	"안전",	null],		
-		[8,	"한섬",	1462,	0,	null,	39,	51,	33,	0,	160,	300,	"출세",	null],		
-		[48,	"한수",	1463,	0,	null,	50,	61,	61,	0,	160,	300,	"대의",	"기병"],		
-		[40,	"한숭",	1464,	0,	null,	21,	25,	57,	0,	160,	300,	"재간",	null],		
-		[7,	"한충",	1465,	0,	null,	40,	54,	29,	0,	160,	300,	"안전",	null],		
-		[9,	"한현",	1466,	0,	null,	41,	51,	20,	0,	160,	300,	"유지",	null],		
-		[27,	"한호",	1467,	0,	null,	48,	59,	40,	0,	160,	300,	"유지",	null],		
-		[79,	"향랑",	1468,	0,	null,	44,	21,	61,	0,	160,	300,	"대의",	null],		
-		[79,	"향총",	1469,	0,	null,	54,	38,	59,	0,	160,	300,	"왕좌",	null],		
-		[139,	"허공",	1470,	0,	null,	50,	52,	49,	0,	160,	300,	"유지",	null],		
-		[21,	"허유",	1471,	0,	null,	43,	41,	48,	0,	160,	300,	"재간",	null],		
-		[23,	"허의",	1472,	0,	null,	31,	59,	41,	0,	160,	300,	"출세",	null],		
-		[26,	"허저",	1473,	0,	null,	47,	75,	27,	0,	160,	300,	"정복",	"무쌍"],		
-		[87,	"허정",	1474,	0,	null,	18,	29,	59,	0,	160,	300,	"재간",	null],		
-		[12,	"형도영",	1475,	0,	null,	44,	62,	23,	0,	160,	300,	"출세",	null],		
-		[148,	"호거아",	1476,	0,	null,	35,	61,	51,	0,	160,	300,	"안전",	null],		
-		[76,	"호반",	1477,	0,	null,	48,	49,	41,	0,	160,	300,	"재간",	null],		
-		[20,	"호분",	1478,	0,	null,	52,	50,	51,	0,	160,	300,	"할거",	null],		
-		[27,	"호주천",	1479,	0,	null,	55,	60,	53,	0,	160,	300,	"정복",	null],		
-		[20,	"호준",	1480,	0,	null,	51,	50,	41,	0,	160,	300,	"재간",	null],		
-		[2,	"화웅",	1481,	0,	null,	51,	69,	24,	0,	160,	300,	"출세",	"돌격"],		
-		[131,	"화핵",	1482,	0,	null,	37,	27,	60,	0,	160,	300,	"안전",	null],		
-		[10,	"화흠",	1483,	0,	null,	18,	39,	60,	0,	160,	300,	"출세",	null],		
-		[21,	"환범",	1484,	0,	null,	20,	25,	64,	0,	160,	300,	"유지",	null],		
-		[127,	"황개",	1485,	0,	null,	55,	67,	56,	0,	160,	300,	"왕좌",	"징병"],		
-		[56,	"황권",	1486,	0,	null,	54,	41,	61,	0,	160,	300,	"대의",	null],		
-		[41,	"황란",	1487,	0,	null,	29,	57,	25,	0,	160,	300,	"재간",	null],		
-		[88,	"황보숭",	1488,	0,	null,	57,	52,	59,	0,	160,	300,	"왕좌",	null],		
-		[72,	"황충",	1489,	0,	null,	58,	73,	55,	0,	160,	300,	"왕좌",	"궁병"],		
-		[50,	"황호",	1490,	0,	null,	15,	17,	42,	0,	160,	300,	"안전",	null],		
-		[147,	"후성",	1491,	0,	null,	46,	51,	32,	0,	160,	300,	"정복",	null]			
-		],											
-		"general_ex":[											
-		[123,	"가화",	1492,	0,	null,	44,	54,	37,	0,	160,	300,	null,	null],		
-		[999,	"건석",	1493,	0,	null,	21,	12,	51,	0,	160,	300,	null,	null],		
-		[999,	"견씨",	1494,	0,	null,	35,	24,	49,	0,	160,	300,	null,	null],		
-		[40,	"견홍",	1495,	0,	null,	54,	58,	54,	0,	160,	300,	null,	null],		
-		[120,	"고담",	1496,	0,	null,	33,	21,	56,	0,	160,	300,	null,	null],		
-		[101,	"고유",	1497,	0,	null,	46,	39,	59,	0,	160,	300,	null,	null],		
-		[132,	"곽마",	1498,	0,	null,	51,	57,	43,	0,	160,	300,	null,	null],		
-		[39,	"관구수",	1499,	0,	null,	47,	52,	33,	0,	160,	300,	null,	null],		
-		[39,	"관구전",	1500,	0,	null,	49,	49,	55,	0,	160,	300,	null,	null],		
-		[999,	"관로",	1501,	0,	null,	49,	21,	60,	0,	160,	300,	null,	null],		
-		[65,	"관정",	1502,	0,	null,	35,	43,	59,	0,	160,	300,	null,	null],		
-		[137,	"교수",	1503,	0,	null,	51,	56,	36,	0,	160,	300,	null,	null],		
-		[33,	"구건",	1504,	0,	null,	41,	47,	56,	0,	160,	300,	null,	null],		
-		[41,	"구본",	1505,	0,	null,	45,	37,	57,	0,	160,	300,	null,	null],		
-		[12,	"구성",	1506,	0,	null,	46,	57,	31,	0,	160,	300,	null,	null],		
-		[21,	"국연",	1507,	0,	null,	45,	21,	57,	0,	160,	300,	null,	null],		
-		[99,	"국의",	1508,	0,	null,	57,	63,	43,	0,	160,	300,	null,	null],		
-		[34,	"금의",	1509,	0,	null,	18,	37,	52,	0,	160,	300,	null,	null],		
-		[76,	"나헌",	1510,	0,	null,	58,	55,	60,	0,	160,	300,	null,	null],		
-		[999,	"남두",	1511,	0,	null,	35,	25,	46,	0,	160,	300,	null,	null],		
-		[54,	"냉포",	1512,	0,	null,	52,	65,	56,	0,	160,	300,	null,	null],		
-		[124,	"노숙2",	1513,	0,	null,	52,	47,	61,	0,	160,	300,	null,	null],		
-		[42,	"누규",	1514,	0,	null,	46,	19,	69,	0,	160,	300,	null,	null],		
-		[6,	"누반",	1515,	0,	null,	50,	61,	36,	0,	160,	300,	null,	null],		
-		[130,	"누현",	1516,	0,	null,	23,	20,	55,	0,	160,	300,	null,	null],		
-		[40,	"당균",	1517,	0,	null,	33,	19,	64,	0,	160,	300,	null,	null],		
-		[32,	"당빈",	1518,	0,	null,	52,	59,	51,	0,	160,	300,	null,	null],		
-		[999,	"대교",	1519,	0,	null,	41,	10,	46,	0,	160,	300,	null,	null],		
-		[28,	"대릉",	1520,	0,	null,	50,	60,	40,	0,	160,	300,	null,	null],		
-		[129,	"동조",	1521,	0,	null,	16,	15,	44,	0,	160,	300,	null,	null],		
-		[114,	"등수",	1522,	0,	null,	35,	20,	39,	0,	160,	300,	null,	null],		
-		[50,	"마막",	1523,	0,	null,	22,	17,	5,	0,	160,	300,	null,	null],		
-		[116,	"만욱",	1524,	0,	null,	20,	18,	54,	0,	160,	300,	null,	null],		
-		[120,	"맹종",	1525,	0,	null,	43,	42,	55,	0,	160,	300,	null,	null],		
-		[38,	"문호",	1526,	0,	null,	50,	59,	40,	0,	160,	300,	null,	null],		
-		[999,	"미씨",	1527,	0,	null,	48,	15,	55,	0,	160,	300,	null,	null],		
-		[39,	"반림",	1528,	0,	null,	50,	63,	8,	0,	160,	300,	null,	null],		
-		[129,	"반장",	1529,	0,	null,	55,	62,	56,	0,	160,	300,	null,	null],		
-		[94,	"방열",	1530,	0,	null,	47,	65,	28,	0,	160,	300,	null,	null],		
-		[55,	"방희",	1531,	0,	null,	48,	35,	56,	0,	160,	300,	null,	null],		
-		[30,	"배수",	1532,	0,	null,	10,	11,	61,	0,	160,	300,	null,	null],		
-		[8,	"번능",	1533,	0,	null,	52,	51,	41,	0,	160,	300,	null,	null],		
-		[999,	"번씨",	1534,	0,	null,	32,	17,	40,	0,	160,	300,	null,	null],		
-		[49,	"보도근",	1535,	0,	null,	50,	59,	43,	0,	160,	300,	null,	null],		
-		[129,	"보천",	1536,	0,	null,	51,	50,	58,	0,	160,	300,	null,	null],		
-		[121,	"보협",	1537,	0,	null,	53,	45,	60,	0,	160,	300,	null,	null],		
-		[28,	"부하",	1538,	0,	null,	42,	34,	67,	0,	160,	300,	null,	null],		
-		[26,	"비요",	1539,	0,	null,	52,	53,	59,	0,	160,	300,	null,	null],		
-		[31,	"사마주",	1540,	0,	null,	49,	45,	51,	0,	160,	300,	null,	null],		
-		[41,	"사찬",	1541,	0,	null,	48,	57,	46,	0,	160,	300,	null,	null],		
-		[128,	"설후",	1542,	0,	null,	16,	14,	57,	0,	160,	300,	null,	null],		
-		[36,	"성공영",	1543,	0,	null,	53,	49,	63,	0,	160,	300,	null,	null],		
-		[126,	"성만",	1544,	0,	null,	48,	56,	54,	0,	160,	300,	null,	null],		
-		[999,	"소교",	1545,	0,	null,	47,	23,	54,	0,	160,	300,	null,	null],		
-		[46,	"소유",	1546,	0,	null,	44,	51,	42,	0,	160,	300,	null,	null],		
-		[31,	"소제2",	1547,	0,	null,	22,	16,	62,	0,	160,	300,	null,	null],		
-		[126,	"손교",	1548,	0,	null,	55,	50,	56,	0,	160,	300,	null,	null],		
-		[116,	"손기",	1549,	0,	null,	49,	53,	45,	0,	160,	300,	null,	null],		
-		[999,	"손상향",	1550,	0,	null,	53,	51,	38,	0,	160,	300,	null,	null],		
-		[125,	"손익",	1551,	0,	null,	52,	60,	26,	0,	160,	300,	null,	null],		
-		[125,	"손진",	1552,	0,	null,	50,	57,	42,	0,	160,	300,	null,	null],		
-		[123,	"송겸",	1553,	0,	null,	48,	42,	39,	0,	160,	300,	null,	null],		
-		[85,	"순심",	1554,	0,	null,	20,	21,	63,	0,	160,	300,	null,	null],		
-		[31,	"순욱2",	1555,	0,	null,	10,	16,	61,	0,	160,	300,	null,	null],		
-		[31,	"순의",	1556,	0,	null,	16,	11,	59,	0,	160,	300,	null,	null],		
-		[129,	"시삭",	1557,	0,	null,	36,	54,	39,	0,	160,	300,	null,	null],		
-		[29,	"신창",	1558,	0,	null,	44,	29,	41,	0,	160,	300,	null,	null],		
-		[999,	"악신",	1559,	0,	null,	45,	12,	41,	0,	160,	300,	null,	null],		
-		[138,	"악취",	1560,	0,	null,	46,	55,	49,	0,	160,	300,	null,	null],		
-		[138,	"양강",	1561,	0,	null,	49,	57,	38,	0,	160,	300,	null,	null],		
-		[21,	"양부",	1562,	0,	null,	51,	47,	67,	0,	160,	300,	null,	null],		
-		[72,	"양서",	1563,	0,	null,	46,	51,	54,	0,	160,	300,	null,	null],		
-		[34,	"양습",	1564,	0,	null,	51,	43,	59,	0,	160,	300,	null,	null],		
-		[16,	"양앙",	1565,	0,	null,	50,	57,	36,	0,	160,	300,	null,	null],		
-		[17,	"양임",	1566,	0,	null,	52,	62,	47,	0,	160,	300,	null,	null],		
-		[32,	"양제",	1567,	0,	null,	52,	52,	57,	0,	160,	300,	null,	null],		
-		[33,	"양조2",	1568,	0,	null,	50,	51,	55,	0,	160,	300,	null,	null],		
-		[48,	"양추2",	1569,	0,	null,	50,	55,	51,	0,	160,	300,	null,	null],		
-		[140,	"양홍",	1570,	0,	null,	19,	17,	61,	0,	160,	300,	null,	null],		
-		[31,	"양혼",	1571,	0,	null,	48,	55,	52,	0,	160,	300,	null,	null],		
-		[123,	"여거",	1572,	0,	null,	52,	49,	56,	0,	160,	300,	null,	null],		
-		[130,	"여대",	1573,	0,	null,	57,	58,	57,	0,	160,	300,	null,	null],		
-		[136,	"염상",	1574,	0,	null,	29,	27,	56,	0,	160,	300,	null,	null],		
-		[36,	"염행",	1575,	0,	null,	52,	67,	35,	0,	160,	300,	null,	null],		
-		[73,	"영수",	1576,	0,	null,	52,	57,	59,	0,	160,	300,	null,	null],		
-		[39,	"오거",	1577,	0,	null,	44,	52,	31,	0,	160,	300,	null,	null],		
-		[126,	"오경",	1578,	0,	null,	53,	50,	48,	0,	160,	300,	null,	null],		
-		[999,	"오국태",	1579,	0,	null,	31,	11,	50,	0,	160,	300,	null,	null],		
-		[126,	"오찬",	1580,	0,	null,	52,	37,	62,	0,	160,	300,	null,	null],		
-		[23,	"온회",	1581,	0,	null,	41,	37,	62,	0,	160,	300,	null,	null],		
-		[21,	"왕기2",	1582,	0,	null,	52,	54,	52,	0,	160,	300,	null,	null],		
-		[32,	"왕도",	1583,	0,	null,	43,	39,	57,	0,	160,	300,	null,	null],		
-		[123,	"왕돈",	1584,	0,	null,	48,	53,	37,	0,	160,	300,	null,	null],		
-		[34,	"왕릉",	1585,	0,	null,	53,	50,	57,	0,	160,	300,	null,	null],		
-		[63,	"왕문",	1586,	0,	null,	50,	55,	31,	0,	160,	300,	null,	null],		
-		[32,	"왕상",	1587,	0,	null,	25,	19,	53,	0,	160,	300,	null,	null],		
-		[34,	"왕숙",	1588,	0,	null,	35,	21,	63,	0,	160,	300,	null,	null],		
-		[33,	"왕업",	1589,	0,	null,	32,	6,	41,	0,	160,	300,	null,	null],		
-		[35,	"왕충",	1590,	0,	null,	41,	49,	21,	0,	160,	300,	null,	null],		
-		[1,	"우보",	1591,	0,	null,	41,	52,	12,	0,	160,	300,	null,	null],		
-		[122,	"우사",	1592,	0,	null,	52,	32,	63,	0,	160,	300,	null,	null],		
-		[138,	"원요",	1593,	0,	null,	42,	38,	40,	0,	160,	300,	null,	null],		
-		[95,	"원유",	1594,	0,	null,	47,	35,	59,	0,	160,	300,	null,	null],		
-		[31,	"위관",	1595,	0,	null,	52,	40,	64,	0,	160,	300,	null,	null],		
-		[129,	"위막",	1596,	0,	null,	47,	51,	50,	0,	160,	300,	null,	null],		
-		[55,	"유괴",	1597,	0,	null,	54,	58,	54,	0,	160,	300,	null,	null],		
-		[129,	"유략",	1598,	0,	null,	53,	55,	49,	0,	160,	300,	null,	null],		
-		[45,	"유반",	1599,	0,	null,	54,	63,	42,	0,	160,	300,	null,	null],		
-		[29,	"유복",	1600,	0,	null,	46,	43,	59,	0,	160,	300,	null,	null],		
-		[78,	"유선2",	1601,	0,	null,	9,	21,	36,	0,	160,	300,	null,	null],		
-		[139,	"유섭",	1602,	0,	null,	49,	63,	26,	0,	160,	300,	null,	null],		
-		[28,	"유소",	1603,	0,	null,	50,	44,	59,	0,	160,	300,	null,	null],		
-		[128,	"유승",	1604,	0,	null,	42,	56,	29,	0,	160,	300,	null,	null],		
-		[129,	"유찬",	1605,	0,	null,	54,	60,	54,	0,	160,	300,	null,	null],		
-		[129,	"유평",	1606,	0,	null,	50,	57,	55,	0,	160,	300,	null,	null],		
-		[138,	"유훈",	1607,	0,	null,	44,	53,	43,	0,	160,	300,	null,	null],		
-		[48,	"이감",	1608,	0,	null,	48,	55,	32,	0,	160,	300,	null,	null],		
-		[19,	"이승",	1609,	0,	null,	13,	26,	31,	0,	160,	300,	null,	null],		
-		[22,	"이통",	1610,	0,	null,	54,	66,	45,	0,	160,	300,	null,	null],		
-		[138,	"이풍2",	1611,	0,	null,	53,	61,	43,	0,	160,	300,	null,	null],		
-		[20,	"이풍3",	1612,	0,	null,	23,	25,	57,	0,	160,	300,	null,	null],		
-		[29,	"장구",	1613,	0,	null,	52,	57,	41,	0,	160,	300,	null,	null],		
-		[21,	"장기",	1614,	0,	null,	55,	33,	63,	0,	160,	300,	null,	null],		
-		[74,	"장남",	1615,	0,	null,	52,	53,	35,	0,	160,	300,	null,	null],		
-		[100,	"장막",	1616,	0,	null,	45,	45,	57,	0,	160,	300,	null,	null],		
-		[7,	"장만성",	1617,	0,	null,	53,	65,	41,	0,	160,	300,	null,	null],		
-		[135,	"장반",	1618,	0,	null,	46,	59,	54,	0,	160,	300,	null,	null],		
-		[78,	"장빈",	1619,	0,	null,	30,	28,	55,	0,	160,	300,	null,	null],		
-		[124,	"장승",	1620,	0,	null,	54,	55,	60,	0,	160,	300,	null,	null],		
-		[999,	"장양2",	1621,	0,	null,	47,	43,	41,	0,	160,	300,	null,	null],		
-		[68,	"장억",	1622,	0,	null,	57,	63,	46,	0,	160,	300,	null,	null],		
-		[75,	"장준",	1623,	0,	null,	50,	55,	54,	0,	160,	300,	null,	null],		
-		[20,	"장집",	1624,	0,	null,	31,	27,	59,	0,	160,	300,	null,	null],		
-		[39,	"장특",	1625,	0,	null,	52,	45,	59,	0,	160,	300,	null,	null],		
-		[96,	"저곡",	1626,	0,	null,	47,	45,	55,	0,	160,	300,	null,	null],		
-		[128,	"전기",	1627,	0,	null,	44,	56,	47,	0,	160,	300,	null,	null],		
-		[23,	"전만",	1628,	0,	null,	45,	59,	35,	0,	160,	300,	null,	null],		
-		[128,	"전상",	1629,	0,	null,	5,	6,	11,	0,	160,	300,	null,	null],		
-		[130,	"전역",	1630,	0,	null,	48,	51,	35,	0,	160,	300,	null,	null],		
-		[75,	"전예",	1631,	0,	null,	56,	51,	65,	0,	160,	300,	null,	null],		
-		[64,	"전해",	1632,	0,	null,	52,	52,	48,	0,	160,	300,	null,	null],		
-		[123,	"정봉2",	1633,	0,	null,	51,	55,	45,	0,	160,	300,	null,	null],		
-		[22,	"정의",	1634,	0,	null,	17,	3,	54,	0,	160,	300,	null,	null],		
-		[81,	"제갈교",	1635,	0,	null,	46,	17,	61,	0,	160,	300,	null,	null],		
-		[40,	"제갈서",	1636,	0,	null,	42,	39,	27,	0,	160,	300,	null,	null],		
-		[25,	"조충",	1637,	0,	null,	14,	7,	63,	0,	160,	300,	null,	null],		
-		[121,	"종리목",	1638,	0,	null,	58,	55,	60,	0,	160,	300,	null,	null],		
-		[22,	"종육",	1639,	0,	null,	27,	11,	57,	0,	160,	300,	null,	null],		
-		[122,	"좌혁",	1640,	0,	null,	48,	54,	44,	0,	160,	300,	null,	null],		
-		[36,	"주령",	1641,	0,	null,	55,	57,	56,	0,	160,	300,	null,	null],		
-		[115,	"주앙",	1642,	0,	null,	54,	53,	53,	0,	160,	300,	null,	null],		
-		[52,	"주포",	1643,	0,	null,	48,	58,	12,	0,	160,	300,	null,	null],		
-		[11,	"주흔",	1644,	0,	null,	51,	45,	61,	0,	160,	300,	null,	null],		
-		[140,	"진기",	1645,	0,	null,	47,	55,	41,	0,	160,	300,	null,	null],		
-		[142,	"진란",	1646,	0,	null,	50,	57,	39,	0,	160,	300,	null,	null],		
-		[25,	"진랑",	1647,	0,	null,	47,	57,	35,	0,	160,	300,	null,	null],		
-		[12,	"진응",	1648,	0,	null,	49,	56,	43,	0,	160,	300,	null,	null],		
-		[124,	"진표",	1649,	0,	null,	49,	43,	59,	0,	160,	300,	null,	null],		
-		[999,	"채염",	1650,	0,	null,	40,	22,	53,	0,	160,	300,	null,	null],		
-		[999,	"초선",	1651,	0,	null,	50,	15,	58,	0,	160,	300,	null,	null],		
-		[135,	"초이",	1652,	0,	null,	46,	53,	47,	0,	160,	300,	null,	null],		
-		[65,	"추단",	1653,	0,	null,	49,	57,	34,	0,	160,	300,	null,	null],		
-		[999,	"추씨",	1654,	0,	null,	36,	13,	46,	0,	160,	300,	null,	null],		
-		[71,	"추정",	1655,	0,	null,	51,	53,	54,	0,	160,	300,	null,	null],		
-		[145,	"파재",	1656,	0,	null,	52,	60,	45,	0,	160,	300,	null,	null],		
-		[22,	"포신",	1657,	0,	null,	55,	50,	65,	0,	160,	300,	null,	null],		
-		[114,	"하식",	1658,	0,	null,	18,	35,	29,	0,	160,	300,	null,	null],		
-		[36,	"하안",	1659,	0,	null,	6,	27,	58,	0,	160,	300,	null,	null],		
-		[999,	"하후씨",	1660,	0,	null,	29,	16,	41,	0,	160,	300,	null,	null],		
-		[5,	"학맹",	1661,	0,	null,	47,	54,	37,	0,	160,	300,	null,	null],		
-		[98,	"한거자",	1662,	0,	null,	45,	49,	30,	0,	160,	300,	null,	null],		
-		[19,	"한덕",	1663,	0,	null,	49,	63,	24,	0,	160,	300,	null,	null],		
-		[140,	"한윤",	1664,	0,	null,	27,	24,	55,	0,	160,	300,	null,	null],		
-		[999,	"허소",	1665,	0,	null,	45,	27,	50,	0,	160,	300,	null,	null],		
-		[30,	"호열",	1666,	0,	null,	55,	56,	61,	0,	160,	300,	null,	null],		
-		[76,	"호제",	1667,	0,	null,	47,	38,	55,	0,	160,	300,	null,	null],		
-		[149,	"호진",	1668,	0,	null,	50,	61,	13,	0,	160,	300,	null,	null],		
-		[29,	"호질",	1669,	0,	null,	53,	43,	60,	0,	160,	300,	null,	null],		
-		[7,	"환계",	1670,	0,	null,	12,	25,	55,	0,	160,	300,	null,	null],		
-		[56,	"황숭",	1671,	0,	null,	51,	53,	59,	0,	160,	300,	null,	null],		
-		[999,	"황승언",	1672,	0,	null,	51,	17,	64,	0,	160,	300,	null,	null],		
-		[999,	"황월영",	1673,	0,	null,	47,	14,	60,	0,	160,	300,	null,	null],		
-		[45,	"황조",	1674,	0,	null,	54,	53,	48,	0,	160,	300,	null,	null],		
-		[48,	"후선",	1675,	0,	null,	46,	54,	33,	0,	160,	300,	null,	null],		
-		[8,	"휴고",	1676,	0,	null,	48,	58,	37,	0,	160,	300,	null,	null],		
-		[98,	"휴원진",	1677,	0,	null,	45,	52,	35,	0,	160,	300,	null,	null],		
-		[22,	"희지재",	1678,	0,	null,	24,	5,	67,	0,	160,	300,	null,	null]					
+    "general":[
+		[  1,	"소제1",	1001,	0,	null,	18,	7,	48,	0,	160,	300,	"유지",	null],
+        [  1,	"헌제",	1002,	0,	null,	15,	7,	61,	0,	160,	300,	"안전",	null],
+        [999,	"사마휘",	1003,	0,	null,	47,	7,	69,	0,	160,	300,	"은둔",	"신산",	"좋지, 좋아"],
+        [999,	"우길",	1004,	0,	null,	15,	7,	83,	0,	160,	300,	"은둔",	"신산"],
+        [999,	"화타",	1005,	0,	null,	41,	11,	54,	0,	160,	300,	"은둔",	"의술",	"아픈 사람들은 모두 내게 오시오. 껄껄껄."],
+        [999,	"길평",	1006,	0,	null,	26,	8,	72,	0,	160,	300,	"은둔",	"의술"],
+        [ 29,	"가규",	1007,	0,	null,	41,	21,	56,	0,	160,	300,	"재간",	null],
+        [136,	"가범",	1008,	0,	null,	42,	19,	55,	0,	160,	300,	"유지",	null],
+        [ 49,	"가비능",	1009,	0,	null,	42,	61,	14,	0,	160,	300,	"정복",	null],
+        [ 31,	"가충",	1010,	0,	null,	40,	11,	64,	0,	160,	300,	"출세",	null],
+        [ 20,	"가후",	1011,	0,	null,	46,	13,	68,	0,	160,	300,	"할거",	"귀병"],
+        [ 73,	"간옹",	1012,	0,	null,	30,	14,	70,	0,	160,	300,	"안전",	"경작"],
+        [129,	"감녕",	1013,	0,	null,	49,	69,	27,	0,	160,	300,	"출세",	"무쌍"],
+        [127,	"감택",	1014,	0,	null,	44,	18,	59,	0,	160,	300,	"유지",	null],
+        [ 60,	"강단",	1015,	0,	null,	37,	73,	17,	0,	160,	300,	"재간",	null],
+        [ 73,	"강유",	1016,	0,	null,	55,	33,	68,	0,	160,	300,	"왕좌",	"집중",	"갈고 닦은 무예와 승상께 배운 책략을 발휘해 보이겠다!"],
+        [102,	"고간",	1017,	0,	null,	43,	46,	20,	0,	160,	300,	"유지",	null],
+        [ 27,	"고람",	1018,	0,	null,	47,	52,	23,	0,	160,	300,	"출세",	"기병"],
+        [ 69,	"고상",	1019,	0,	null,	37,	40,	16,	0,	160,	300,	"재간",	null],
+        [144,	"고순",	1020,	0,	null,	49,	61,	25,	0,	160,	300,	"의협",	"기병"],
+        [  7,	"고승",	1021,	0,	null,	37,	73,	11,	0,	160,	300,	"출세",	null],
+        [120,	"고옹",	1022,	0,	null,	42,	10,	59,	0,	160,	300,	"출세",	null],
+        [ 63,	"고정",	1023,	0,	null,	45,	51,	21,	0,	160,	300,	"정복",	null],
+        [ 53,	"고패",	1024,	0,	null,	41,	45,	12,	0,	160,	300,	"유지",	null],
+        [ 74,	"공도",	1025,	0,	null,	25,	73,	9,	0,	160,	300,	"재간",	null],
+        [142,	"공손강",	1026,	0,	null,	44,	55,	23,	0,	160,	300,	"정복",	null],
+        [142,	"공손공",	1027,	0,	null,	46,	17,	57,	0,	160,	300,	"정복",	null],
+        [142,	"공손도",	1028,	0,	null,	44,	55,	17,	0,	160,	300,	"정복",	"기병"],
+        [ 65,	"공손범",	1029,	0,	null,	43,	52,	23,	0,	160,	300,	"출세",	null],
+        [ 65,	"공손속",	1030,	0,	null,	43,	57,	17,	0,	160,	300,	"정복",	null],
+        [ 10,	"공손연",	1031,	0,	null,	48,	59,	24,	0,	160,	300,	"패권",	"돌격"],
+        [ 65,	"공손월",	1032,	0,	null,	39,	63,	18,	0,	160,	300,	"정복",	null],
+        [ 65,	"공손찬",	1033,	0,	null,	43,	64,	25,	0,	160,	300,	"패권",	"기병"],
+        [ 43,	"공융",	1034,	0,	null,	44,	19,	63,	0,	160,	300,	"왕좌",	"경작"],
+        [ 35,	"공주",	1035,	0,	null,	44,	15,	58,	0,	160,	300,	"재간",	null],
+        [ 83,	"공지",	1036,	0,	null,	42,	21,	50,	0,	160,	300,	"대의",	null],
+        [ 26,	"곽가",	1037,	0,	null,	39,	11,	99,	0,	160,	300,	"패권",	"귀모"],
+        [111,	"곽도",	1038,	0,	null,	44,	25,	60,	0,	160,	300,	"재간",	null],
+        [  2,	"곽사",	1039,	0,	null,	42,	52,	13,	0,	160,	300,	"패권",	null],
+        [ 80,	"곽유지",	1040,	0,	null,	35,	10,	71,	0,	160,	300,	"재간",	"상재"],
+        [ 67,	"곽익",	1041,	0,	null,	45,	23,	52,	0,	160,	300,	"재간",	null],
+        [ 67,	"곽준",	1042,	0,	null,	48,	26,	55,	0,	160,	300,	"출세",	null],
+        [ 27,	"곽혁",	1043,	0,	null,	36,	13,	80,	0,	160,	300,	"안전",	null],
+        [ 20,	"곽회",	1044,	0,	null,	49,	57,	27,	0,	160,	300,	"정복",	null],
+        [ 39,	"관구검",	1045,	0,	null,	47,	26,	58,	0,	160,	300,	"대의",	null],
+        [ 76,	"관색",	1046,	0,	null,	46,	63,	25,	0,	160,	300,	"의협",	"징병"],
+        [ 76,	"관우",	1047,	0,	null,	55,	70,	30,	0,	160,	300,	"의협",	"위압",	"나의 청룡 언월도를 과연 막아낼 수 있겠소?"],
+        [ 76,	"관이",	1048,	0,	null,	39,	60,	22,	0,	160,	300,	"안전",	null],
+        [ 76,	"관통",	1049,	0,	null,	39,	63,	23,	0,	160,	300,	"대의",	null],
+        [ 76,	"관평",	1050,	0,	null,	49,	60,	26,	0,	160,	300,	"의협",	"보병"],
+        [  7,	"관해",	1051,	0,	null,	45,	66,	15,	0,	160,	300,	"출세",	null],
+        [ 76,	"관흥",	1052,	0,	null,	46,	62,	27,	0,	160,	300,	"의협",	"돌격"],
+        [ 40,	"괴량",	1053,	0,	null,	37,	12,	81,	0,	160,	300,	"안전",	"신중"],
+        [ 40,	"괴월",	1054,	0,	null,	25,	13,	84,	0,	160,	300,	"유지",	"귀병"],
+        [ 98,	"교모",	1055,	0,	null,	43,	22,	48,	0,	160,	300,	"안전",	null],
+        [ 98,	"교현",	1056,	0,	null,	40,	9,	48,	0,	160,	300,	"재간",	null],
+        [  6,	"구역거",	1057,	0,	null,	40,	55,	19,	0,	160,	300,	"안전",	null],
+        [ 80,	"극정",	1058,	0,	null,	36,	11,	75,	0,	160,	300,	"유지",	null],
+        [ 46,	"금선",	1059,	0,	null,	41,	41,	15,	0,	160,	300,	"할거",	null],
+        [ 62,	"금환삼결",	1060,	0,	null,	38,	76,	9,	0,	160,	300,	"출세",	null],
+        [141,	"기령",	1061,	0,	null,	48,	60,	14,	0,	160,	300,	"대의",	"무쌍"],
+        [122,	"낙통",	1062,	0,	null,	42,	18,	53,	0,	160,	300,	"유지",	null],
+        [124,	"노숙1",	1063,	0,	null,	53,	17,	68,	0,	160,	300,	"왕좌",	"상재"],
+        [ 75,	"노식",	1064,	0,	null,	53,	21,	60,	0,	160,	300,	"왕좌",	"징병"],
+        [ 59,	"뇌동",	1065,	0,	null,	46,	58,	18,	0,	160,	300,	"출세",	"궁병"],
+        [142,	"뇌박",	1066,	0,	null,	41,	44,	14,	0,	160,	300,	"유지",	null],
+        [127,	"능조",	1067,	0,	null,	45,	60,	18,	0,	160,	300,	"재간",	"공성"],
+        [127,	"능통",	1068,	0,	null,	47,	58,	22,	0,	160,	300,	"의협",	"궁병"],
+        [ 64,	"단경",	1069,	0,	null,	46,	23,	52,	0,	160,	300,	"정복",	null],
+        [132,	"담웅",	1070,	0,	null,	40,	58,	9,	0,	160,	300,	"출세",	null],
+        [ 99,	"답둔",	1071,	0,	null,	43,	54,	13,	0,	160,	300,	"유지",	null],
+        [132,	"당자",	1072,	0,	null,	43,	45,	18,	0,	160,	300,	"안전",	null],
+        [ 60,	"대래동주",	1073,	0,	null,	36,	65,	11,	0,	160,	300,	"안전",	null],
+        [ 82,	"도겸",	1074,	0,	null,	40,	14,	48,	0,	160,	300,	"할거",	"인덕"],
+        [120,	"도준",	1075,	0,	null,	44,	46,	20,	0,	160,	300,	"안전",	null],
+        [ 73,	"동궐",	1076,	0,	null,	45,	20,	57,	0,	160,	300,	"대의",	null],
+        [ 62,	"동다나",	1077,	0,	null,	40,	54,	12,	0,	160,	300,	"유지",	null],
+        [  2,	"동민",	1078,	0,	null,	40,	51,	19,	0,	160,	300,	"안전",	null],
+        [ 21,	"동소",	1079,	0,	null,	38,	18,	62,	0,	160,	300,	"패권",	null],
+        [127,	"동습",	1080,	0,	null,	41,	50,	14,	0,	160,	300,	"출세",	null],
+        [ 89,	"동승",	1081,	0,	null,	48,	51,	25,	0,	160,	300,	"왕좌",	null],
+        [ 78,	"동윤",	1082,	0,	null,	44,	12,	58,	0,	160,	300,	"왕좌",	null],
+        [  2,	"동탁",	1083,	0,	null,	52,	66,	21,	0,	160,	300,	"패권",	"기병"],
+        [ 66,	"동화",	1084,	0,	null,	39,	64,	21,	0,	160,	300,	"대의",	null],
+        [ 32,	"두예",	1085,	0,	null,	52,	30,	62,	0,	160,	300,	"정복",	null],
+        [  7,	"등무",	1086,	0,	null,	37,	74,	9,	0,	160,	300,	"정복",	null],
+        [ 41,	"등애",	1087,	0,	null,	54,	30,	67,	0,	160,	300,	"패권",	"신산"],
+        [116,	"등윤",	1088,	0,	null,	34,	17,	68,	0,	160,	300,	"안전",	null],
+        [ 73,	"등지",	1089,	0,	null,	48,	20,	60,	0,	160,	300,	"할거",	"경작"],
+        [ 41,	"등충",	1090,	0,	null,	43,	61,	21,	0,	160,	300,	"출세",	null],
+        [ 54,	"등현",	1091,	0,	null,	45,	23,	48,	0,	160,	300,	"출세",	null],
+        [ 29,	"마균",	1092,	0,	null,	33,	16,	80,	0,	160,	300,	"안전",	null],
+        [ 71,	"마대",	1093,	0,	null,	49,	59,	19,	0,	160,	300,	"대의",	"기병"],
+        [ 70,	"마등",	1094,	0,	null,	50,	64,	22,	0,	160,	300,	"왕좌",	"기병"],
+        [ 80,	"마속",	1095,	0,	null,	47,	24,	61,	0,	160,	300,	"패권",	"집중"],
+        [ 77,	"마량",	1096,	0,	null,	42,	11,	64,	0,	160,	300,	"왕좌",	null],
+        [ 48,	"마완",	1097,	0,	null,	39,	64,	12,	0,	160,	300,	"안전",	"기병"],
+        [ 19,	"마준",	1098,	0,	null,	38,	63,	24,	0,	160,	300,	"안전",	null],
+        [ 71,	"마철",	1099,	0,	null,	47,	48,	13,	0,	160,	300,	"대의",	"기병"],
+        [ 70,	"마초",	1100,	0,	null,	49,	70,	16,	0,	160,	300,	"대의",	"기병",	"금마초 나가신닷!"],
+        [131,	"마충1",	1101,	0,	null,	45,	49,	20,	0,	160,	300,	"재간",	null],
+        [ 69,	"마충2",	1102,	0,	null,	43,	52,	20,	0,	160,	300,	"출세",	null],
+        [ 71,	"마휴",	1103,	0,	null,	47,	48,	14,	0,	160,	300,	"대의",	"기병"],
+        [116,	"만총",	1104,	0,	null,	49,	16,	58,	0,	160,	300,	"할거",	"신중"],
+        [ 51,	"망아장",	1105,	0,	null,	28,	64,	10,	0,	160,	300,	"출세",	null],
+        [ 44,	"맹달",	1106,	0,	null,	46,	25,	55,	0,	160,	300,	"할거",	"귀병"],
+        [ 60,	"맹우",	1107,	0,	null,	44,	59,	12,	0,	160,	300,	"정복",	null],
+        [ 60,	"맹획",	1108,	0,	null,	49,	67,	20,	0,	160,	300,	"왕좌",	"격노"],
+        [ 29,	"모개",	1109,	0,	null,	38,	56,	22,	0,	160,	300,	"대의",	null],
+        [ 51,	"목록대왕",	1110,	0,	null,	42,	54,	25,	0,	160,	300,	"재간",	"척사"],
+        [ 96,	"목순",	1111,	0,	null,	15,	10,	68,	0,	160,	300,	"왕좌",	null],
+        [ 43,	"무안국",	1112,	0,	null,	40,	55,	9,	0,	160,	300,	"재간",	null],
+        [ 28,	"문빙",	1113,	0,	null,	46,	58,	17,	0,	160,	300,	"유지",	null],
+        [ 38,	"문앙",	1114,	0,	null,	47,	66,	18,	0,	160,	300,	"대의",	null],
+        [102,	"문추",	1115,	0,	null,	47,	68,	11,	0,	160,	300,	"출세",	"무쌍"],
+        [ 38,	"문흠",	1116,	0,	null,	48,	58,	17,	0,	160,	300,	"대의",	null],
+        [ 49,	"미당대왕",	1117,	0,	null,	44,	57,	14,	0,	160,	300,	"유지",	null],
+        [108,	"미방",	1118,	0,	null,	42,	51,	15,	0,	160,	300,	"패권",	"징병"],
+        [ 77,	"미축",	1119,	0,	null,	25,	13,	65,	0,	160,	300,	"왕좌",	"상재"],
+        [ 94,	"반봉",	1120,	0,	null,	43,	57,	9,	0,	160,	300,	"출세",	null],
+        [ 44,	"반준",	1121,	0,	null,	37,	10,	67,	0,	160,	300,	"안전",	null],
+        [ 65,	"방덕",	1122,	0,	null,	48,	66,	25,	0,	160,	300,	"의협",	"기병"],
+        [ 73,	"방통",	1123,	0,	null,	52,	17,	70,	0,	160,	300,	"패권",	"반계"],
+        [ 65,	"방회",	1124,	0,	null,	24,	14,	59,	0,	160,	300,	"안전",	null],
+        [ 68,	"배원소",	1125,	0,	null,	38,	69,	14,	0,	160,	300,	"재간",	null],
+        [ 78,	"번건",	1126,	0,	null,	27,	13,	68,	0,	160,	300,	"대의",	null],
+        [149,	"번주",	1127,	0,	null,	45,	58,	10,	0,	160,	300,	"할거",	null],
+        [ 72,	"법정",	1128,	0,	null,	50,	13,	67,	0,	160,	300,	"패권",	"신산"],
+        [  8,	"변희",	1129,	0,	null,	45,	51,	12,	0,	160,	300,	"안전",	null],
+        [121,	"보질",	1130,	0,	null,	42,	12,	58,	0,	160,	300,	"유지",	null],
+        [113,	"복양흥",	1131,	0,	null,	42,	20,	54,	0,	160,	300,	"유지",	null],
+        [110,	"봉기",	1132,	0,	null,	46,	20,	60,	0,	160,	300,	"패권",	"집중"],
+        [ 74,	"부동",	1133,	0,	null,	42,	26,	26,	0,	160,	300,	"대의",	null],
+        [108,	"부사인",	1134,	0,	null,	41,	47,	20,	0,	160,	300,	"출세",	null],
+        [ 38,	"부손",	1135,	0,	null,	23,	17,	68,	0,	160,	300,	"안전",	null],
+        [ 74,	"부첨",	1136,	0,	null,	43,	56,	18,	0,	160,	300,	"대의",	null],
+        [ 66,	"비시",	1137,	0,	null,	16,	15,	61,	0,	160,	300,	"재간",	null],
+        [141,	"비연",	1138,	0,	null,	45,	51,	21,	0,	160,	300,	"출세",	null],
+        [ 77,	"비위",	1139,	0,	null,	47,	12,	55,	0,	160,	300,	"대의",	null],
+        [144,	"사광",	1140,	0,	null,	42,	19,	51,	0,	160,	300,	"안전",	null],
+        [ 71,	"사마가",	1141,	0,	null,	43,	63,	9,	0,	160,	300,	"정복",	"돌격"],
+        [ 20,	"사마랑",	1142,	0,	null,	24,	14,	63,	0,	160,	300,	"대의",	null],
+        [ 24,	"사마망",	1143,	0,	null,	47,	23,	51,	0,	160,	300,	"정복",	null],
+        [ 24,	"사마부",	1144,	0,	null,	41,	13,	55,	0,	160,	300,	"대의",	null],
+        [ 31,	"사마사",	1145,	0,	null,	52,	24,	66,	0,	160,	300,	"정복",	null],
+        [ 31,	"사마소",	1146,	0,	null,	54,	24,	62,	0,	160,	300,	"정복",	null],
+        [ 31,	"사마염",	1147,	0,	null,	54,	58,	27,	0,	160,	300,	"패권",	null],
+        [ 30,	"사마유",	1148,	0,	null,	44,	18,	59,	0,	160,	300,	"왕좌",	null],
+        [ 31,	"사마의",	1149,	0,	null,	56,	25,	70,	0,	160,	300,	"패권",	"반계"],
+        [139,	"사섭",	1150,	0,	null,	44,	23,	54,	0,	160,	300,	"안전",	null],
+        [139,	"사일",	1151,	0,	null,	43,	18,	52,	0,	160,	300,	"유지",	null],
+        [132,	"사정",	1152,	0,	null,	45,	54,	10,	0,	160,	300,	"안전",	null],
+        [146,	"사지",	1153,	0,	null,	43,	19,	54,	0,	160,	300,	"안전",	null],
+        [144,	"사휘",	1154,	0,	null,	45,	54,	23,	0,	160,	300,	"유지",	null],
+        [ 35,	"서막",	1155,	0,	null,	42,	17,	55,	0,	160,	300,	"유지",	null],
+        [ 76,	"서서",	1156,	0,	null,	53,	26,	69,	0,	160,	300,	"의협",	"귀병"],
+        [124,	"서성",	1157,	0,	null,	51,	28,	61,	0,	160,	300,	"대의",	null],
+        [142,	"서영",	1158,	0,	null,	39,	63,	14,	0,	160,	300,	"안전",	null],
+        [ 23,	"서질",	1159,	0,	null,	41,	55,	14,	0,	160,	300,	"재간",	null],
+        [ 23,	"서황",	1160,	0,	null,	49,	65,	26,	0,	160,	300,	"의협",	"필살"],
+        [ 32,	"석포",	1161,	0,	null,	47,	49,	23,	0,	160,	300,	"정복",	null],
+        [131,	"설영",	1162,	0,	null,	38,	11,	64,	0,	160,	300,	"유지",	null],
+        [128,	"설종",	1163,	0,	null,	26,	14,	67,	0,	160,	300,	"유지",	null],
+        [ 69,	"성의",	1164,	0,	null,	38,	64,	10,	0,	160,	300,	"재간",	null],
+        [129,	"소비",	1165,	0,	null,	45,	49,	19,	0,	160,	300,	"대의",	null],
+        [ 76,	"손건",	1166,	0,	null,	37,	14,	73,	0,	160,	300,	"대의",	"거상"],
+        [125,	"손견",	1167,	0,	null,	55,	69,	28,	0,	160,	300,	"왕좌",	"무쌍"],
+        [126,	"손광",	1168,	0,	null,	44,	21,	46,	0,	160,	300,	"유지",	null],
+        [125,	"손권",	1169,	0,	null,	53,	29,	61,	0,	160,	300,	"할거",	"수비"],
+        [126,	"손랑",	1170,	0,	null,	26,	54,	12,	0,	160,	300,	"안전",	null],
+        [126,	"손등",	1171,	0,	null,	40,	16,	58,	0,	160,	300,	"할거",	null],
+        [125,	"손량",	1172,	0,	null,	23,	11,	79,	0,	160,	300,	"할거",	null],
+        [ 20,	"손례",	1173,	0,	null,	44,	24,	53,	0,	160,	300,	"안전",	null],
+        [124,	"손소",	1174,	0,	null,	48,	60,	26,	0,	160,	300,	"정복",	null],
+        [130,	"손수",	1175,	0,	null,	45,	22,	47,	0,	160,	300,	"안전",	null],
+        [126,	"손유",	1176,	0,	null,	49,	23,	52,	0,	160,	300,	"정복",	null],
+        [122,	"손이",	1177,	0,	null,	42,	49,	22,	0,	160,	300,	"안전",	null],
+        [126,	"손정",	1178,	0,	null,	43,	22,	49,	0,	160,	300,	"유지",	null],
+        [115,	"손준",	1179,	0,	null,	43,	53,	20,	0,	160,	300,	"정복",	null],
+        [  7,	"손중",	1180,	0,	null,	41,	49,	11,	0,	160,	300,	"안전",	null],
+        [125,	"손책",	1181,	0,	null,	55,	69,	29,	0,	160,	300,	"패권",	"필살",	"소패왕 손책이 나가신다! 길을 비켜라!"],
+        [115,	"손침",	1182,	0,	null,	39,	71,	16,	0,	160,	300,	"패권",	null],
+        [114,	"손호",	1183,	0,	null,	18,	78,	25,	0,	160,	300,	"패권",	null],
+        [126,	"손화",	1184,	0,	null,	35,	11,	71,	0,	160,	300,	"왕좌",	null],
+        [127,	"손환",	1185,	0,	null,	49,	25,	54,	0,	160,	300,	"정복",	null],
+        [126,	"손휴",	1186,	0,	null,	44,	17,	50,	0,	160,	300,	"정복",	null],
+        [117,	"손흠",	1187,	0,	null,	45,	49,	14,	0,	160,	300,	"정복",	null],
+        [147,	"송헌",	1188,	0,	null,	37,	63,	17,	0,	160,	300,	"안전",	null],
+        [ 95,	"순우경",	1189,	0,	null,	47,	52,	23,	0,	160,	300,	"할거",	null],
+        [ 22,	"순욱1",	1190,	0,	null,	41,	13,	70,	0,	160,	300,	"왕좌",	"집중"],
+        [ 22,	"순유",	1191,	0,	null,	47,	17,	66,	0,	160,	300,	"대의",	"신중"],
+        [ 29,	"신비",	1192,	0,	null,	39,	12,	74,	0,	160,	300,	"재간",	null],
+        [ 37,	"신의",	1193,	0,	null,	41,	48,	20,	0,	160,	300,	"출세",	null],
+        [ 37,	"신탐",	1194,	0,	null,	42,	46,	22,	0,	160,	300,	"출세",	null],
+        [ 85,	"신평",	1195,	0,	null,	46,	20,	57,	0,	160,	300,	"왕좌",	null],
+        [102,	"심배",	1196,	0,	null,	48,	25,	52,	0,	160,	300,	"패권",	"귀병"],
+        [126,	"심영",	1197,	0,	null,	41,	55,	20,	0,	160,	300,	"재간",	null],
+        [ 47,	"아하소과",	1198,	0,	null,	41,	57,	8,	0,	160,	300,	"안전",	"척사"],
+        [ 62,	"아회남",	1199,	0,	null,	40,	56,	13,	0,	160,	300,	"출세",	"척사"],
+        [ 23,	"악진",	1200,	0,	null,	47,	52,	22,	0,	160,	300,	"대의",	"돌격"],
+        [ 23,	"악침",	1201,	0,	null,	38,	52,	14,	0,	160,	300,	"대의",	null],
+        [ 63,	"악환",	1202,	0,	null,	41,	61,	21,	0,	160,	300,	"재간",	null],
+        [102,	"안량",	1203,	0,	null,	47,	67,	15,	0,	160,	300,	"출세",	"위압"],
+        [ 14,	"양백",	1204,	0,	null,	41,	44,	21,	0,	160,	300,	"안전",	null],
+        [ 92,	"양봉1",	1205,	0,	null,	42,	50,	15,	0,	160,	300,	"유지",	null],
+        [ 91,	"양봉2",	1206,	0,	null,	44,	58,	23,	0,	160,	300,	"정복",	null],
+        [ 13,	"양송",	1207,	0,	null,	13,	35,	14,	0,	160,	300,	"안전",	null],
+        [ 43,	"양수",	1208,	0,	null,	16,	13,	91,	0,	160,	300,	"재간",	"귀병"],
+        [ 61,	"양의",	1209,	0,	null,	45,	22,	54,	0,	160,	300,	"유지",	null],
+        [141,	"양조1",	1210,	0,	null,	46,	21,	48,	0,	160,	300,	"출세",	null],
+        [  9,	"양추1",	1211,	0,	null,	40,	52,	8,	0,	160,	300,	"정복",	null],
+        [ 31,	"양호",	1212,	0,	null,	53,	26,	60,	0,	160,	300,	"패권",	null],
+        [ 53,	"양회",	1213,	0,	null,	43,	52,	16,	0,	160,	300,	"출세",	null],
+        [141,	"양흥",	1214,	0,	null,	40,	52,	9,	0,	160,	300,	"안전",	null],
+        [  6,	"어부라",	1215,	0,	null,	49,	60,	23,	0,	160,	300,	"정복",	null],
+        [ 64,	"엄강",	1216,	0,	null,	42,	51,	18,	0,	160,	300,	"재간",	null],
+        [ 10,	"엄백호",	1217,	0,	null,	39,	68,	13,	0,	160,	300,	"할거",	null],
+        [ 10,	"엄여",	1218,	0,	null,	35,	66,	11,	0,	160,	300,	"할거",	null],
+        [ 69,	"엄안",	1219,	0,	null,	47,	62,	25,	0,	160,	300,	"왕좌",	null],
+        [  7,	"엄정",	1220,	0,	null,	30,	68,	19,	0,	160,	300,	"출세",	null],
+        [121,	"엄준",	1221,	0,	null,	38,	11,	71,	0,	160,	300,	"재간",	null],
+        [ 71,	"여개",	1222,	0,	null,	40,	17,	52,	0,	160,	300,	"유지",	null],
+        [ 29,	"여건",	1223,	0,	null,	38,	68,	13,	0,	160,	300,	"출세",	null],
+        [107,	"여광",	1224,	0,	null,	43,	52,	12,	0,	160,	300,	"유지",	null],
+        [124,	"여몽",	1225,	0,	null,	54,	29,	67,	0,	160,	300,	"패권",	"궁병"],
+        [123,	"여범",	1226,	0,	null,	37,	14,	71,	0,	160,	300,	"할거",	null],
+        [107,	"여상",	1227,	0,	null,	44,	52,	12,	0,	160,	300,	"유지",	null],
+        [105,	"여위황",	1228,	0,	null,	37,	62,	16,	0,	160,	300,	"정복",	null],
+        [145,	"여포",	1229,	0,	null,	48,	72,	13,	0,	160,	300,	"패권",	"돌격",	"다 죽여버리겠다! 으하하."],
+        [ 50,	"염우",	1230,	0,	null,	42,	42,	9,	0,	160,	300,	"출세",	null],
+        [ 40,	"염유",	1231,	0,	null,	43,	57,	20,	0,	160,	300,	"출세",	null],
+        [ 18,	"염포",	1232,	0,	null,	33,	15,	77,	0,	160,	300,	"유지",	null],
+        [ 40,	"예형",	1233,	0,	null,	49,	13,	69,	0,	160,	300,	"은둔",	"통찰"],
+        [133,	"오강",	1234,	0,	null,	39,	15,	61,	0,	160,	300,	"안전",	null],
+        [ 59,	"오란",	1235,	0,	null,	45,	57,	17,	0,	160,	300,	"재간",	null],
+        [ 72,	"오반",	1236,	0,	null,	46,	51,	18,	0,	160,	300,	"재간",	null],
+        [128,	"오언",	1237,	0,	null,	47,	48,	20,	0,	160,	300,	"재간",	null],
+        [126,	"오연",	1238,	0,	null,	35,	70,	13,	0,	160,	300,	"정복",	null],
+        [ 69,	"오의",	1239,	0,	null,	48,	27,	56,	0,	160,	300,	"유지",	null],
+        [ 19,	"오질",	1240,	0,	null,	37,	15,	69,	0,	160,	300,	"출세",	null],
+        [ 51,	"올돌골",	1241,	0,	null,	49,	67,	8,	0,	160,	300,	"출세",	"척사"],
+        [ 52,	"옹개",	1242,	0,	null,	42,	52,	20,	0,	160,	300,	"안전",	null],
+        [ 20,	"왕경",	1243,	0,	null,	41,	19,	51,	0,	160,	300,	"재간",	null],
+        [ 97,	"왕광",	1244,	0,	null,	47,	52,	21,	0,	160,	300,	"유지",	null],
+        [ 30,	"왕기1",	1245,	0,	null,	48,	24,	54,	0,	160,	300,	"유지",	null],
+        [ 34,	"왕랑",	1246,	0,	null,	39,	13,	51,	0,	160,	300,	"할거",	null],
+        [ 57,	"왕루",	1247,	0,	null,	36,	12,	76,	0,	160,	300,	"유지",	null],
+        [ 76,	"왕보",	1248,	0,	null,	39,	14,	75,	0,	160,	300,	"대의",	null],
+        [ 86,	"왕수",	1249,	0,	null,	34,	14,	67,	0,	160,	300,	"재간",	null],
+        [ 26,	"왕쌍",	1250,	0,	null,	42,	65,	8,	0,	160,	300,	"정복",	"보병"],
+        [ 46,	"왕위",	1251,	0,	null,	43,	23,	52,	0,	160,	300,	"안전",	null],
+        [ 92,	"왕윤",	1252,	0,	null,	14,	9,	77,	0,	160,	300,	"왕좌",	null],
+        [ 40,	"왕융",	1253,	0,	null,	44,	17,	58,	0,	160,	300,	"재간",	null],
+        [ 32,	"왕준",	1254,	0,	null,	50,	61,	28,	0,	160,	300,	"대의",	null],
+        [ 30,	"왕찬",	1255,	0,	null,	27,	12,	78,	0,	160,	300,	"안전",	null],
+        [ 33,	"왕창",	1256,	0,	null,	48,	46,	20,	0,	160,	300,	"정복",	null],
+        [ 69,	"왕평",	1257,	0,	null,	49,	57,	27,	0,	160,	300,	"재간",	null],
+        [ 71,	"왕항",	1258,	0,	null,	40,	17,	48,	0,	160,	300,	"대의",	null],
+        [ 33,	"왕혼",	1259,	0,	null,	46,	14,	47,	0,	160,	300,	"정복",	null],
+        [ 71,	"요립",	1260,	0,	null,	45,	17,	62,	0,	160,	300,	"출세",	null],
+        [ 74,	"요화",	1261,	0,	null,	45,	22,	48,	0,	160,	300,	"의협",	null],
+        [ 22,	"우금1",	1262,	0,	null,	50,	56,	27,	0,	160,	300,	"정복",	null],
+        [ 27,	"우금2",	1263,	0,	null,	44,	58,	15,	0,	160,	300,	"대의",	null],
+        [122,	"우번",	1264,	0,	null,	22,	17,	73,	0,	160,	300,	"유지",	null],
+        [126,	"우전",	1265,	0,	null,	44,	45,	17,	0,	160,	300,	"안전",	null],
+        [ 86,	"원담",	1266,	0,	null,	45,	47,	21,	0,	160,	300,	"왕좌",	null],
+        [101,	"원상",	1267,	0,	null,	41,	55,	26,	0,	160,	300,	"패권",	null],
+        [101,	"원소",	1268,	0,	null,	51,	25,	57,	0,	160,	300,	"패권",	"위압"],
+        [140,	"원술",	1269,	0,	null,	49,	23,	54,	0,	160,	300,	"패권",	"축성"],
+        [140,	"원윤",	1270,	0,	null,	37,	14,	60,	0,	160,	300,	"패권",	null],
+        [101,	"원희",	1271,	0,	null,	46,	22,	55,	0,	160,	300,	"할거",	null],
+        [131,	"위소",	1272,	0,	null,	36,	11,	82,	0,	160,	300,	"재간",	null],
+        [147,	"위속",	1273,	0,	null,	42,	47,	17,	0,	160,	300,	"안전",	null],
+        [ 81,	"위연",	1274,	0,	null,	49,	68,	24,	0,	160,	300,	"패권",	"보병"],
+        [ 96,	"위유",	1275,	0,	null,	41,	26,	54,	0,	160,	300,	"재간",	null],
+        [ 76,	"유기",	1276,	0,	null,	42,	9,	55,	0,	160,	300,	"왕좌",	null],
+        [ 36,	"유대",	1277,	0,	null,	43,	22,	49,	0,	160,	300,	"재간",	null],
+        [134,	"유도",	1278,	0,	null,	35,	14,	68,	0,	160,	300,	"재간",	null],
+        [ 46,	"유벽",	1279,	0,	null,	44,	54,	11,	0,	160,	300,	"출세",	null],
+        [ 75,	"유봉",	1280,	0,	null,	43,	51,	24,	0,	160,	300,	"출세",	null],
+        [ 75,	"유비",	1281,	0,	null,	51,	57,	26,	0,	160,	300,	"왕좌",	"인덕"],
+        [ 75,	"유선1",	1282,	0,	null,	23,	17,	24,	0,	160,	300,	"대의",	null],
+        [ 55,	"유순",	1283,	0,	null,	45,	48,	21,	0,	160,	300,	"출세",	null],
+        [ 75,	"유심",	1284,	0,	null,	44,	18,	54,	0,	160,	300,	"왕좌",	null],
+        [129,	"유약",	1285,	0,	null,	45,	49,	23,	0,	160,	300,	"유지",	null],
+        [ 55,	"유언",	1286,	0,	null,	43,	16,	56,	0,	160,	300,	"할거",	null],
+        [ 27,	"유엽",	1287,	0,	null,	36,	13,	79,	0,	160,	300,	"유지",	null],
+        [ 11,	"유요",	1288,	0,	null,	22,	10,	48,	0,	160,	300,	"안전",	"발명"],
+        [ 96,	"유우",	1289,	0,	null,	46,	14,	55,	0,	160,	300,	"왕좌",	null],
+        [ 55,	"유장",	1290,	0,	null,	36,	13,	63,	0,	160,	300,	"할거",	"수비"],
+        [ 45,	"유종",	1291,	0,	null,	20,	12,	61,	0,	160,	300,	"할거",	null],
+        [ 56,	"유파",	1292,	0,	null,	39,	14,	70,	0,	160,	300,	"대의",	null],
+        [ 45,	"유표1",	1293,	0,	null,	47,	22,	54,	0,	160,	300,	"할거",	null],
+        [ 27,	"유표2",	1294,	0,	null,	48,	21,	54,	0,	160,	300,	"안전",	null],
+        [134,	"유현",	1295,	0,	null,	31,	56,	21,	0,	160,	300,	"안전",	null],
+        [122,	"육개",	1296,	0,	null,	45,	13,	55,	0,	160,	300,	"재간",	null],
+        [122,	"육손",	1297,	0,	null,	56,	26,	70,	0,	160,	300,	"왕좌",	"귀병"],
+        [121,	"육적",	1298,	0,	null,	38,	13,	73,	0,	160,	300,	"안전",	null],
+        [122,	"육항",	1299,	0,	null,	55,	26,	68,	0,	160,	300,	"왕좌",	null],
+        [ 38,	"윤대목",	1300,	0,	null,	44,	19,	53,	0,	160,	300,	"재간",	null],
+        [ 80,	"윤묵",	1301,	0,	null,	17,	12,	73,	0,	160,	300,	"대의",	null],
+        [ 72,	"윤상",	1302,	0,	null,	29,	14,	42,	0,	160,	300,	"대의",	null],
+        [136,	"윤직",	1303,	0,	null,	38,	58,	49,	0,	160,	300,	"재간",	null],
+        [  2,	"이각",	1304,	0,	null,	42,	58,	17,	0,	160,	300,	"패권",	null],
+        [146,	"이숙",	1305,	0,	null,	26,	18,	67,	0,	160,	300,	"재간",	null],
+        [ 71,	"이엄",	1306,	0,	null,	50,	62,	30,	0,	160,	300,	"패권",	null],
+        [  2,	"이유",	1307,	0,	null,	44,	10,	66,	0,	160,	300,	"패권",	"귀모"],
+        [132,	"이이",	1308,	0,	null,	41,	57,	10,	0,	160,	300,	"정복",	null],
+        [ 77,	"이적",	1309,	0,	null,	41,	12,	58,	0,	160,	300,	"할거",	null],
+        [ 22,	"이전",	1310,	0,	null,	48,	26,	61,	0,	160,	300,	"왕좌",	null],
+        [ 71,	"이풍1",	1311,	0,	null,	43,	22,	49,	0,	160,	300,	"재간",	null],
+        [ 66,	"이회",	1312,	0,	null,	45,	20,	59,	0,	160,	300,	"유지",	null],
+        [114,	"잠혼",	1313,	0,	null,	13,	8,	44,	0,	160,	300,	"할거",	null],
+        [  7,	"장각",	1314,	0,	null,	54,	11,	67,	0,	160,	300,	"패권",	"환술"],
+        [ 34,	"장간",	1315,	0,	null,	17,	10,	70,	0,	160,	300,	"재간",	null],
+        [  7,	"장개",	1316,	0,	null,	39,	69,	9,	0,	160,	300,	"안전",	null],
+        [122,	"장굉",	1317,	0,	null,	24,	10,	85,	0,	160,	300,	"왕좌",	null],
+        [  7,	"장량",	1318,	0,	null,	46,	60,	26,	0,	160,	300,	"정복",	"환술"],
+        [ 15,	"장로",	1319,	0,	null,	48,	18,	60,	0,	160,	300,	"유지",	"축성"],
+        [ 23,	"장료",	1320,	0,	null,	53,	67,	31,	0,	160,	300,	"의협",	"견고"],
+        [  7,	"장보",	1321,	0,	null,	49,	60,	28,	0,	160,	300,	"패권",	"환술"],
+        [ 76,	"장비",	1322,	0,	null,	49,	71,	19,	0,	160,	300,	"의협",	"무쌍",	"어쭈. 해보자 이거냐?"],
+        [ 62,	"장서",	1323,	0,	null,	38,	48,	15,	0,	160,	300,	"출세",	null],
+        [120,	"장소1",	1324,	0,	null,	37,	11,	91,	0,	160,	300,	"안전",	null],
+        [ 78,	"장소2",	1325,	0,	null,	40,	18,	54,	0,	160,	300,	"재간",	null],
+        [ 72,	"장송",	1326,	0,	null,	39,	12,	93,	0,	160,	300,	"할거",	"통찰"],
+        [148,	"장수",	1327,	0,	null,	47,	55,	26,	0,	160,	300,	"할거",	null],
+        [145,	"장양1",	1328,	0,	null,	44,	51,	25,	0,	160,	300,	"출세",	null],
+        [  8,	"장연",	1329,	0,	null,	49,	51,	19,	0,	160,	300,	"안전",	null],
+        [ 11,	"장영",	1330,	0,	null,	41,	51,	16,	0,	160,	300,	"재간",	null],
+        [118,	"장온",	1331,	0,	null,	19,	13,	69,	0,	160,	300,	"할거",	null],
+        [ 78,	"장완",	1332,	0,	null,	46,	21,	63,	0,	160,	300,	"할거",	"상재"],
+        [ 15,	"장위",	1333,	0,	null,	45,	54,	13,	0,	160,	300,	"대의",	null],
+        [ 36,	"장윤",	1334,	0,	null,	45,	23,	48,	0,	160,	300,	"정복",	null],
+        [104,	"장의거",	1335,	0,	null,	46,	47,	14,	0,	160,	300,	"대의",	null],
+        [ 68,	"장익",	1336,	0,	null,	48,	52,	24,	0,	160,	300,	"유지",	null],
+        [ 56,	"장임",	1337,	0,	null,	51,	61,	28,	0,	160,	300,	"대의",	"견고"],
+        [148,	"장제1",	1338,	0,	null,	46,	51,	23,	0,	160,	300,	"할거",	null],
+        [ 32,	"장제2",	1339,	0,	null,	29,	14,	84,	0,	160,	300,	"유지",	null],
+        [126,	"장제3",	1340,	0,	null,	48,	19,	48,	0,	160,	300,	"할거",	null],
+        [ 17,	"장패",	1341,	0,	null,	38,	78,	17,	0,	160,	300,	"할거",	null],
+        [ 76,	"장포1",	1342,	0,	null,	46,	63,	19,	0,	160,	300,	"재간",	"징병"],
+        [113,	"장포2",	1343,	0,	null,	44,	51,	20,	0,	160,	300,	"유지",	null],
+        [ 27,	"장합",	1344,	0,	null,	51,	66,	24,	0,	160,	300,	"출세",	"궁병"],
+        [ 23,	"장호",	1345,	0,	null,	42,	49,	21,	0,	160,	300,	"정복",	null],
+        [ 31,	"장화",	1346,	0,	null,	39,	11,	86,	0,	160,	300,	"유지",	null],
+        [ 48,	"장횡",	1347,	0,	null,	41,	52,	11,	0,	160,	300,	"재간",	null],
+        [141,	"장훈",	1348,	0,	null,	45,	48,	23,	0,	160,	300,	"안전",	null],
+        [120,	"장휴",	1349,	0,	null,	37,	15,	70,	0,	160,	300,	"재간",	null],
+        [126,	"장흠",	1350,	0,	null,	44,	25,	52,	0,	160,	300,	"대의",	"저격"],
+        [ 96,	"저수",	1351,	0,	null,	50,	21,	64,	0,	160,	300,	"할거",	"반계"],
+        [130,	"전단",	1352,	0,	null,	44,	55,	23,	0,	160,	300,	"출세",	null],
+        [ 42,	"전속",	1353,	0,	null,	45,	46,	19,	0,	160,	300,	"안전",	null],
+        [ 26,	"전위1",	1354,	0,	null,	43,	69,	14,	0,	160,	300,	"의협",	"필살"],
+        [130,	"전위2",	1355,	0,	null,	48,	53,	24,	0,	160,	300,	"출세",	null],
+        [128,	"전종",	1356,	0,	null,	49,	58,	28,	0,	160,	300,	"패권",	null],
+        [ 42,	"전주",	1357,	0,	null,	46,	52,	20,	0,	160,	300,	"의협",	null],
+        [ 96,	"전풍",	1358,	0,	null,	50,	17,	69,	0,	160,	300,	"왕좌",	null],
+        [ 24,	"정무",	1359,	0,	null,	41,	16,	56,	0,	160,	300,	"출세",	null],
+        [119,	"정병",	1360,	0,	null,	20,	11,	67,	0,	160,	300,	"유지",	null],
+        [126,	"정보",	1361,	0,	null,	50,	24,	57,	0,	160,	300,	"패권",	null],
+        [123,	"정봉1",	1362,	0,	null,	46,	58,	24,	0,	160,	300,	"패권",	null],
+        [ 24,	"정욱",	1363,	0,	null,	50,	16,	66,	0,	160,	300,	"패권",	"신중"],
+        [ 88,	"정원",	1364,	0,	null,	44,	58,	22,	0,	160,	300,	"왕좌",	"기병"],
+        [  7,	"정원지",	1365,	0,	null,	37,	74,	16,	0,	160,	300,	"출세",	null],
+        [ 69,	"정은",	1366,	0,	null,	41,	49,	12,	0,	160,	300,	"재간",	null],
+        [121,	"제갈각",	1367,	0,	null,	43,	21,	67,	0,	160,	300,	"왕좌",	null],
+        [ 76,	"제갈균",	1368,	0,	null,	43,	18,	56,	0,	160,	300,	"안전",	"상재"],
+        [121,	"제갈근",	1369,	0,	null,	43,	17,	64,	0,	160,	300,	"왕좌",	"경작"],
+        [ 76,	"제갈량",	1370,	0,	null,	55,	21,	72,	0,	160,	300,	"왕좌",	"집중",	"슬슬 나의 지모를 발휘해 보겠습니다..."],
+        [ 76,	"제갈상",	1371,	0,	null,	40,	57,	27,	0,	160,	300,	"대의",	null],
+        [135,	"제갈정",	1372,	0,	null,	42,	46,	21,	0,	160,	300,	"안전",	null],
+        [ 76,	"제갈첨",	1373,	0,	null,	47,	20,	57,	0,	160,	300,	"대의",	null],
+        [135,	"제갈탄",	1374,	0,	null,	49,	59,	27,	0,	160,	300,	"패권",	null],
+        [ 76,	"조광",	1375,	0,	null,	45,	52,	21,	0,	160,	300,	"재간",	null],
+        [ 74,	"조루",	1376,	0,	null,	39,	15,	60,	0,	160,	300,	"대의",	null],
+        [ 24,	"조모",	1377,	0,	null,	41,	31,	13,	0,	160,	300,	"할거",	null],
+        [127,	"조무",	1378,	0,	null,	47,	26,	54,	0,	160,	300,	"의협",	null],
+        [ 26,	"조방",	1379,	0,	null,	40,	10,	30,	0,	160,	300,	"정복",	null],
+        [ 83,	"조범",	1380,	0,	null,	42,	16,	49,	0,	160,	300,	"유지",	null],
+        [ 26,	"조비",	1381,	0,	null,	47,	26,	57,	0,	160,	300,	"패권",	"징병"],
+        [ 19,	"조상",	1382,	0,	null,	46,	49,	13,	0,	160,	300,	"패권",	null],
+        [147,	"조성",	1383,	0,	null,	38,	69,	20,	0,	160,	300,	"안전",	null],
+        [ 26,	"조순",	1384,	0,	null,	45,	22,	55,	0,	160,	300,	"정복",	null],
+        [ 25,	"조식",	1385,	0,	null,	17,	9,	90,	0,	160,	300,	"왕좌",	"귀모"],
+        [ 25,	"조앙",	1386,	0,	null,	38,	65,	24,	0,	160,	300,	"왕좌",	null],
+        [ 25,	"조예",	1387,	0,	null,	42,	21,	61,	0,	160,	300,	"정복",	null],
+        [ 26,	"조우",	1388,	0,	null,	45,	21,	52,	0,	160,	300,	"대의",	null],
+        [ 76,	"조운",	1389,	0,	null,	55,	70,	32,	0,	160,	300,	"왕좌",	"무쌍",	"창술의 달인 상산 조자룡 여기 있소!"],
+        [ 25,	"조웅",	1390,	0,	null,	43,	12,	38,	0,	160,	300,	"안전",	null],
+        [ 26,	"조인",	1391,	0,	null,	48,	59,	24,	0,	160,	300,	"패권",	"보병"],
+        [ 25,	"조조",	1392,	0,	null,	56,	30,	69,	0,	160,	300,	"패권",	"반계"],
+        [ 26,	"조진",	1393,	0,	null,	50,	52,	25,	0,	160,	300,	"정복",	null],
+        [ 25,	"조창",	1394,	0,	null,	48,	64,	15,	0,	160,	300,	"정복",	"돌격"],
+        [ 76,	"조통",	1395,	0,	null,	45,	50,	21,	0,	160,	300,	"재간",	null],
+        [ 84,	"조표",	1396,	0,	null,	34,	70,	8,	0,	160,	300,	"안전",	null],
+        [  7,	"조홍1",	1397,	0,	null,	40,	51,	17,	0,	160,	300,	"유지",	null],
+        [ 24,	"조홍2",	1398,	0,	null,	47,	53,	18,	0,	160,	300,	"패권",	null],
+        [ 26,	"조환",	1399,	0,	null,	34,	11,	42,	0,	160,	300,	"정복",	null],
+        [ 19,	"조훈",	1400,	0,	null,	45,	49,	13,	0,	160,	300,	"출세",	null],
+        [ 26,	"조휴",	1401,	0,	null,	48,	54,	26,	0,	160,	300,	"패권",	null],
+        [ 19,	"조희",	1402,	0,	null,	44,	22,	54,	0,	160,	300,	"대의",	null],
+        [ 22,	"종요",	1403,	0,	null,	14,	10,	74,	0,	160,	300,	"유지",	null],
+        [ 20,	"종회",	1404,	0,	null,	51,	22,	67,	0,	160,	300,	"패권",	null],
+        [128,	"주거",	1405,	0,	null,	47,	27,	55,	0,	160,	300,	"유지",	null],
+        [118,	"주방",	1406,	0,	null,	42,	15,	57,	0,	160,	300,	"할거",	null],
+        [126,	"주연",	1407,	0,	null,	47,	55,	20,	0,	160,	300,	"할거",	null],
+        [126,	"주유",	1408,	0,	null,	55,	27,	70,	0,	160,	300,	"패권",	"신산"],
+        [128,	"주이",	1409,	0,	null,	43,	21,	48,	0,	160,	300,	"안전",	null],
+        [ 88,	"주준",	1410,	0,	null,	50,	57,	25,	0,	160,	300,	"왕좌",	null],
+        [ 32,	"주지",	1411,	0,	null,	40,	58,	19,	0,	160,	300,	"안전",	null],
+        [ 76,	"주창",	1412,	0,	null,	37,	79,	13,	0,	160,	300,	"의협",	"궁병"],
+        [126,	"주치",	1413,	0,	null,	42,	21,	45,	0,	160,	300,	"안전",	null],
+        [ 41,	"주태1",	1414,	0,	null,	44,	21,	48,	0,	160,	300,	"안전",	null],
+        [126,	"주태2",	1415,	0,	null,	48,	64,	23,	0,	160,	300,	"정복",	"필살"],
+        [128,	"주환",	1416,	0,	null,	51,	63,	28,	0,	160,	300,	"정복",	null],
+        [ 29,	"진건",	1417,	0,	null,	44,	54,	24,	0,	160,	300,	"정복",	null],
+        [ 29,	"진교",	1418,	0,	null,	19,	11,	67,	0,	160,	300,	"유지",	null],
+        [ 28,	"진군",	1419,	0,	null,	43,	16,	64,	0,	160,	300,	"대의",	null],
+        [143,	"진궁",	1420,	0,	null,	49,	20,	66,	0,	160,	300,	"할거",	"신중"],
+        [ 79,	"진규",	1421,	0,	null,	20,	9,	71,	0,	160,	300,	"할거",	null],
+        [ 72,	"진도",	1422,	0,	null,	47,	63,	26,	0,	160,	300,	"대의",	null],
+        [ 79,	"진등",	1423,	0,	null,	44,	24,	54,	0,	160,	300,	"할거",	null],
+        [ 37,	"진림",	1424,	0,	null,	40,	12,	61,	0,	160,	300,	"재간",	null],
+        [124,	"진무",	1425,	0,	null,	44,	56,	23,	0,	160,	300,	"재간",	null],
+        [ 66,	"진복",	1426,	0,	null,	35,	12,	76,	0,	160,	300,	"재간",	null],
+        [ 50,	"진수",	1427,	0,	null,	24,	13,	83,	0,	160,	300,	"대의",	null],
+        [ 81,	"진식",	1428,	0,	null,	39,	68,	20,	0,	160,	300,	"출세",	null],
+        [ 79,	"진진",	1429,	0,	null,	42,	16,	50,	0,	160,	300,	"재간",	null],
+        [ 28,	"진태",	1430,	0,	null,	49,	57,	26,	0,	160,	300,	"대의",	null],
+        [ 11,	"진횡",	1431,	0,	null,	36,	58,	19,	0,	160,	300,	"출세",	null],
+        [ 21,	"차주",	1432,	0,	null,	41,	51,	24,	0,	160,	300,	"안전",	null],
+        [ 11,	"착융",	1433,	0,	null,	44,	47,	10,	0,	160,	300,	"출세",	null],
+        [ 36,	"채모",	1434,	0,	null,	49,	53,	26,	0,	160,	300,	"정복",	"궁병"],
+        [ 36,	"채중",	1435,	0,	null,	42,	17,	45,	0,	160,	300,	"출세",	null],
+        [ 36,	"채화",	1436,	0,	null,	42,	19,	41,	0,	160,	300,	"안전",	null],
+        [ 66,	"초주",	1437,	0,	null,	20,	12,	81,	0,	160,	300,	"대의",	null],
+        [ 20,	"최염",	1438,	0,	null,	37,	54,	52,	0,	160,	300,	"대의",	null],
+        [ 60,	"축융",	1439,	0,	null,	43,	64,	11,	0,	160,	300,	"정복",	"척사"],
+        [ 60,	"타사대왕",	1440,	0,	null,	43,	55,	25,	0,	160,	300,	"출세",	"척사"],
+        [124,	"태사자",	1441,	0,	null,	47,	70,	25,	0,	160,	300,	"대의",	"무쌍"],
+        [124,	"태사향",	1442,	0,	null,	40,	53,	20,	0,	160,	300,	"재간",	null],
+        [ 12,	"포륭",	1443,	0,	null,	41,	56,	10,	0,	160,	300,	"안전",	null],
+        [ 74,	"풍습",	1444,	0,	null,	35,	64,	18,	0,	160,	300,	"재간",	null],
+        [  7,	"하의",	1445,	0,	null,	39,	68,	11,	0,	160,	300,	"출세",	null],
+        [121,	"하제",	1446,	0,	null,	48,	55,	24,	0,	160,	300,	"재간",	null],
+        [ 90,	"하진",	1447,	0,	null,	39,	69,	15,	0,	160,	300,	"왕좌",	null],
+        [ 24,	"하후덕",	1448,	0,	null,	45,	50,	16,	0,	160,	300,	"출세",	null],
+        [ 26,	"하후돈",	1449,	0,	null,	52,	67,	27,	0,	160,	300,	"의협",	"돌격",	"다 나오거라! 상대해 주마!"],
+        [ 19,	"하후무",	1450,	0,	null,	36,	33,	34,	0,	160,	300,	"안전",	null],
+        [ 24,	"하후상",	1451,	0,	null,	45,	24,	54,	0,	160,	300,	"출세",	null],
+        [ 26,	"하후연",	1452,	0,	null,	49,	66,	22,	0,	160,	300,	"패권",	"궁병",	"궁술로 날 당해낼 자가 있을까? 후후."],
+        [ 26,	"하후위",	1453,	0,	null,	47,	57,	27,	0,	160,	300,	"정복",	null],
+        [ 26,	"하후은",	1454,	0,	null,	39,	51,	16,	0,	160,	300,	"안전",	null],
+        [ 23,	"하후패",	1455,	0,	null,	49,	64,	26,	0,	160,	300,	"대의",	null],
+        [ 20,	"하후현",	1456,	0,	null,	42,	11,	57,	0,	160,	300,	"유지",	null],
+        [ 26,	"하후혜",	1457,	0,	null,	48,	25,	58,	0,	160,	300,	"정복",	null],
+        [ 26,	"하후화",	1458,	0,	null,	49,	23,	60,	0,	160,	300,	"정복",	null],
+        [ 22,	"학소",	1459,	0,	null,	53,	30,	63,	0,	160,	300,	"대의",	"견고"],
+        [126,	"한당",	1460,	0,	null,	46,	52,	24,	0,	160,	300,	"할거",	null],
+        [ 93,	"한복",	1461,	0,	null,	45,	47,	17,	0,	160,	300,	"안전",	null],
+        [  8,	"한섬",	1462,	0,	null,	36,	62,	15,	0,	160,	300,	"출세",	null],
+        [ 48,	"한수",	1463,	0,	null,	45,	28,	58,	0,	160,	300,	"대의",	"기병"],
+        [ 40,	"한숭",	1464,	0,	null,	19,	11,	70,	0,	160,	300,	"재간",	null],
+        [  7,	"한충",	1465,	0,	null,	37,	66,	13,	0,	160,	300,	"안전",	null],
+        [  9,	"한현",	1466,	0,	null,	37,	61,	10,	0,	160,	300,	"유지",	null],
+        [ 27,	"한호",	1467,	0,	null,	43,	55,	18,	0,	160,	300,	"유지",	null],
+        [ 79,	"향랑",	1468,	0,	null,	40,	10,	58,	0,	160,	300,	"대의",	null],
+        [ 79,	"향총",	1469,	0,	null,	48,	17,	55,	0,	160,	300,	"왕좌",	null],
+        [139,	"허공",	1470,	0,	null,	45,	49,	23,	0,	160,	300,	"유지",	null],
+        [ 21,	"허유",	1471,	0,	null,	39,	47,	46,	0,	160,	300,	"재간",	null],
+        [ 23,	"허의",	1472,	0,	null,	30,	74,	19,	0,	160,	300,	"출세",	null],
+        [ 26,	"허저",	1473,	0,	null,	42,	70,	12,	0,	160,	300,	"정복",	"무쌍"],
+        [ 87,	"허정",	1474,	0,	null,	16,	13,	74,	0,	160,	300,	"재간",	null],
+        [ 12,	"형도영",	1475,	0,	null,	39,	78,	11,	0,	160,	300,	"출세",	null],
+        [148,	"호거아",	1476,	0,	null,	35,	76,	23,	0,	160,	300,	"안전",	null],
+        [ 76,	"호반",	1477,	0,	null,	43,	46,	18,	0,	160,	300,	"재간",	null],
+        [ 20,	"호분",	1478,	0,	null,	47,	23,	48,	0,	160,	300,	"할거",	null],
+        [ 27,	"호주천",	1479,	0,	null,	49,	57,	25,	0,	160,	300,	"정복",	null],
+        [ 20,	"호준",	1480,	0,	null,	45,	48,	18,	0,	160,	300,	"재간",	null],
+        [  2,	"화웅",	1481,	0,	null,	46,	64,	11,	0,	160,	300,	"출세",	"돌격"],
+        [131,	"화핵",	1482,	0,	null,	35,	12,	75,	0,	160,	300,	"안전",	null],
+        [ 10,	"화흠",	1483,	0,	null,	16,	17,	75,	0,	160,	300,	"출세",	null],
+        [ 21,	"환범",	1484,	0,	null,	18,	11,	81,	0,	160,	300,	"유지",	null],
+        [127,	"황개",	1485,	0,	null,	49,	63,	26,	0,	160,	300,	"왕좌",	"징병"],
+        [ 56,	"황권",	1486,	0,	null,	48,	18,	58,	0,	160,	300,	"대의",	null],
+        [ 41,	"황란",	1487,	0,	null,	28,	70,	11,	0,	160,	300,	"재간",	null],
+        [ 88,	"황보숭",	1488,	0,	null,	51,	24,	55,	0,	160,	300,	"왕좌",	null],
+        [ 72,	"황충",	1489,	0,	null,	51,	68,	25,	0,	160,	300,	"왕좌",	"궁병"],
+        [ 50,	"황호",	1490,	0,	null,	13,	9,	48,	0,	160,	300,	"안전",	null],
+        [147,	"후성",	1491,	0,	null,	42,	49,	14,	0,	160,	300,	"정복",	null]
+    ],
+    "general_ex":[
+        [123,	"가화",	1492,	0,	null,	40,	51,	16,	0,	160,	300,	null,	null],
+        [999,	"건석",	1493,	0,	null,	19,	7,	61,	0,	160,	300,	null,	null],
+        [999,	"견씨",	1494,	0,	null,	35,	11,	58,	0,	160,	300,	null,	null],
+        [ 40,	"견홍",	1495,	0,	null,	48,	55,	25,	0,	160,	300,	null,	null],
+        [120,	"고담",	1496,	0,	null,	33,	10,	69,	0,	160,	300,	null,	null],
+        [101,	"고유",	1497,	0,	null,	42,	18,	55,	0,	160,	300,	null,	null],
+        [132,	"곽마",	1498,	0,	null,	46,	54,	19,	0,	160,	300,	null,	null],
+        [ 39,	"관구수",	1499,	0,	null,	42,	49,	15,	0,	160,	300,	null,	null],
+        [ 39,	"관구전",	1500,	0,	null,	44,	22,	52,	0,	160,	300,	null,	null],
+        [999,	"관로",	1501,	0,	null,	44,	10,	57,	0,	160,	300,	null,	null],
+        [ 65,	"관정",	1502,	0,	null,	35,	20,	73,	0,	160,	300,	null,	null],
+        [137,	"교수",	1503,	0,	null,	45,	53,	16,	0,	160,	300,	null,	null],
+        [ 33,	"구건",	1504,	0,	null,	37,	22,	53,	0,	160,	300,	null,	null],
+        [ 41,	"구본",	1505,	0,	null,	40,	17,	54,	0,	160,	300,	null,	null],
+        [ 12,	"구성",	1506,	0,	null,	42,	54,	13,	0,	160,	300,	null,	null],
+        [ 21,	"국연",	1507,	0,	null,	40,	10,	54,	0,	160,	300,	null,	null],
+        [ 99,	"국의",	1508,	0,	null,	51,	59,	20,	0,	160,	300,	null,	null],
+        [ 34,	"금의",	1509,	0,	null,	16,	16,	63,	0,	160,	300,	null,	null],
+        [ 76,	"나헌",	1510,	0,	null,	52,	25,	57,	0,	160,	300,	null,	null],
+        [999,	"남두",	1511,	0,	null,	35,	11,	54,	0,	160,	300,	null,	null],
+        [ 54,	"냉포",	1512,	0,	null,	46,	61,	26,	0,	160,	300,	null,	null],
+        [124,	"노숙2",	1513,	0,	null,	46,	21,	57,	0,	160,	300,	null,	null],
+        [ 42,	"누규",	1514,	0,	null,	41,	9,	64,	0,	160,	300,	null,	null],
+        [  6,	"누반",	1515,	0,	null,	45,	57,	16,	0,	160,	300,	null,	null],
+        [130,	"누현",	1516,	0,	null,	22,	10,	68,	0,	160,	300,	null,	null],
+        [ 40,	"당균",	1517,	0,	null,	33,	9,	81,	0,	160,	300,	null,	null],
+        [ 32,	"당빈",	1518,	0,	null,	46,	56,	24,	0,	160,	300,	null,	null],
+        [999,	"대교",	1519,	0,	null,	37,	6,	44,	0,	160,	300,	null,	null],
+        [ 28,	"대릉",	1520,	0,	null,	44,	57,	18,	0,	160,	300,	null,	null],
+        [129,	"동조",	1521,	0,	null,	14,	8,	51,	0,	160,	300,	null,	null],
+        [114,	"등수",	1522,	0,	null,	35,	10,	44,	0,	160,	300,	null,	null],
+        [ 50,	"마막",	1523,	0,	null,	20,	17,	5,	0,	160,	300,	null,	null],
+        [116,	"만욱",	1524,	0,	null,	18,	9,	66,	0,	160,	300,	null,	null],
+        [120,	"맹종",	1525,	0,	null,	39,	19,	52,	0,	160,	300,	null,	null],
+        [ 38,	"문호",	1526,	0,	null,	45,	56,	18,	0,	160,	300,	null,	null],
+        [999,	"미씨",	1527,	0,	null,	43,	8,	52,	0,	160,	300,	null,	null],
+        [ 39,	"반림",	1528,	0,	null,	45,	59,	6,	0,	160,	300,	null,	null],
+        [129,	"반장",	1529,	0,	null,	49,	58,	26,	0,	160,	300,	null,	null],
+        [ 94,	"방열",	1530,	0,	null,	42,	61,	12,	0,	160,	300,	null,	null],
+        [ 55,	"방희",	1531,	0,	null,	43,	16,	53,	0,	160,	300,	null,	null],
+        [ 30,	"배수",	1532,	0,	null,	7,	7,	77,	0,	160,	300,	null,	null],
+        [  8,	"번능",	1533,	0,	null,	46,	48,	19,	0,	160,	300,	null,	null],
+        [999,	"번씨",	1534,	0,	null,	31,	9,	45,	0,	160,	300,	null,	null],
+        [ 49,	"보도근",	1535,	0,	null,	44,	55,	20,	0,	160,	300,	null,	null],
+        [129,	"보천",	1536,	0,	null,	46,	23,	55,	0,	160,	300,	null,	null],
+        [121,	"보협",	1537,	0,	null,	47,	21,	57,	0,	160,	300,	null,	null],
+        [ 28,	"부하",	1538,	0,	null,	38,	15,	63,	0,	160,	300,	null,	null],
+        [ 26,	"비요",	1539,	0,	null,	46,	25,	55,	0,	160,	300,	null,	null],
+        [ 31,	"사마주",	1540,	0,	null,	44,	21,	49,	0,	160,	300,	null,	null],
+        [ 41,	"사찬",	1541,	0,	null,	43,	54,	21,	0,	160,	300,	null,	null],
+        [128,	"설후",	1542,	0,	null,	14,	8,	71,	0,	160,	300,	null,	null],
+        [ 36,	"성공영",	1543,	0,	null,	47,	22,	60,	0,	160,	300,	null,	null],
+        [126,	"성만",	1544,	0,	null,	43,	53,	25,	0,	160,	300,	null,	null],
+        [999,	"소교",	1545,	0,	null,	42,	11,	51,	0,	160,	300,	null,	null],
+        [ 46,	"소유",	1546,	0,	null,	40,	48,	19,	0,	160,	300,	null,	null],
+        [ 31,	"소제2",	1547,	0,	null,	20,	8,	78,	0,	160,	300,	null,	null],
+        [126,	"손교",	1548,	0,	null,	49,	23,	53,	0,	160,	300,	null,	null],
+        [116,	"손기",	1549,	0,	null,	44,	51,	20,	0,	160,	300,	null,	null],
+        [999,	"손상향",	1550,	0,	null,	47,	49,	17,	0,	160,	300,	null,	null],
+        [125,	"손익",	1551,	0,	null,	46,	57,	12,	0,	160,	300,	null,	null],
+        [125,	"손진",	1552,	0,	null,	44,	54,	19,	0,	160,	300,	null,	null],
+        [123,	"송겸",	1553,	0,	null,	43,	40,	18,	0,	160,	300,	null,	null],
+        [ 85,	"순심",	1554,	0,	null,	18,	10,	79,	0,	160,	300,	null,	null],
+        [ 31,	"순욱2",	1555,	0,	null,	7,	8,	77,	0,	160,	300,	null,	null],
+        [ 31,	"순의",	1556,	0,	null,	14,	7,	73,	0,	160,	300,	null,	null],
+        [129,	"시삭",	1557,	0,	null,	35,	66,	18,	0,	160,	300,	null,	null],
+        [ 29,	"신창",	1558,	0,	null,	40,	13,	39,	0,	160,	300,	null,	null],
+        [999,	"악신",	1559,	0,	null,	41,	7,	39,	0,	160,	300,	null,	null],
+        [138,	"악취",	1560,	0,	null,	42,	52,	22,	0,	160,	300,	null,	null],
+        [138,	"양강",	1561,	0,	null,	44,	54,	17,	0,	160,	300,	null,	null],
+        [ 21,	"양부",	1562,	0,	null,	46,	21,	63,	0,	160,	300,	null,	null],
+        [ 72,	"양서",	1563,	0,	null,	42,	24,	51,	0,	160,	300,	null,	null],
+        [ 34,	"양습",	1564,	0,	null,	45,	19,	55,	0,	160,	300,	null,	null],
+        [ 16,	"양앙",	1565,	0,	null,	45,	54,	16,	0,	160,	300,	null,	null],
+        [ 17,	"양임",	1566,	0,	null,	47,	58,	22,	0,	160,	300,	null,	null],
+        [ 32,	"양제",	1567,	0,	null,	46,	24,	54,	0,	160,	300,	null,	null],
+        [ 33,	"양조2",	1568,	0,	null,	45,	23,	52,	0,	160,	300,	null,	null],
+        [ 48,	"양추2",	1569,	0,	null,	45,	52,	23,	0,	160,	300,	null,	null],
+        [140,	"양홍",	1570,	0,	null,	17,	9,	76,	0,	160,	300,	null,	null],
+        [ 31,	"양혼",	1571,	0,	null,	43,	52,	24,	0,	160,	300,	null,	null],
+        [123,	"여거",	1572,	0,	null,	47,	22,	53,	0,	160,	300,	null,	null],
+        [130,	"여대",	1573,	0,	null,	51,	55,	26,	0,	160,	300,	null,	null],
+        [136,	"염상",	1574,	0,	null,	28,	12,	69,	0,	160,	300,	null,	null],
+        [ 36,	"염행",	1575,	0,	null,	46,	63,	16,	0,	160,	300,	null,	null],
+        [ 73,	"영수",	1576,	0,	null,	46,	26,	56,	0,	160,	300,	null,	null],
+        [ 39,	"오거",	1577,	0,	null,	39,	49,	14,	0,	160,	300,	null,	null],
+        [126,	"오경",	1578,	0,	null,	47,	48,	22,	0,	160,	300,	null,	null],
+        [999,	"오국태",	1579,	0,	null,	30,	7,	60,	0,	160,	300,	null,	null],
+        [126,	"오찬",	1580,	0,	null,	46,	17,	58,	0,	160,	300,	null,	null],
+        [ 23,	"온회",	1581,	0,	null,	37,	16,	58,	0,	160,	300,	null,	null],
+        [ 21,	"왕기2",	1582,	0,	null,	46,	51,	24,	0,	160,	300,	null,	null],
+        [ 32,	"왕도",	1583,	0,	null,	39,	18,	54,	0,	160,	300,	null,	null],
+        [123,	"왕돈",	1584,	0,	null,	43,	51,	17,	0,	160,	300,	null,	null],
+        [ 34,	"왕릉",	1585,	0,	null,	47,	23,	54,	0,	160,	300,	null,	null],
+        [ 63,	"왕문",	1586,	0,	null,	44,	52,	14,	0,	160,	300,	null,	null],
+        [ 32,	"왕상",	1587,	0,	null,	24,	9,	65,	0,	160,	300,	null,	null],
+        [ 34,	"왕숙",	1588,	0,	null,	35,	10,	80,	0,	160,	300,	null,	null],
+        [ 33,	"왕업",	1589,	0,	null,	31,	5,	46,	0,	160,	300,	null,	null],
+        [ 35,	"왕충",	1590,	0,	null,	37,	46,	10,	0,	160,	300,	null,	null],
+        [  1,	"우보",	1591,	0,	null,	37,	49,	7,	0,	160,	300,	null,	null],
+        [122,	"우사",	1592,	0,	null,	46,	14,	59,	0,	160,	300,	null,	null],
+        [138,	"원요",	1593,	0,	null,	38,	17,	39,	0,	160,	300,	null,	null],
+        [ 95,	"원유",	1594,	0,	null,	42,	16,	55,	0,	160,	300,	null,	null],
+        [ 31,	"위관",	1595,	0,	null,	46,	18,	60,	0,	160,	300,	null,	null],
+        [129,	"위막",	1596,	0,	null,	42,	49,	23,	0,	160,	300,	null,	null],
+        [ 55,	"유괴",	1597,	0,	null,	48,	55,	25,	0,	160,	300,	null,	null],
+        [129,	"유략",	1598,	0,	null,	47,	52,	23,	0,	160,	300,	null,	null],
+        [ 45,	"유반",	1599,	0,	null,	48,	59,	19,	0,	160,	300,	null,	null],
+        [ 29,	"유복",	1600,	0,	null,	41,	20,	55,	0,	160,	300,	null,	null],
+        [ 78,	"유선2",	1601,	0,	null,	6,	10,	39,	0,	160,	300,	null,	null],
+        [139,	"유섭",	1602,	0,	null,	44,	59,	12,	0,	160,	300,	null,	null],
+        [ 28,	"유소",	1603,	0,	null,	45,	20,	55,	0,	160,	300,	null,	null],
+        [128,	"유승",	1604,	0,	null,	38,	53,	13,	0,	160,	300,	null,	null],
+        [129,	"유찬",	1605,	0,	null,	48,	57,	25,	0,	160,	300,	null,	null],
+        [129,	"유평",	1606,	0,	null,	45,	54,	25,	0,	160,	300,	null,	null],
+        [138,	"유훈",	1607,	0,	null,	40,	50,	20,	0,	160,	300,	null,	null],
+        [ 48,	"이감",	1608,	0,	null,	43,	52,	14,	0,	160,	300,	null,	null],
+        [ 19,	"이승",	1609,	0,	null,	11,	12,	32,	0,	160,	300,	null,	null],
+        [ 22,	"이통",	1610,	0,	null,	48,	62,	20,	0,	160,	300,	null,	null],
+        [138,	"이풍2",	1611,	0,	null,	47,	58,	20,	0,	160,	300,	null,	null],
+        [ 20,	"이풍3",	1612,	0,	null,	22,	11,	71,	0,	160,	300,	null,	null],
+        [ 29,	"장구",	1613,	0,	null,	46,	54,	19,	0,	160,	300,	null,	null],
+        [ 21,	"장기",	1614,	0,	null,	49,	15,	59,	0,	160,	300,	null,	null],
+        [ 74,	"장남",	1615,	0,	null,	47,	50,	16,	0,	160,	300,	null,	null],
+        [100,	"장막",	1616,	0,	null,	41,	20,	54,	0,	160,	300,	null,	null],
+        [  7,	"장만성",	1617,	0,	null,	47,	61,	19,	0,	160,	300,	null,	null],
+        [135,	"장반",	1618,	0,	null,	42,	55,	25,	0,	160,	300,	null,	null],
+        [ 78,	"장빈",	1619,	0,	null,	29,	12,	67,	0,	160,	300,	null,	null],
+        [124,	"장승",	1620,	0,	null,	48,	26,	57,	0,	160,	300,	null,	null],
+        [999,	"장양2",	1621,	0,	null,	42,	42,	19,	0,	160,	300,	null,	null],
+        [ 68,	"장억",	1622,	0,	null,	50,	60,	21,	0,	160,	300,	null,	null],
+        [ 75,	"장준",	1623,	0,	null,	45,	52,	25,	0,	160,	300,	null,	null],
+        [ 20,	"장집",	1624,	0,	null,	30,	12,	74,	0,	160,	300,	null,	null],
+        [ 39,	"장특",	1625,	0,	null,	47,	21,	56,	0,	160,	300,	null,	null],
+        [ 96,	"저곡",	1626,	0,	null,	42,	21,	52,	0,	160,	300,	null,	null],
+        [128,	"전기",	1627,	0,	null,	40,	53,	21,	0,	160,	300,	null,	null],
+        [ 23,	"전만",	1628,	0,	null,	40,	56,	16,	0,	160,	300,	null,	null],
+        [128,	"전상",	1629,	0,	null,	2,	5,	11,	0,	160,	300,	null,	null],
+        [130,	"전역",	1630,	0,	null,	43,	49,	15,	0,	160,	300,	null,	null],
+        [ 75,	"전예",	1631,	0,	null,	50,	24,	61,	0,	160,	300,	null,	null],
+        [ 64,	"전해",	1632,	0,	null,	47,	49,	22,	0,	160,	300,	null,	null],
+        [123,	"정봉2",	1633,	0,	null,	45,	52,	20,	0,	160,	300,	null,	null],
+        [ 22,	"정의",	1634,	0,	null,	15,	4,	66,	0,	160,	300,	null,	null],
+        [ 81,	"제갈교",	1635,	0,	null,	41,	9,	58,	0,	160,	300,	null,	null],
+        [ 40,	"제갈서",	1636,	0,	null,	38,	37,	12,	0,	160,	300,	null,	null],
+        [ 25,	"조충",	1637,	0,	null,	12,	5,	80,	0,	160,	300,	null,	null],
+        [121,	"종리목",	1638,	0,	null,	51,	26,	57,	0,	160,	300,	null,	null],
+        [ 22,	"종육",	1639,	0,	null,	26,	7,	71,	0,	160,	300,	null,	null],
+        [122,	"좌혁",	1640,	0,	null,	43,	51,	20,	0,	160,	300,	null,	null],
+        [ 36,	"주령",	1641,	0,	null,	49,	54,	26,	0,	160,	300,	null,	null],
+        [115,	"주앙",	1642,	0,	null,	48,	24,	24,	0,	160,	300,	null,	null],
+        [ 52,	"주포",	1643,	0,	null,	43,	55,	7,	0,	160,	300,	null,	null],
+        [ 11,	"주흔",	1644,	0,	null,	45,	21,	58,	0,	160,	300,	null,	null],
+        [140,	"진기",	1645,	0,	null,	42,	52,	18,	0,	160,	300,	null,	null],
+        [142,	"진란",	1646,	0,	null,	45,	54,	17,	0,	160,	300,	null,	null],
+        [ 25,	"진랑",	1647,	0,	null,	42,	54,	16,	0,	160,	300,	null,	null],
+        [ 12,	"진응",	1648,	0,	null,	44,	53,	19,	0,	160,	300,	null,	null],
+        [124,	"진표",	1649,	0,	null,	44,	19,	56,	0,	160,	300,	null,	null],
+        [999,	"채염",	1650,	0,	null,	36,	10,	50,	0,	160,	300,	null,	null],
+        [999,	"초선",	1651,	0,	null,	45,	8,	55,	0,	160,	300,	null,	null],
+        [135,	"초이",	1652,	0,	null,	41,	51,	21,	0,	160,	300,	null,	null],
+        [ 65,	"추단",	1653,	0,	null,	44,	54,	15,	0,	160,	300,	null,	null],
+        [999,	"추씨",	1654,	0,	null,	35,	7,	54,	0,	160,	300,	null,	null],
+        [ 71,	"추정",	1655,	0,	null,	45,	25,	51,	0,	160,	300,	null,	null],
+        [145,	"파재",	1656,	0,	null,	46,	57,	20,	0,	160,	300,	null,	null],
+        [ 22,	"포신",	1657,	0,	null,	49,	23,	61,	0,	160,	300,	null,	null],
+        [114,	"하식",	1658,	0,	null,	16,	38,	13,	0,	160,	300,	null,	null],
+        [ 36,	"하안",	1659,	0,	null,	3,	12,	72,	0,	160,	300,	null,	null],
+        [999,	"하후씨",	1660,	0,	null,	28,	8,	47,	0,	160,	300,	null,	null],
+        [  5,	"학맹",	1661,	0,	null,	42,	51,	17,	0,	160,	300,	null,	null],
+        [ 98,	"한거자",	1662,	0,	null,	41,	47,	13,	0,	160,	300,	null,	null],
+        [ 19,	"한덕",	1663,	0,	null,	44,	59,	11,	0,	160,	300,	null,	null],
+        [140,	"한윤",	1664,	0,	null,	26,	11,	68,	0,	160,	300,	null,	null],
+        [999,	"허소",	1665,	0,	null,	41,	12,	48,	0,	160,	300,	null,	null],
+        [ 30,	"호열",	1666,	0,	null,	49,	26,	57,	0,	160,	300,	null,	null],
+        [ 76,	"호제",	1667,	0,	null,	42,	17,	52,	0,	160,	300,	null,	null],
+        [149,	"호진",	1668,	0,	null,	45,	58,	7,	0,	160,	300,	null,	null],
+        [ 29,	"호질",	1669,	0,	null,	47,	20,	57,	0,	160,	300,	null,	null],
+        [  7,	"환계",	1670,	0,	null,	9,	11,	67,	0,	160,	300,	null,	null],
+        [ 56,	"황숭",	1671,	0,	null,	46,	24,	56,	0,	160,	300,	null,	null],
+        [999,	"황승언",	1672,	0,	null,	46,	9,	60,	0,	160,	300,	null,	null],
+        [999,	"황월영",	1673,	0,	null,	42,	8,	57,	0,	160,	300,	null,	null],
+        [ 45,	"황조",	1674,	0,	null,	48,	51,	22,	0,	160,	300,	null,	null],
+        [ 48,	"후선",	1675,	0,	null,	42,	51,	15,	0,	160,	300,	null,	null],
+        [  8,	"휴고",	1676,	0,	null,	43,	55,	16,	0,	160,	300,	null,	null],
+        [ 98,	"휴원진",	1677,	0,	null,	41,	49,	16,	0,	160,	300,	null,	null],
+        [ 22,	"희지재",	1678,	0,	null,	23,	5,	86,	0,	160,	300,	null,	null]
     ],
     "cities":[
 

From 598943eb1b9f2e636c6a885ed638ab12f4dca3c9 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 22:43:46 +0900
Subject: [PATCH 117/184] =?UTF-8?q?=EB=B0=A9=EB=9E=91=EA=B5=B0=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=EC=97=90=EC=84=9C=20=EC=84=B8=EB=A0=A5=20=EB=8F=84?=
 =?UTF-8?q?=EC=8B=9C=20=ED=81=B4=EB=A6=AD=20=EB=B6=88=EA=B0=80.=20?=
 =?UTF-8?q?=EC=9D=B8=EC=82=AC=EB=B6=80=20=EA=B0=80=EB=8A=A5.=20=EC=84=A4?=
 =?UTF-8?q?=EC=B9=98=EC=8B=9C=20=EC=9A=B4=EC=98=81=EC=9E=90=20=EC=82=AD?=
 =?UTF-8?q?=ED=84=B4=20=EC=8B=9C=EB=82=98=EB=A6=AC=EC=98=A4=2029=20?=
 =?UTF-8?q?=EC=9E=AC=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=A7=80=EB=8F=84?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=9C=A0?=
 =?UTF-8?q?=EC=A0=80=20=EA=B2=80=EC=82=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_map.php                |   19 +-
 hwe/j_install.php               |    2 +-
 hwe/scenario/scenario_29.json   | 1334 +++++++++++++++----------------
 hwe/templates/commandButton.php |    4 +-
 4 files changed, 682 insertions(+), 677 deletions(-)

diff --git a/hwe/func_map.php b/hwe/func_map.php
index 51a1afc0..73dc37e6 100644
--- a/hwe/func_map.php
+++ b/hwe/func_map.php
@@ -51,7 +51,7 @@ function getWorldMap($req){
     }
 
     $session = Session::getInstance();
-    $generalID = $session->generalID;
+    $userID = $session->userID;
 
     $db = DB::db();
 
@@ -60,13 +60,18 @@ function getWorldMap($req){
     $year = Util::toInt($game['year']);
     $month = Util::toInt($game['month']);
 
-    if($generalID && ($req->showMe || !$req->neutralView)){
-        $city = $db->queryFirstRow(
-                'select `city`, `nation` from `general` where `no`=%i',
-                 $generalID);
+    $general = $db->queryFirstRow(
+        'select `no`, `city`, `nation` from `general` where `owner`=%i',
+         $userID);
 
-        $myCity = Util::toInt($city['city']);
-        $myNation = Util::toInt($city['nation']);
+
+    if($general && ($req->showMe || !$req->neutralView)){
+        if($session->generalID !== $general['no']){
+            $session->logoutGame()->loginGame();
+        }
+
+        $myCity = Util::toInt($general['city']);
+        $myNation = Util::toInt($general['nation']);
 
         if(!$req->showMe){
             $myCity = null;
diff --git a/hwe/j_install.php b/hwe/j_install.php
index b8013b90..28349223 100644
--- a/hwe/j_install.php
+++ b/hwe/j_install.php
@@ -194,7 +194,7 @@ foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM membe
         'picture'=>$admin['picture'],
         'imgsvr'=>$admin['imgsvr'],
         'turntime'=>$turntime,
-        'killturn'=>null
+        'killturn'=>9999
     ]);
 }
 
diff --git a/hwe/scenario/scenario_29.json b/hwe/scenario/scenario_29.json
index b0919dc0..da1f7765 100644
--- a/hwe/scenario/scenario_29.json
+++ b/hwe/scenario/scenario_29.json
@@ -7,686 +7,686 @@
     "diplomacy":[
     ],
     "general":[
-		[  1,	"소제1",	1001,	0,	null,	18,	7,	48,	0,	160,	300,	"유지",	null],
-        [  1,	"헌제",	1002,	0,	null,	15,	7,	61,	0,	160,	300,	"안전",	null],
-        [999,	"사마휘",	1003,	0,	null,	47,	7,	69,	0,	160,	300,	"은둔",	"신산",	"좋지, 좋아"],
-        [999,	"우길",	1004,	0,	null,	15,	7,	83,	0,	160,	300,	"은둔",	"신산"],
+        [  1,	"소제1",	1001,	0,	null,	18,	7,	48,	0,	160,	300,	"유지",	null],	
+        [  1,	"헌제",	1002,	0,	null,	15,	7,	61,	0,	160,	300,	"안전",	null],	
+        [999,	"사마휘",	1003,	0,	null,	47,	7,	69,	0,	160,	300,	"은둔",	"신산",	"좋지, 좋아~"],
+        [999,	"우길",	1004,	0,	null,	15,	7,	69,	0,	160,	300,	"은둔",	"신산"],	
         [999,	"화타",	1005,	0,	null,	41,	11,	54,	0,	160,	300,	"은둔",	"의술",	"아픈 사람들은 모두 내게 오시오. 껄껄껄."],
-        [999,	"길평",	1006,	0,	null,	26,	8,	72,	0,	160,	300,	"은둔",	"의술"],
-        [ 29,	"가규",	1007,	0,	null,	41,	21,	56,	0,	160,	300,	"재간",	null],
-        [136,	"가범",	1008,	0,	null,	42,	19,	55,	0,	160,	300,	"유지",	null],
-        [ 49,	"가비능",	1009,	0,	null,	42,	61,	14,	0,	160,	300,	"정복",	null],
-        [ 31,	"가충",	1010,	0,	null,	40,	11,	64,	0,	160,	300,	"출세",	null],
-        [ 20,	"가후",	1011,	0,	null,	46,	13,	68,	0,	160,	300,	"할거",	"귀병"],
-        [ 73,	"간옹",	1012,	0,	null,	30,	14,	70,	0,	160,	300,	"안전",	"경작"],
-        [129,	"감녕",	1013,	0,	null,	49,	69,	27,	0,	160,	300,	"출세",	"무쌍"],
-        [127,	"감택",	1014,	0,	null,	44,	18,	59,	0,	160,	300,	"유지",	null],
-        [ 60,	"강단",	1015,	0,	null,	37,	73,	17,	0,	160,	300,	"재간",	null],
+        [999,	"길평",	1006,	0,	null,	26,	8,	67,	0,	160,	300,	"은둔",	"의술"],	
+        [ 29,	"가규",	1007,	0,	null,	41,	21,	56,	0,	160,	300,	"재간",	null],	
+        [136,	"가범",	1008,	0,	null,	42,	19,	55,	0,	160,	300,	"유지",	null],	
+        [ 49,	"가비능",	1009,	0,	null,	42,	61,	14,	0,	160,	300,	"정복",	null],	
+        [ 31,	"가충",	1010,	0,	null,	40,	11,	64,	0,	160,	300,	"출세",	null],	
+        [ 20,	"가후",	1011,	0,	null,	46,	13,	68,	0,	160,	300,	"할거",	"귀병"],	
+        [ 73,	"간옹",	1012,	0,	null,	30,	14,	67,	0,	160,	300,	"안전",	"경작"],	
+        [129,	"감녕",	1013,	0,	null,	49,	69,	27,	0,	160,	300,	"출세",	"무쌍"],	
+        [127,	"감택",	1014,	0,	null,	44,	18,	59,	0,	160,	300,	"유지",	null],	
+        [ 60,	"강단",	1015,	0,	null,	37,	67,	17,	0,	160,	300,	"재간",	null],	
         [ 73,	"강유",	1016,	0,	null,	55,	33,	68,	0,	160,	300,	"왕좌",	"집중",	"갈고 닦은 무예와 승상께 배운 책략을 발휘해 보이겠다!"],
-        [102,	"고간",	1017,	0,	null,	43,	46,	20,	0,	160,	300,	"유지",	null],
-        [ 27,	"고람",	1018,	0,	null,	47,	52,	23,	0,	160,	300,	"출세",	"기병"],
-        [ 69,	"고상",	1019,	0,	null,	37,	40,	16,	0,	160,	300,	"재간",	null],
-        [144,	"고순",	1020,	0,	null,	49,	61,	25,	0,	160,	300,	"의협",	"기병"],
-        [  7,	"고승",	1021,	0,	null,	37,	73,	11,	0,	160,	300,	"출세",	null],
-        [120,	"고옹",	1022,	0,	null,	42,	10,	59,	0,	160,	300,	"출세",	null],
-        [ 63,	"고정",	1023,	0,	null,	45,	51,	21,	0,	160,	300,	"정복",	null],
-        [ 53,	"고패",	1024,	0,	null,	41,	45,	12,	0,	160,	300,	"유지",	null],
-        [ 74,	"공도",	1025,	0,	null,	25,	73,	9,	0,	160,	300,	"재간",	null],
-        [142,	"공손강",	1026,	0,	null,	44,	55,	23,	0,	160,	300,	"정복",	null],
-        [142,	"공손공",	1027,	0,	null,	46,	17,	57,	0,	160,	300,	"정복",	null],
-        [142,	"공손도",	1028,	0,	null,	44,	55,	17,	0,	160,	300,	"정복",	"기병"],
-        [ 65,	"공손범",	1029,	0,	null,	43,	52,	23,	0,	160,	300,	"출세",	null],
-        [ 65,	"공손속",	1030,	0,	null,	43,	57,	17,	0,	160,	300,	"정복",	null],
-        [ 10,	"공손연",	1031,	0,	null,	48,	59,	24,	0,	160,	300,	"패권",	"돌격"],
-        [ 65,	"공손월",	1032,	0,	null,	39,	63,	18,	0,	160,	300,	"정복",	null],
-        [ 65,	"공손찬",	1033,	0,	null,	43,	64,	25,	0,	160,	300,	"패권",	"기병"],
-        [ 43,	"공융",	1034,	0,	null,	44,	19,	63,	0,	160,	300,	"왕좌",	"경작"],
-        [ 35,	"공주",	1035,	0,	null,	44,	15,	58,	0,	160,	300,	"재간",	null],
-        [ 83,	"공지",	1036,	0,	null,	42,	21,	50,	0,	160,	300,	"대의",	null],
-        [ 26,	"곽가",	1037,	0,	null,	39,	11,	99,	0,	160,	300,	"패권",	"귀모"],
-        [111,	"곽도",	1038,	0,	null,	44,	25,	60,	0,	160,	300,	"재간",	null],
-        [  2,	"곽사",	1039,	0,	null,	42,	52,	13,	0,	160,	300,	"패권",	null],
-        [ 80,	"곽유지",	1040,	0,	null,	35,	10,	71,	0,	160,	300,	"재간",	"상재"],
-        [ 67,	"곽익",	1041,	0,	null,	45,	23,	52,	0,	160,	300,	"재간",	null],
-        [ 67,	"곽준",	1042,	0,	null,	48,	26,	55,	0,	160,	300,	"출세",	null],
-        [ 27,	"곽혁",	1043,	0,	null,	36,	13,	80,	0,	160,	300,	"안전",	null],
-        [ 20,	"곽회",	1044,	0,	null,	49,	57,	27,	0,	160,	300,	"정복",	null],
-        [ 39,	"관구검",	1045,	0,	null,	47,	26,	58,	0,	160,	300,	"대의",	null],
-        [ 76,	"관색",	1046,	0,	null,	46,	63,	25,	0,	160,	300,	"의협",	"징병"],
+        [102,	"고간",	1017,	0,	null,	43,	46,	20,	0,	160,	300,	"유지",	null],	
+        [ 27,	"고람",	1018,	0,	null,	47,	52,	23,	0,	160,	300,	"출세",	"기병"],	
+        [ 69,	"고상",	1019,	0,	null,	37,	40,	16,	0,	160,	300,	"재간",	null],	
+        [144,	"고순",	1020,	0,	null,	49,	61,	25,	0,	160,	300,	"의협",	"기병"],	
+        [  7,	"고승",	1021,	0,	null,	37,	67,	11,	0,	160,	300,	"출세",	null],	
+        [120,	"고옹",	1022,	0,	null,	42,	10,	59,	0,	160,	300,	"출세",	null],	
+        [ 63,	"고정",	1023,	0,	null,	45,	51,	21,	0,	160,	300,	"정복",	null],	
+        [ 53,	"고패",	1024,	0,	null,	41,	45,	12,	0,	160,	300,	"유지",	null],	
+        [ 74,	"공도",	1025,	0,	null,	25,	67,	9,	0,	160,	300,	"재간",	null],	
+        [142,	"공손강",	1026,	0,	null,	44,	55,	23,	0,	160,	300,	"정복",	null],	
+        [142,	"공손공",	1027,	0,	null,	46,	17,	57,	0,	160,	300,	"정복",	null],	
+        [142,	"공손도",	1028,	0,	null,	44,	55,	17,	0,	160,	300,	"정복",	"기병"],	
+        [ 65,	"공손범",	1029,	0,	null,	43,	52,	23,	0,	160,	300,	"출세",	null],	
+        [ 65,	"공손속",	1030,	0,	null,	43,	57,	17,	0,	160,	300,	"정복",	null],	
+        [ 10,	"공손연",	1031,	0,	null,	48,	59,	24,	0,	160,	300,	"패권",	"돌격"],	
+        [ 65,	"공손월",	1032,	0,	null,	39,	63,	18,	0,	160,	300,	"정복",	null],	
+        [ 65,	"공손찬",	1033,	0,	null,	43,	64,	25,	0,	160,	300,	"패권",	"기병"],	
+        [ 43,	"공융",	1034,	0,	null,	44,	19,	63,	0,	160,	300,	"왕좌",	"경작"],	
+        [ 35,	"공주",	1035,	0,	null,	44,	15,	58,	0,	160,	300,	"재간",	null],	
+        [ 83,	"공지",	1036,	0,	null,	42,	21,	50,	0,	160,	300,	"대의",	null],	
+        [ 26,	"곽가",	1037,	0,	null,	39,	11,	70,	0,	160,	300,	"패권",	"귀모"],	
+        [111,	"곽도",	1038,	0,	null,	44,	25,	60,	0,	160,	300,	"재간",	null],	
+        [  2,	"곽사",	1039,	0,	null,	42,	52,	13,	0,	160,	300,	"패권",	null],	
+        [ 80,	"곽유지",	1040,	0,	null,	35,	10,	67,	0,	160,	300,	"재간",	"상재"],	
+        [ 67,	"곽익",	1041,	0,	null,	45,	23,	52,	0,	160,	300,	"재간",	null],	
+        [ 67,	"곽준",	1042,	0,	null,	48,	26,	55,	0,	160,	300,	"출세",	null],	
+        [ 27,	"곽혁",	1043,	0,	null,	36,	13,	68,	0,	160,	300,	"안전",	null],	
+        [ 20,	"곽회",	1044,	0,	null,	49,	57,	27,	0,	160,	300,	"정복",	null],	
+        [ 39,	"관구검",	1045,	0,	null,	47,	26,	58,	0,	160,	300,	"대의",	null],	
+        [ 76,	"관색",	1046,	0,	null,	46,	63,	25,	0,	160,	300,	"의협",	"징병"],	
         [ 76,	"관우",	1047,	0,	null,	55,	70,	30,	0,	160,	300,	"의협",	"위압",	"나의 청룡 언월도를 과연 막아낼 수 있겠소?"],
-        [ 76,	"관이",	1048,	0,	null,	39,	60,	22,	0,	160,	300,	"안전",	null],
-        [ 76,	"관통",	1049,	0,	null,	39,	63,	23,	0,	160,	300,	"대의",	null],
-        [ 76,	"관평",	1050,	0,	null,	49,	60,	26,	0,	160,	300,	"의협",	"보병"],
-        [  7,	"관해",	1051,	0,	null,	45,	66,	15,	0,	160,	300,	"출세",	null],
-        [ 76,	"관흥",	1052,	0,	null,	46,	62,	27,	0,	160,	300,	"의협",	"돌격"],
-        [ 40,	"괴량",	1053,	0,	null,	37,	12,	81,	0,	160,	300,	"안전",	"신중"],
-        [ 40,	"괴월",	1054,	0,	null,	25,	13,	84,	0,	160,	300,	"유지",	"귀병"],
-        [ 98,	"교모",	1055,	0,	null,	43,	22,	48,	0,	160,	300,	"안전",	null],
-        [ 98,	"교현",	1056,	0,	null,	40,	9,	48,	0,	160,	300,	"재간",	null],
-        [  6,	"구역거",	1057,	0,	null,	40,	55,	19,	0,	160,	300,	"안전",	null],
-        [ 80,	"극정",	1058,	0,	null,	36,	11,	75,	0,	160,	300,	"유지",	null],
-        [ 46,	"금선",	1059,	0,	null,	41,	41,	15,	0,	160,	300,	"할거",	null],
-        [ 62,	"금환삼결",	1060,	0,	null,	38,	76,	9,	0,	160,	300,	"출세",	null],
-        [141,	"기령",	1061,	0,	null,	48,	60,	14,	0,	160,	300,	"대의",	"무쌍"],
-        [122,	"낙통",	1062,	0,	null,	42,	18,	53,	0,	160,	300,	"유지",	null],
-        [124,	"노숙1",	1063,	0,	null,	53,	17,	68,	0,	160,	300,	"왕좌",	"상재"],
-        [ 75,	"노식",	1064,	0,	null,	53,	21,	60,	0,	160,	300,	"왕좌",	"징병"],
-        [ 59,	"뇌동",	1065,	0,	null,	46,	58,	18,	0,	160,	300,	"출세",	"궁병"],
-        [142,	"뇌박",	1066,	0,	null,	41,	44,	14,	0,	160,	300,	"유지",	null],
-        [127,	"능조",	1067,	0,	null,	45,	60,	18,	0,	160,	300,	"재간",	"공성"],
-        [127,	"능통",	1068,	0,	null,	47,	58,	22,	0,	160,	300,	"의협",	"궁병"],
-        [ 64,	"단경",	1069,	0,	null,	46,	23,	52,	0,	160,	300,	"정복",	null],
-        [132,	"담웅",	1070,	0,	null,	40,	58,	9,	0,	160,	300,	"출세",	null],
-        [ 99,	"답둔",	1071,	0,	null,	43,	54,	13,	0,	160,	300,	"유지",	null],
-        [132,	"당자",	1072,	0,	null,	43,	45,	18,	0,	160,	300,	"안전",	null],
-        [ 60,	"대래동주",	1073,	0,	null,	36,	65,	11,	0,	160,	300,	"안전",	null],
-        [ 82,	"도겸",	1074,	0,	null,	40,	14,	48,	0,	160,	300,	"할거",	"인덕"],
-        [120,	"도준",	1075,	0,	null,	44,	46,	20,	0,	160,	300,	"안전",	null],
-        [ 73,	"동궐",	1076,	0,	null,	45,	20,	57,	0,	160,	300,	"대의",	null],
-        [ 62,	"동다나",	1077,	0,	null,	40,	54,	12,	0,	160,	300,	"유지",	null],
-        [  2,	"동민",	1078,	0,	null,	40,	51,	19,	0,	160,	300,	"안전",	null],
-        [ 21,	"동소",	1079,	0,	null,	38,	18,	62,	0,	160,	300,	"패권",	null],
-        [127,	"동습",	1080,	0,	null,	41,	50,	14,	0,	160,	300,	"출세",	null],
-        [ 89,	"동승",	1081,	0,	null,	48,	51,	25,	0,	160,	300,	"왕좌",	null],
-        [ 78,	"동윤",	1082,	0,	null,	44,	12,	58,	0,	160,	300,	"왕좌",	null],
-        [  2,	"동탁",	1083,	0,	null,	52,	66,	21,	0,	160,	300,	"패권",	"기병"],
-        [ 66,	"동화",	1084,	0,	null,	39,	64,	21,	0,	160,	300,	"대의",	null],
-        [ 32,	"두예",	1085,	0,	null,	52,	30,	62,	0,	160,	300,	"정복",	null],
-        [  7,	"등무",	1086,	0,	null,	37,	74,	9,	0,	160,	300,	"정복",	null],
-        [ 41,	"등애",	1087,	0,	null,	54,	30,	67,	0,	160,	300,	"패권",	"신산"],
-        [116,	"등윤",	1088,	0,	null,	34,	17,	68,	0,	160,	300,	"안전",	null],
-        [ 73,	"등지",	1089,	0,	null,	48,	20,	60,	0,	160,	300,	"할거",	"경작"],
-        [ 41,	"등충",	1090,	0,	null,	43,	61,	21,	0,	160,	300,	"출세",	null],
-        [ 54,	"등현",	1091,	0,	null,	45,	23,	48,	0,	160,	300,	"출세",	null],
-        [ 29,	"마균",	1092,	0,	null,	33,	16,	80,	0,	160,	300,	"안전",	null],
-        [ 71,	"마대",	1093,	0,	null,	49,	59,	19,	0,	160,	300,	"대의",	"기병"],
-        [ 70,	"마등",	1094,	0,	null,	50,	64,	22,	0,	160,	300,	"왕좌",	"기병"],
-        [ 80,	"마속",	1095,	0,	null,	47,	24,	61,	0,	160,	300,	"패권",	"집중"],
-        [ 77,	"마량",	1096,	0,	null,	42,	11,	64,	0,	160,	300,	"왕좌",	null],
-        [ 48,	"마완",	1097,	0,	null,	39,	64,	12,	0,	160,	300,	"안전",	"기병"],
-        [ 19,	"마준",	1098,	0,	null,	38,	63,	24,	0,	160,	300,	"안전",	null],
-        [ 71,	"마철",	1099,	0,	null,	47,	48,	13,	0,	160,	300,	"대의",	"기병"],
+        [ 76,	"관이",	1048,	0,	null,	39,	60,	22,	0,	160,	300,	"안전",	null],	
+        [ 76,	"관통",	1049,	0,	null,	39,	63,	23,	0,	160,	300,	"대의",	null],	
+        [ 76,	"관평",	1050,	0,	null,	49,	60,	26,	0,	160,	300,	"의협",	"보병"],	
+        [  7,	"관해",	1051,	0,	null,	45,	66,	15,	0,	160,	300,	"출세",	null],	
+        [ 76,	"관흥",	1052,	0,	null,	46,	62,	27,	0,	160,	300,	"의협",	"돌격"],	
+        [ 40,	"괴량",	1053,	0,	null,	37,	12,	69,	0,	160,	300,	"안전",	"신중"],	
+        [ 40,	"괴월",	1054,	0,	null,	25,	13,	69,	0,	160,	300,	"유지",	"귀병"],	
+        [ 98,	"교모",	1055,	0,	null,	43,	22,	48,	0,	160,	300,	"안전",	null],	
+        [ 98,	"교현",	1056,	0,	null,	40,	9,	48,	0,	160,	300,	"재간",	null],	
+        [  6,	"구역거",	1057,	0,	null,	40,	55,	19,	0,	160,	300,	"안전",	null],	
+        [ 80,	"극정",	1058,	0,	null,	36,	11,	68,	0,	160,	300,	"유지",	null],	
+        [ 46,	"금선",	1059,	0,	null,	41,	41,	15,	0,	160,	300,	"할거",	null],	
+        [ 62,	"금환삼결",	1060,	0,	null,	38,	68,	9,	0,	160,	300,	"출세",	null],	
+        [141,	"기령",	1061,	0,	null,	48,	60,	14,	0,	160,	300,	"대의",	"무쌍"],	
+        [122,	"낙통",	1062,	0,	null,	42,	18,	53,	0,	160,	300,	"유지",	null],	
+        [124,	"노숙1",	1063,	0,	null,	53,	17,	68,	0,	160,	300,	"왕좌",	"상재"],	
+        [ 75,	"노식",	1064,	0,	null,	53,	21,	60,	0,	160,	300,	"왕좌",	"징병"],	
+        [ 59,	"뇌동",	1065,	0,	null,	46,	58,	18,	0,	160,	300,	"출세",	"궁병"],	
+        [142,	"뇌박",	1066,	0,	null,	41,	44,	14,	0,	160,	300,	"유지",	null],	
+        [127,	"능조",	1067,	0,	null,	45,	60,	18,	0,	160,	300,	"재간",	"공성"],	
+        [127,	"능통",	1068,	0,	null,	47,	58,	22,	0,	160,	300,	"의협",	"궁병"],	
+        [ 64,	"단경",	1069,	0,	null,	46,	23,	52,	0,	160,	300,	"정복",	null],	
+        [132,	"담웅",	1070,	0,	null,	40,	58,	9,	0,	160,	300,	"출세",	null],	
+        [ 99,	"답둔",	1071,	0,	null,	43,	54,	13,	0,	160,	300,	"유지",	null],	
+        [132,	"당자",	1072,	0,	null,	43,	45,	18,	0,	160,	300,	"안전",	null],	
+        [ 60,	"대래동주",	1073,	0,	null,	36,	65,	11,	0,	160,	300,	"안전",	null],	
+        [ 82,	"도겸",	1074,	0,	null,	40,	14,	48,	0,	160,	300,	"할거",	"인덕"],	
+        [120,	"도준",	1075,	0,	null,	44,	46,	20,	0,	160,	300,	"안전",	null],	
+        [ 73,	"동궐",	1076,	0,	null,	45,	20,	57,	0,	160,	300,	"대의",	null],	
+        [ 62,	"동다나",	1077,	0,	null,	40,	54,	12,	0,	160,	300,	"유지",	null],	
+        [  2,	"동민",	1078,	0,	null,	40,	51,	19,	0,	160,	300,	"안전",	null],	
+        [ 21,	"동소",	1079,	0,	null,	38,	18,	62,	0,	160,	300,	"패권",	null],	
+        [127,	"동습",	1080,	0,	null,	41,	50,	14,	0,	160,	300,	"출세",	null],	
+        [ 89,	"동승",	1081,	0,	null,	48,	51,	25,	0,	160,	300,	"왕좌",	null],	
+        [ 78,	"동윤",	1082,	0,	null,	44,	12,	58,	0,	160,	300,	"왕좌",	null],	
+        [  2,	"동탁",	1083,	0,	null,	52,	66,	21,	0,	160,	300,	"패권",	"기병"],	
+        [ 66,	"동화",	1084,	0,	null,	39,	64,	21,	0,	160,	300,	"대의",	null],	
+        [ 32,	"두예",	1085,	0,	null,	52,	30,	62,	0,	160,	300,	"정복",	null],	
+        [  7,	"등무",	1086,	0,	null,	37,	68,	9,	0,	160,	300,	"정복",	null],	
+        [ 41,	"등애",	1087,	0,	null,	54,	30,	67,	0,	160,	300,	"패권",	"신산"],	
+        [116,	"등윤",	1088,	0,	null,	34,	17,	66,	0,	160,	300,	"안전",	null],	
+        [ 73,	"등지",	1089,	0,	null,	48,	20,	60,	0,	160,	300,	"할거",	"경작"],	
+        [ 41,	"등충",	1090,	0,	null,	43,	61,	21,	0,	160,	300,	"출세",	null],	
+        [ 54,	"등현",	1091,	0,	null,	45,	23,	48,	0,	160,	300,	"출세",	null],	
+        [ 29,	"마균",	1092,	0,	null,	33,	16,	68,	0,	160,	300,	"안전",	null],	
+        [ 71,	"마대",	1093,	0,	null,	49,	59,	19,	0,	160,	300,	"대의",	"기병"],	
+        [ 70,	"마등",	1094,	0,	null,	50,	64,	22,	0,	160,	300,	"왕좌",	"기병"],	
+        [ 80,	"마속",	1095,	0,	null,	47,	24,	61,	0,	160,	300,	"패권",	"집중"],	
+        [ 77,	"마량",	1096,	0,	null,	42,	11,	64,	0,	160,	300,	"왕좌",	null],	
+        [ 48,	"마완",	1097,	0,	null,	39,	64,	12,	0,	160,	300,	"안전",	"기병"],	
+        [ 19,	"마준",	1098,	0,	null,	38,	63,	24,	0,	160,	300,	"안전",	null],	
+        [ 71,	"마철",	1099,	0,	null,	47,	48,	13,	0,	160,	300,	"대의",	"기병"],	
         [ 70,	"마초",	1100,	0,	null,	49,	70,	16,	0,	160,	300,	"대의",	"기병",	"금마초 나가신닷!"],
-        [131,	"마충1",	1101,	0,	null,	45,	49,	20,	0,	160,	300,	"재간",	null],
-        [ 69,	"마충2",	1102,	0,	null,	43,	52,	20,	0,	160,	300,	"출세",	null],
-        [ 71,	"마휴",	1103,	0,	null,	47,	48,	14,	0,	160,	300,	"대의",	"기병"],
-        [116,	"만총",	1104,	0,	null,	49,	16,	58,	0,	160,	300,	"할거",	"신중"],
-        [ 51,	"망아장",	1105,	0,	null,	28,	64,	10,	0,	160,	300,	"출세",	null],
-        [ 44,	"맹달",	1106,	0,	null,	46,	25,	55,	0,	160,	300,	"할거",	"귀병"],
-        [ 60,	"맹우",	1107,	0,	null,	44,	59,	12,	0,	160,	300,	"정복",	null],
-        [ 60,	"맹획",	1108,	0,	null,	49,	67,	20,	0,	160,	300,	"왕좌",	"격노"],
-        [ 29,	"모개",	1109,	0,	null,	38,	56,	22,	0,	160,	300,	"대의",	null],
-        [ 51,	"목록대왕",	1110,	0,	null,	42,	54,	25,	0,	160,	300,	"재간",	"척사"],
-        [ 96,	"목순",	1111,	0,	null,	15,	10,	68,	0,	160,	300,	"왕좌",	null],
-        [ 43,	"무안국",	1112,	0,	null,	40,	55,	9,	0,	160,	300,	"재간",	null],
-        [ 28,	"문빙",	1113,	0,	null,	46,	58,	17,	0,	160,	300,	"유지",	null],
-        [ 38,	"문앙",	1114,	0,	null,	47,	66,	18,	0,	160,	300,	"대의",	null],
-        [102,	"문추",	1115,	0,	null,	47,	68,	11,	0,	160,	300,	"출세",	"무쌍"],
-        [ 38,	"문흠",	1116,	0,	null,	48,	58,	17,	0,	160,	300,	"대의",	null],
-        [ 49,	"미당대왕",	1117,	0,	null,	44,	57,	14,	0,	160,	300,	"유지",	null],
-        [108,	"미방",	1118,	0,	null,	42,	51,	15,	0,	160,	300,	"패권",	"징병"],
-        [ 77,	"미축",	1119,	0,	null,	25,	13,	65,	0,	160,	300,	"왕좌",	"상재"],
-        [ 94,	"반봉",	1120,	0,	null,	43,	57,	9,	0,	160,	300,	"출세",	null],
-        [ 44,	"반준",	1121,	0,	null,	37,	10,	67,	0,	160,	300,	"안전",	null],
-        [ 65,	"방덕",	1122,	0,	null,	48,	66,	25,	0,	160,	300,	"의협",	"기병"],
-        [ 73,	"방통",	1123,	0,	null,	52,	17,	70,	0,	160,	300,	"패권",	"반계"],
-        [ 65,	"방회",	1124,	0,	null,	24,	14,	59,	0,	160,	300,	"안전",	null],
-        [ 68,	"배원소",	1125,	0,	null,	38,	69,	14,	0,	160,	300,	"재간",	null],
-        [ 78,	"번건",	1126,	0,	null,	27,	13,	68,	0,	160,	300,	"대의",	null],
-        [149,	"번주",	1127,	0,	null,	45,	58,	10,	0,	160,	300,	"할거",	null],
-        [ 72,	"법정",	1128,	0,	null,	50,	13,	67,	0,	160,	300,	"패권",	"신산"],
-        [  8,	"변희",	1129,	0,	null,	45,	51,	12,	0,	160,	300,	"안전",	null],
-        [121,	"보질",	1130,	0,	null,	42,	12,	58,	0,	160,	300,	"유지",	null],
-        [113,	"복양흥",	1131,	0,	null,	42,	20,	54,	0,	160,	300,	"유지",	null],
-        [110,	"봉기",	1132,	0,	null,	46,	20,	60,	0,	160,	300,	"패권",	"집중"],
-        [ 74,	"부동",	1133,	0,	null,	42,	26,	26,	0,	160,	300,	"대의",	null],
-        [108,	"부사인",	1134,	0,	null,	41,	47,	20,	0,	160,	300,	"출세",	null],
-        [ 38,	"부손",	1135,	0,	null,	23,	17,	68,	0,	160,	300,	"안전",	null],
-        [ 74,	"부첨",	1136,	0,	null,	43,	56,	18,	0,	160,	300,	"대의",	null],
-        [ 66,	"비시",	1137,	0,	null,	16,	15,	61,	0,	160,	300,	"재간",	null],
-        [141,	"비연",	1138,	0,	null,	45,	51,	21,	0,	160,	300,	"출세",	null],
-        [ 77,	"비위",	1139,	0,	null,	47,	12,	55,	0,	160,	300,	"대의",	null],
-        [144,	"사광",	1140,	0,	null,	42,	19,	51,	0,	160,	300,	"안전",	null],
-        [ 71,	"사마가",	1141,	0,	null,	43,	63,	9,	0,	160,	300,	"정복",	"돌격"],
-        [ 20,	"사마랑",	1142,	0,	null,	24,	14,	63,	0,	160,	300,	"대의",	null],
-        [ 24,	"사마망",	1143,	0,	null,	47,	23,	51,	0,	160,	300,	"정복",	null],
-        [ 24,	"사마부",	1144,	0,	null,	41,	13,	55,	0,	160,	300,	"대의",	null],
-        [ 31,	"사마사",	1145,	0,	null,	52,	24,	66,	0,	160,	300,	"정복",	null],
-        [ 31,	"사마소",	1146,	0,	null,	54,	24,	62,	0,	160,	300,	"정복",	null],
-        [ 31,	"사마염",	1147,	0,	null,	54,	58,	27,	0,	160,	300,	"패권",	null],
-        [ 30,	"사마유",	1148,	0,	null,	44,	18,	59,	0,	160,	300,	"왕좌",	null],
-        [ 31,	"사마의",	1149,	0,	null,	56,	25,	70,	0,	160,	300,	"패권",	"반계"],
-        [139,	"사섭",	1150,	0,	null,	44,	23,	54,	0,	160,	300,	"안전",	null],
-        [139,	"사일",	1151,	0,	null,	43,	18,	52,	0,	160,	300,	"유지",	null],
-        [132,	"사정",	1152,	0,	null,	45,	54,	10,	0,	160,	300,	"안전",	null],
-        [146,	"사지",	1153,	0,	null,	43,	19,	54,	0,	160,	300,	"안전",	null],
-        [144,	"사휘",	1154,	0,	null,	45,	54,	23,	0,	160,	300,	"유지",	null],
-        [ 35,	"서막",	1155,	0,	null,	42,	17,	55,	0,	160,	300,	"유지",	null],
-        [ 76,	"서서",	1156,	0,	null,	53,	26,	69,	0,	160,	300,	"의협",	"귀병"],
-        [124,	"서성",	1157,	0,	null,	51,	28,	61,	0,	160,	300,	"대의",	null],
-        [142,	"서영",	1158,	0,	null,	39,	63,	14,	0,	160,	300,	"안전",	null],
-        [ 23,	"서질",	1159,	0,	null,	41,	55,	14,	0,	160,	300,	"재간",	null],
-        [ 23,	"서황",	1160,	0,	null,	49,	65,	26,	0,	160,	300,	"의협",	"필살"],
-        [ 32,	"석포",	1161,	0,	null,	47,	49,	23,	0,	160,	300,	"정복",	null],
-        [131,	"설영",	1162,	0,	null,	38,	11,	64,	0,	160,	300,	"유지",	null],
-        [128,	"설종",	1163,	0,	null,	26,	14,	67,	0,	160,	300,	"유지",	null],
-        [ 69,	"성의",	1164,	0,	null,	38,	64,	10,	0,	160,	300,	"재간",	null],
-        [129,	"소비",	1165,	0,	null,	45,	49,	19,	0,	160,	300,	"대의",	null],
-        [ 76,	"손건",	1166,	0,	null,	37,	14,	73,	0,	160,	300,	"대의",	"거상"],
-        [125,	"손견",	1167,	0,	null,	55,	69,	28,	0,	160,	300,	"왕좌",	"무쌍"],
-        [126,	"손광",	1168,	0,	null,	44,	21,	46,	0,	160,	300,	"유지",	null],
-        [125,	"손권",	1169,	0,	null,	53,	29,	61,	0,	160,	300,	"할거",	"수비"],
-        [126,	"손랑",	1170,	0,	null,	26,	54,	12,	0,	160,	300,	"안전",	null],
-        [126,	"손등",	1171,	0,	null,	40,	16,	58,	0,	160,	300,	"할거",	null],
-        [125,	"손량",	1172,	0,	null,	23,	11,	79,	0,	160,	300,	"할거",	null],
-        [ 20,	"손례",	1173,	0,	null,	44,	24,	53,	0,	160,	300,	"안전",	null],
-        [124,	"손소",	1174,	0,	null,	48,	60,	26,	0,	160,	300,	"정복",	null],
-        [130,	"손수",	1175,	0,	null,	45,	22,	47,	0,	160,	300,	"안전",	null],
-        [126,	"손유",	1176,	0,	null,	49,	23,	52,	0,	160,	300,	"정복",	null],
-        [122,	"손이",	1177,	0,	null,	42,	49,	22,	0,	160,	300,	"안전",	null],
-        [126,	"손정",	1178,	0,	null,	43,	22,	49,	0,	160,	300,	"유지",	null],
-        [115,	"손준",	1179,	0,	null,	43,	53,	20,	0,	160,	300,	"정복",	null],
-        [  7,	"손중",	1180,	0,	null,	41,	49,	11,	0,	160,	300,	"안전",	null],
+        [131,	"마충1",	1101,	0,	null,	45,	49,	20,	0,	160,	300,	"재간",	null],	
+        [ 69,	"마충2",	1102,	0,	null,	43,	52,	20,	0,	160,	300,	"출세",	null],	
+        [ 71,	"마휴",	1103,	0,	null,	47,	48,	14,	0,	160,	300,	"대의",	"기병"],	
+        [116,	"만총",	1104,	0,	null,	49,	16,	58,	0,	160,	300,	"할거",	"신중"],	
+        [ 51,	"망아장",	1105,	0,	null,	28,	64,	10,	0,	160,	300,	"출세",	null],	
+        [ 44,	"맹달",	1106,	0,	null,	46,	25,	55,	0,	160,	300,	"할거",	"귀병"],	
+        [ 60,	"맹우",	1107,	0,	null,	44,	59,	12,	0,	160,	300,	"정복",	null],	
+        [ 60,	"맹획",	1108,	0,	null,	49,	67,	20,	0,	160,	300,	"왕좌",	"격노"],	
+        [ 29,	"모개",	1109,	0,	null,	38,	56,	22,	0,	160,	300,	"대의",	null],	
+        [ 51,	"목록대왕",	1110,	0,	null,	42,	54,	25,	0,	160,	300,	"재간",	"척사"],	
+        [ 96,	"목순",	1111,	0,	null,	15,	10,	66,	0,	160,	300,	"왕좌",	null],	
+        [ 43,	"무안국",	1112,	0,	null,	40,	55,	9,	0,	160,	300,	"재간",	null],	
+        [ 28,	"문빙",	1113,	0,	null,	46,	58,	17,	0,	160,	300,	"유지",	null],	
+        [ 38,	"문앙",	1114,	0,	null,	47,	66,	18,	0,	160,	300,	"대의",	null],	
+        [102,	"문추",	1115,	0,	null,	47,	68,	11,	0,	160,	300,	"출세",	"무쌍"],	
+        [ 38,	"문흠",	1116,	0,	null,	48,	58,	17,	0,	160,	300,	"대의",	null],	
+        [ 49,	"미당대왕",	1117,	0,	null,	44,	57,	14,	0,	160,	300,	"유지",	null],	
+        [108,	"미방",	1118,	0,	null,	42,	51,	15,	0,	160,	300,	"패권",	"징병"],	
+        [ 77,	"미축",	1119,	0,	null,	25,	13,	65,	0,	160,	300,	"왕좌",	"상재"],	
+        [ 94,	"반봉",	1120,	0,	null,	43,	57,	9,	0,	160,	300,	"출세",	null],	
+        [ 44,	"반준",	1121,	0,	null,	37,	10,	66,	0,	160,	300,	"안전",	null],	
+        [ 65,	"방덕",	1122,	0,	null,	48,	66,	25,	0,	160,	300,	"의협",	"기병"],	
+        [ 73,	"방통",	1123,	0,	null,	52,	17,	70,	0,	160,	300,	"패권",	"반계"],	
+        [ 65,	"방회",	1124,	0,	null,	24,	14,	59,	0,	160,	300,	"안전",	null],	
+        [ 68,	"배원소",	1125,	0,	null,	38,	67,	14,	0,	160,	300,	"재간",	null],	
+        [ 78,	"번건",	1126,	0,	null,	27,	13,	66,	0,	160,	300,	"대의",	null],	
+        [149,	"번주",	1127,	0,	null,	45,	58,	10,	0,	160,	300,	"할거",	null],	
+        [ 72,	"법정",	1128,	0,	null,	50,	13,	67,	0,	160,	300,	"패권",	"신산"],	
+        [  8,	"변희",	1129,	0,	null,	45,	51,	12,	0,	160,	300,	"안전",	null],	
+        [121,	"보질",	1130,	0,	null,	42,	12,	58,	0,	160,	300,	"유지",	null],	
+        [113,	"복양흥",	1131,	0,	null,	42,	20,	54,	0,	160,	300,	"유지",	null],	
+        [110,	"봉기",	1132,	0,	null,	46,	20,	60,	0,	160,	300,	"패권",	"집중"],	
+        [ 74,	"부동",	1133,	0,	null,	42,	26,	26,	0,	160,	300,	"대의",	null],	
+        [108,	"부사인",	1134,	0,	null,	41,	47,	20,	0,	160,	300,	"출세",	null],	
+        [ 38,	"부손",	1135,	0,	null,	23,	17,	66,	0,	160,	300,	"안전",	null],	
+        [ 74,	"부첨",	1136,	0,	null,	43,	56,	18,	0,	160,	300,	"대의",	null],	
+        [ 66,	"비시",	1137,	0,	null,	16,	15,	61,	0,	160,	300,	"재간",	null],	
+        [141,	"비연",	1138,	0,	null,	45,	51,	21,	0,	160,	300,	"출세",	null],	
+        [ 77,	"비위",	1139,	0,	null,	47,	12,	55,	0,	160,	300,	"대의",	null],	
+        [144,	"사광",	1140,	0,	null,	42,	19,	51,	0,	160,	300,	"안전",	null],	
+        [ 71,	"사마가",	1141,	0,	null,	43,	63,	9,	0,	160,	300,	"정복",	"돌격"],	
+        [ 20,	"사마랑",	1142,	0,	null,	24,	14,	63,	0,	160,	300,	"대의",	null],	
+        [ 24,	"사마망",	1143,	0,	null,	47,	23,	51,	0,	160,	300,	"정복",	null],	
+        [ 24,	"사마부",	1144,	0,	null,	41,	13,	55,	0,	160,	300,	"대의",	null],	
+        [ 31,	"사마사",	1145,	0,	null,	52,	24,	66,	0,	160,	300,	"정복",	null],	
+        [ 31,	"사마소",	1146,	0,	null,	54,	24,	62,	0,	160,	300,	"정복",	null],	
+        [ 31,	"사마염",	1147,	0,	null,	54,	58,	27,	0,	160,	300,	"패권",	null],	
+        [ 30,	"사마유",	1148,	0,	null,	44,	18,	59,	0,	160,	300,	"왕좌",	null],	
+        [ 31,	"사마의",	1149,	0,	null,	56,	25,	70,	0,	160,	300,	"패권",	"반계"],	
+        [139,	"사섭",	1150,	0,	null,	44,	23,	54,	0,	160,	300,	"안전",	null],	
+        [139,	"사일",	1151,	0,	null,	43,	18,	52,	0,	160,	300,	"유지",	null],	
+        [132,	"사정",	1152,	0,	null,	45,	54,	10,	0,	160,	300,	"안전",	null],	
+        [146,	"사지",	1153,	0,	null,	43,	19,	54,	0,	160,	300,	"안전",	null],	
+        [144,	"사휘",	1154,	0,	null,	45,	54,	23,	0,	160,	300,	"유지",	null],	
+        [ 35,	"서막",	1155,	0,	null,	42,	17,	55,	0,	160,	300,	"유지",	null],	
+        [ 76,	"서서",	1156,	0,	null,	53,	26,	69,	0,	160,	300,	"의협",	"귀병"],	
+        [124,	"서성",	1157,	0,	null,	51,	28,	61,	0,	160,	300,	"대의",	null],	
+        [142,	"서영",	1158,	0,	null,	39,	63,	14,	0,	160,	300,	"안전",	null],	
+        [ 23,	"서질",	1159,	0,	null,	41,	55,	14,	0,	160,	300,	"재간",	null],	
+        [ 23,	"서황",	1160,	0,	null,	49,	65,	26,	0,	160,	300,	"의협",	"필살"],	
+        [ 32,	"석포",	1161,	0,	null,	47,	49,	23,	0,	160,	300,	"정복",	null],	
+        [131,	"설영",	1162,	0,	null,	38,	11,	64,	0,	160,	300,	"유지",	null],	
+        [128,	"설종",	1163,	0,	null,	26,	14,	66,	0,	160,	300,	"유지",	null],	
+        [ 69,	"성의",	1164,	0,	null,	38,	64,	10,	0,	160,	300,	"재간",	null],	
+        [129,	"소비",	1165,	0,	null,	45,	49,	19,	0,	160,	300,	"대의",	null],	
+        [ 76,	"손건",	1166,	0,	null,	37,	14,	67,	0,	160,	300,	"대의",	"거상"],	
+        [125,	"손견",	1167,	0,	null,	55,	69,	28,	0,	160,	300,	"왕좌",	"무쌍"],	
+        [126,	"손광",	1168,	0,	null,	44,	21,	46,	0,	160,	300,	"유지",	null],	
+        [125,	"손권",	1169,	0,	null,	53,	29,	61,	0,	160,	300,	"할거",	"수비"],	
+        [126,	"손랑",	1170,	0,	null,	26,	54,	12,	0,	160,	300,	"안전",	null],	
+        [126,	"손등",	1171,	0,	null,	40,	16,	58,	0,	160,	300,	"할거",	null],	
+        [125,	"손량",	1172,	0,	null,	23,	11,	68,	0,	160,	300,	"할거",	null],	
+        [ 20,	"손례",	1173,	0,	null,	44,	24,	53,	0,	160,	300,	"안전",	null],	
+        [124,	"손소",	1174,	0,	null,	48,	60,	26,	0,	160,	300,	"정복",	null],	
+        [130,	"손수",	1175,	0,	null,	45,	22,	47,	0,	160,	300,	"안전",	null],	
+        [126,	"손유",	1176,	0,	null,	49,	23,	52,	0,	160,	300,	"정복",	null],	
+        [122,	"손이",	1177,	0,	null,	42,	49,	22,	0,	160,	300,	"안전",	null],	
+        [126,	"손정",	1178,	0,	null,	43,	22,	49,	0,	160,	300,	"유지",	null],	
+        [115,	"손준",	1179,	0,	null,	43,	53,	20,	0,	160,	300,	"정복",	null],	
+        [  7,	"손중",	1180,	0,	null,	41,	49,	11,	0,	160,	300,	"안전",	null],	
         [125,	"손책",	1181,	0,	null,	55,	69,	29,	0,	160,	300,	"패권",	"필살",	"소패왕 손책이 나가신다! 길을 비켜라!"],
-        [115,	"손침",	1182,	0,	null,	39,	71,	16,	0,	160,	300,	"패권",	null],
-        [114,	"손호",	1183,	0,	null,	18,	78,	25,	0,	160,	300,	"패권",	null],
-        [126,	"손화",	1184,	0,	null,	35,	11,	71,	0,	160,	300,	"왕좌",	null],
-        [127,	"손환",	1185,	0,	null,	49,	25,	54,	0,	160,	300,	"정복",	null],
-        [126,	"손휴",	1186,	0,	null,	44,	17,	50,	0,	160,	300,	"정복",	null],
-        [117,	"손흠",	1187,	0,	null,	45,	49,	14,	0,	160,	300,	"정복",	null],
-        [147,	"송헌",	1188,	0,	null,	37,	63,	17,	0,	160,	300,	"안전",	null],
-        [ 95,	"순우경",	1189,	0,	null,	47,	52,	23,	0,	160,	300,	"할거",	null],
-        [ 22,	"순욱1",	1190,	0,	null,	41,	13,	70,	0,	160,	300,	"왕좌",	"집중"],
-        [ 22,	"순유",	1191,	0,	null,	47,	17,	66,	0,	160,	300,	"대의",	"신중"],
-        [ 29,	"신비",	1192,	0,	null,	39,	12,	74,	0,	160,	300,	"재간",	null],
-        [ 37,	"신의",	1193,	0,	null,	41,	48,	20,	0,	160,	300,	"출세",	null],
-        [ 37,	"신탐",	1194,	0,	null,	42,	46,	22,	0,	160,	300,	"출세",	null],
-        [ 85,	"신평",	1195,	0,	null,	46,	20,	57,	0,	160,	300,	"왕좌",	null],
-        [102,	"심배",	1196,	0,	null,	48,	25,	52,	0,	160,	300,	"패권",	"귀병"],
-        [126,	"심영",	1197,	0,	null,	41,	55,	20,	0,	160,	300,	"재간",	null],
-        [ 47,	"아하소과",	1198,	0,	null,	41,	57,	8,	0,	160,	300,	"안전",	"척사"],
-        [ 62,	"아회남",	1199,	0,	null,	40,	56,	13,	0,	160,	300,	"출세",	"척사"],
-        [ 23,	"악진",	1200,	0,	null,	47,	52,	22,	0,	160,	300,	"대의",	"돌격"],
-        [ 23,	"악침",	1201,	0,	null,	38,	52,	14,	0,	160,	300,	"대의",	null],
-        [ 63,	"악환",	1202,	0,	null,	41,	61,	21,	0,	160,	300,	"재간",	null],
-        [102,	"안량",	1203,	0,	null,	47,	67,	15,	0,	160,	300,	"출세",	"위압"],
-        [ 14,	"양백",	1204,	0,	null,	41,	44,	21,	0,	160,	300,	"안전",	null],
-        [ 92,	"양봉1",	1205,	0,	null,	42,	50,	15,	0,	160,	300,	"유지",	null],
-        [ 91,	"양봉2",	1206,	0,	null,	44,	58,	23,	0,	160,	300,	"정복",	null],
-        [ 13,	"양송",	1207,	0,	null,	13,	35,	14,	0,	160,	300,	"안전",	null],
-        [ 43,	"양수",	1208,	0,	null,	16,	13,	91,	0,	160,	300,	"재간",	"귀병"],
-        [ 61,	"양의",	1209,	0,	null,	45,	22,	54,	0,	160,	300,	"유지",	null],
-        [141,	"양조1",	1210,	0,	null,	46,	21,	48,	0,	160,	300,	"출세",	null],
-        [  9,	"양추1",	1211,	0,	null,	40,	52,	8,	0,	160,	300,	"정복",	null],
-        [ 31,	"양호",	1212,	0,	null,	53,	26,	60,	0,	160,	300,	"패권",	null],
-        [ 53,	"양회",	1213,	0,	null,	43,	52,	16,	0,	160,	300,	"출세",	null],
-        [141,	"양흥",	1214,	0,	null,	40,	52,	9,	0,	160,	300,	"안전",	null],
-        [  6,	"어부라",	1215,	0,	null,	49,	60,	23,	0,	160,	300,	"정복",	null],
-        [ 64,	"엄강",	1216,	0,	null,	42,	51,	18,	0,	160,	300,	"재간",	null],
-        [ 10,	"엄백호",	1217,	0,	null,	39,	68,	13,	0,	160,	300,	"할거",	null],
-        [ 10,	"엄여",	1218,	0,	null,	35,	66,	11,	0,	160,	300,	"할거",	null],
-        [ 69,	"엄안",	1219,	0,	null,	47,	62,	25,	0,	160,	300,	"왕좌",	null],
-        [  7,	"엄정",	1220,	0,	null,	30,	68,	19,	0,	160,	300,	"출세",	null],
-        [121,	"엄준",	1221,	0,	null,	38,	11,	71,	0,	160,	300,	"재간",	null],
-        [ 71,	"여개",	1222,	0,	null,	40,	17,	52,	0,	160,	300,	"유지",	null],
-        [ 29,	"여건",	1223,	0,	null,	38,	68,	13,	0,	160,	300,	"출세",	null],
-        [107,	"여광",	1224,	0,	null,	43,	52,	12,	0,	160,	300,	"유지",	null],
-        [124,	"여몽",	1225,	0,	null,	54,	29,	67,	0,	160,	300,	"패권",	"궁병"],
-        [123,	"여범",	1226,	0,	null,	37,	14,	71,	0,	160,	300,	"할거",	null],
-        [107,	"여상",	1227,	0,	null,	44,	52,	12,	0,	160,	300,	"유지",	null],
-        [105,	"여위황",	1228,	0,	null,	37,	62,	16,	0,	160,	300,	"정복",	null],
+        [115,	"손침",	1182,	0,	null,	39,	67,	16,	0,	160,	300,	"패권",	null],	
+        [114,	"손호",	1183,	0,	null,	18,	68,	25,	0,	160,	300,	"패권",	null],	
+        [126,	"손화",	1184,	0,	null,	35,	11,	67,	0,	160,	300,	"왕좌",	null],	
+        [127,	"손환",	1185,	0,	null,	49,	25,	54,	0,	160,	300,	"정복",	null],	
+        [126,	"손휴",	1186,	0,	null,	44,	17,	50,	0,	160,	300,	"정복",	null],	
+        [117,	"손흠",	1187,	0,	null,	45,	49,	14,	0,	160,	300,	"정복",	null],	
+        [147,	"송헌",	1188,	0,	null,	37,	63,	17,	0,	160,	300,	"안전",	null],	
+        [ 95,	"순우경",	1189,	0,	null,	47,	52,	23,	0,	160,	300,	"할거",	null],	
+        [ 22,	"순욱1",	1190,	0,	null,	41,	13,	70,	0,	160,	300,	"왕좌",	"집중"],	
+        [ 22,	"순유",	1191,	0,	null,	47,	17,	66,	0,	160,	300,	"대의",	"신중"],	
+        [ 29,	"신비",	1192,	0,	null,	39,	12,	68,	0,	160,	300,	"재간",	null],	
+        [ 37,	"신의",	1193,	0,	null,	41,	48,	20,	0,	160,	300,	"출세",	null],	
+        [ 37,	"신탐",	1194,	0,	null,	42,	46,	22,	0,	160,	300,	"출세",	null],	
+        [ 85,	"신평",	1195,	0,	null,	46,	20,	57,	0,	160,	300,	"왕좌",	null],	
+        [102,	"심배",	1196,	0,	null,	48,	25,	52,	0,	160,	300,	"패권",	"귀병"],	
+        [126,	"심영",	1197,	0,	null,	41,	55,	20,	0,	160,	300,	"재간",	null],	
+        [ 47,	"아하소과",	1198,	0,	null,	41,	57,	8,	0,	160,	300,	"안전",	"척사"],	
+        [ 62,	"아회남",	1199,	0,	null,	40,	56,	13,	0,	160,	300,	"출세",	"척사"],	
+        [ 23,	"악진",	1200,	0,	null,	47,	52,	22,	0,	160,	300,	"대의",	"돌격"],	
+        [ 23,	"악침",	1201,	0,	null,	38,	52,	14,	0,	160,	300,	"대의",	null],	
+        [ 63,	"악환",	1202,	0,	null,	41,	61,	21,	0,	160,	300,	"재간",	null],	
+        [102,	"안량",	1203,	0,	null,	47,	67,	15,	0,	160,	300,	"출세",	"위압"],	
+        [ 14,	"양백",	1204,	0,	null,	41,	44,	21,	0,	160,	300,	"안전",	null],	
+        [ 92,	"양봉1",	1205,	0,	null,	42,	50,	15,	0,	160,	300,	"유지",	null],	
+        [ 91,	"양봉2",	1206,	0,	null,	44,	58,	23,	0,	160,	300,	"정복",	null],	
+        [ 13,	"양송",	1207,	0,	null,	13,	35,	14,	0,	160,	300,	"안전",	null],	
+        [ 43,	"양수",	1208,	0,	null,	16,	13,	70,	0,	160,	300,	"재간",	"귀병"],	
+        [ 61,	"양의",	1209,	0,	null,	45,	22,	54,	0,	160,	300,	"유지",	null],	
+        [141,	"양조1",	1210,	0,	null,	46,	21,	48,	0,	160,	300,	"출세",	null],	
+        [  9,	"양추1",	1211,	0,	null,	40,	52,	8,	0,	160,	300,	"정복",	null],	
+        [ 31,	"양호",	1212,	0,	null,	53,	26,	60,	0,	160,	300,	"패권",	null],	
+        [ 53,	"양회",	1213,	0,	null,	43,	52,	16,	0,	160,	300,	"출세",	null],	
+        [141,	"양흥",	1214,	0,	null,	40,	52,	9,	0,	160,	300,	"안전",	null],	
+        [  6,	"어부라",	1215,	0,	null,	49,	60,	23,	0,	160,	300,	"정복",	null],	
+        [ 64,	"엄강",	1216,	0,	null,	42,	51,	18,	0,	160,	300,	"재간",	null],	
+        [ 10,	"엄백호",	1217,	0,	null,	39,	66,	13,	0,	160,	300,	"할거",	null],	
+        [ 10,	"엄여",	1218,	0,	null,	35,	66,	11,	0,	160,	300,	"할거",	null],	
+        [ 69,	"엄안",	1219,	0,	null,	47,	62,	25,	0,	160,	300,	"왕좌",	null],	
+        [  7,	"엄정",	1220,	0,	null,	30,	66,	19,	0,	160,	300,	"출세",	null],	
+        [121,	"엄준",	1221,	0,	null,	38,	11,	67,	0,	160,	300,	"재간",	null],	
+        [ 71,	"여개",	1222,	0,	null,	40,	17,	52,	0,	160,	300,	"유지",	null],	
+        [ 29,	"여건",	1223,	0,	null,	38,	66,	13,	0,	160,	300,	"출세",	null],	
+        [107,	"여광",	1224,	0,	null,	43,	52,	12,	0,	160,	300,	"유지",	null],	
+        [124,	"여몽",	1225,	0,	null,	54,	29,	67,	0,	160,	300,	"패권",	"궁병"],	
+        [123,	"여범",	1226,	0,	null,	37,	14,	67,	0,	160,	300,	"할거",	null],	
+        [107,	"여상",	1227,	0,	null,	44,	52,	12,	0,	160,	300,	"유지",	null],	
+        [105,	"여위황",	1228,	0,	null,	37,	62,	16,	0,	160,	300,	"정복",	null],	
         [145,	"여포",	1229,	0,	null,	48,	72,	13,	0,	160,	300,	"패권",	"돌격",	"다 죽여버리겠다! 으하하."],
-        [ 50,	"염우",	1230,	0,	null,	42,	42,	9,	0,	160,	300,	"출세",	null],
-        [ 40,	"염유",	1231,	0,	null,	43,	57,	20,	0,	160,	300,	"출세",	null],
-        [ 18,	"염포",	1232,	0,	null,	33,	15,	77,	0,	160,	300,	"유지",	null],
-        [ 40,	"예형",	1233,	0,	null,	49,	13,	69,	0,	160,	300,	"은둔",	"통찰"],
-        [133,	"오강",	1234,	0,	null,	39,	15,	61,	0,	160,	300,	"안전",	null],
-        [ 59,	"오란",	1235,	0,	null,	45,	57,	17,	0,	160,	300,	"재간",	null],
-        [ 72,	"오반",	1236,	0,	null,	46,	51,	18,	0,	160,	300,	"재간",	null],
-        [128,	"오언",	1237,	0,	null,	47,	48,	20,	0,	160,	300,	"재간",	null],
-        [126,	"오연",	1238,	0,	null,	35,	70,	13,	0,	160,	300,	"정복",	null],
-        [ 69,	"오의",	1239,	0,	null,	48,	27,	56,	0,	160,	300,	"유지",	null],
-        [ 19,	"오질",	1240,	0,	null,	37,	15,	69,	0,	160,	300,	"출세",	null],
-        [ 51,	"올돌골",	1241,	0,	null,	49,	67,	8,	0,	160,	300,	"출세",	"척사"],
-        [ 52,	"옹개",	1242,	0,	null,	42,	52,	20,	0,	160,	300,	"안전",	null],
-        [ 20,	"왕경",	1243,	0,	null,	41,	19,	51,	0,	160,	300,	"재간",	null],
-        [ 97,	"왕광",	1244,	0,	null,	47,	52,	21,	0,	160,	300,	"유지",	null],
-        [ 30,	"왕기1",	1245,	0,	null,	48,	24,	54,	0,	160,	300,	"유지",	null],
-        [ 34,	"왕랑",	1246,	0,	null,	39,	13,	51,	0,	160,	300,	"할거",	null],
-        [ 57,	"왕루",	1247,	0,	null,	36,	12,	76,	0,	160,	300,	"유지",	null],
-        [ 76,	"왕보",	1248,	0,	null,	39,	14,	75,	0,	160,	300,	"대의",	null],
-        [ 86,	"왕수",	1249,	0,	null,	34,	14,	67,	0,	160,	300,	"재간",	null],
-        [ 26,	"왕쌍",	1250,	0,	null,	42,	65,	8,	0,	160,	300,	"정복",	"보병"],
-        [ 46,	"왕위",	1251,	0,	null,	43,	23,	52,	0,	160,	300,	"안전",	null],
-        [ 92,	"왕윤",	1252,	0,	null,	14,	9,	77,	0,	160,	300,	"왕좌",	null],
-        [ 40,	"왕융",	1253,	0,	null,	44,	17,	58,	0,	160,	300,	"재간",	null],
-        [ 32,	"왕준",	1254,	0,	null,	50,	61,	28,	0,	160,	300,	"대의",	null],
-        [ 30,	"왕찬",	1255,	0,	null,	27,	12,	78,	0,	160,	300,	"안전",	null],
-        [ 33,	"왕창",	1256,	0,	null,	48,	46,	20,	0,	160,	300,	"정복",	null],
-        [ 69,	"왕평",	1257,	0,	null,	49,	57,	27,	0,	160,	300,	"재간",	null],
-        [ 71,	"왕항",	1258,	0,	null,	40,	17,	48,	0,	160,	300,	"대의",	null],
-        [ 33,	"왕혼",	1259,	0,	null,	46,	14,	47,	0,	160,	300,	"정복",	null],
-        [ 71,	"요립",	1260,	0,	null,	45,	17,	62,	0,	160,	300,	"출세",	null],
-        [ 74,	"요화",	1261,	0,	null,	45,	22,	48,	0,	160,	300,	"의협",	null],
-        [ 22,	"우금1",	1262,	0,	null,	50,	56,	27,	0,	160,	300,	"정복",	null],
-        [ 27,	"우금2",	1263,	0,	null,	44,	58,	15,	0,	160,	300,	"대의",	null],
-        [122,	"우번",	1264,	0,	null,	22,	17,	73,	0,	160,	300,	"유지",	null],
-        [126,	"우전",	1265,	0,	null,	44,	45,	17,	0,	160,	300,	"안전",	null],
-        [ 86,	"원담",	1266,	0,	null,	45,	47,	21,	0,	160,	300,	"왕좌",	null],
-        [101,	"원상",	1267,	0,	null,	41,	55,	26,	0,	160,	300,	"패권",	null],
-        [101,	"원소",	1268,	0,	null,	51,	25,	57,	0,	160,	300,	"패권",	"위압"],
-        [140,	"원술",	1269,	0,	null,	49,	23,	54,	0,	160,	300,	"패권",	"축성"],
-        [140,	"원윤",	1270,	0,	null,	37,	14,	60,	0,	160,	300,	"패권",	null],
-        [101,	"원희",	1271,	0,	null,	46,	22,	55,	0,	160,	300,	"할거",	null],
-        [131,	"위소",	1272,	0,	null,	36,	11,	82,	0,	160,	300,	"재간",	null],
-        [147,	"위속",	1273,	0,	null,	42,	47,	17,	0,	160,	300,	"안전",	null],
-        [ 81,	"위연",	1274,	0,	null,	49,	68,	24,	0,	160,	300,	"패권",	"보병"],
-        [ 96,	"위유",	1275,	0,	null,	41,	26,	54,	0,	160,	300,	"재간",	null],
-        [ 76,	"유기",	1276,	0,	null,	42,	9,	55,	0,	160,	300,	"왕좌",	null],
-        [ 36,	"유대",	1277,	0,	null,	43,	22,	49,	0,	160,	300,	"재간",	null],
-        [134,	"유도",	1278,	0,	null,	35,	14,	68,	0,	160,	300,	"재간",	null],
-        [ 46,	"유벽",	1279,	0,	null,	44,	54,	11,	0,	160,	300,	"출세",	null],
-        [ 75,	"유봉",	1280,	0,	null,	43,	51,	24,	0,	160,	300,	"출세",	null],
-        [ 75,	"유비",	1281,	0,	null,	51,	57,	26,	0,	160,	300,	"왕좌",	"인덕"],
-        [ 75,	"유선1",	1282,	0,	null,	23,	17,	24,	0,	160,	300,	"대의",	null],
-        [ 55,	"유순",	1283,	0,	null,	45,	48,	21,	0,	160,	300,	"출세",	null],
-        [ 75,	"유심",	1284,	0,	null,	44,	18,	54,	0,	160,	300,	"왕좌",	null],
-        [129,	"유약",	1285,	0,	null,	45,	49,	23,	0,	160,	300,	"유지",	null],
-        [ 55,	"유언",	1286,	0,	null,	43,	16,	56,	0,	160,	300,	"할거",	null],
-        [ 27,	"유엽",	1287,	0,	null,	36,	13,	79,	0,	160,	300,	"유지",	null],
-        [ 11,	"유요",	1288,	0,	null,	22,	10,	48,	0,	160,	300,	"안전",	"발명"],
-        [ 96,	"유우",	1289,	0,	null,	46,	14,	55,	0,	160,	300,	"왕좌",	null],
-        [ 55,	"유장",	1290,	0,	null,	36,	13,	63,	0,	160,	300,	"할거",	"수비"],
-        [ 45,	"유종",	1291,	0,	null,	20,	12,	61,	0,	160,	300,	"할거",	null],
-        [ 56,	"유파",	1292,	0,	null,	39,	14,	70,	0,	160,	300,	"대의",	null],
-        [ 45,	"유표1",	1293,	0,	null,	47,	22,	54,	0,	160,	300,	"할거",	null],
-        [ 27,	"유표2",	1294,	0,	null,	48,	21,	54,	0,	160,	300,	"안전",	null],
-        [134,	"유현",	1295,	0,	null,	31,	56,	21,	0,	160,	300,	"안전",	null],
-        [122,	"육개",	1296,	0,	null,	45,	13,	55,	0,	160,	300,	"재간",	null],
-        [122,	"육손",	1297,	0,	null,	56,	26,	70,	0,	160,	300,	"왕좌",	"귀병"],
-        [121,	"육적",	1298,	0,	null,	38,	13,	73,	0,	160,	300,	"안전",	null],
-        [122,	"육항",	1299,	0,	null,	55,	26,	68,	0,	160,	300,	"왕좌",	null],
-        [ 38,	"윤대목",	1300,	0,	null,	44,	19,	53,	0,	160,	300,	"재간",	null],
-        [ 80,	"윤묵",	1301,	0,	null,	17,	12,	73,	0,	160,	300,	"대의",	null],
-        [ 72,	"윤상",	1302,	0,	null,	29,	14,	42,	0,	160,	300,	"대의",	null],
-        [136,	"윤직",	1303,	0,	null,	38,	58,	49,	0,	160,	300,	"재간",	null],
-        [  2,	"이각",	1304,	0,	null,	42,	58,	17,	0,	160,	300,	"패권",	null],
-        [146,	"이숙",	1305,	0,	null,	26,	18,	67,	0,	160,	300,	"재간",	null],
-        [ 71,	"이엄",	1306,	0,	null,	50,	62,	30,	0,	160,	300,	"패권",	null],
-        [  2,	"이유",	1307,	0,	null,	44,	10,	66,	0,	160,	300,	"패권",	"귀모"],
-        [132,	"이이",	1308,	0,	null,	41,	57,	10,	0,	160,	300,	"정복",	null],
-        [ 77,	"이적",	1309,	0,	null,	41,	12,	58,	0,	160,	300,	"할거",	null],
-        [ 22,	"이전",	1310,	0,	null,	48,	26,	61,	0,	160,	300,	"왕좌",	null],
-        [ 71,	"이풍1",	1311,	0,	null,	43,	22,	49,	0,	160,	300,	"재간",	null],
-        [ 66,	"이회",	1312,	0,	null,	45,	20,	59,	0,	160,	300,	"유지",	null],
-        [114,	"잠혼",	1313,	0,	null,	13,	8,	44,	0,	160,	300,	"할거",	null],
-        [  7,	"장각",	1314,	0,	null,	54,	11,	67,	0,	160,	300,	"패권",	"환술"],
-        [ 34,	"장간",	1315,	0,	null,	17,	10,	70,	0,	160,	300,	"재간",	null],
-        [  7,	"장개",	1316,	0,	null,	39,	69,	9,	0,	160,	300,	"안전",	null],
-        [122,	"장굉",	1317,	0,	null,	24,	10,	85,	0,	160,	300,	"왕좌",	null],
-        [  7,	"장량",	1318,	0,	null,	46,	60,	26,	0,	160,	300,	"정복",	"환술"],
-        [ 15,	"장로",	1319,	0,	null,	48,	18,	60,	0,	160,	300,	"유지",	"축성"],
-        [ 23,	"장료",	1320,	0,	null,	53,	67,	31,	0,	160,	300,	"의협",	"견고"],
-        [  7,	"장보",	1321,	0,	null,	49,	60,	28,	0,	160,	300,	"패권",	"환술"],
+        [ 50,	"염우",	1230,	0,	null,	42,	42,	9,	0,	160,	300,	"출세",	null],	
+        [ 40,	"염유",	1231,	0,	null,	43,	57,	20,	0,	160,	300,	"출세",	null],	
+        [ 18,	"염포",	1232,	0,	null,	33,	15,	68,	0,	160,	300,	"유지",	null],	
+        [ 40,	"예형",	1233,	0,	null,	49,	13,	69,	0,	160,	300,	"은둔",	"통찰"],	
+        [133,	"오강",	1234,	0,	null,	39,	15,	61,	0,	160,	300,	"안전",	null],	
+        [ 59,	"오란",	1235,	0,	null,	45,	57,	17,	0,	160,	300,	"재간",	null],	
+        [ 72,	"오반",	1236,	0,	null,	46,	51,	18,	0,	160,	300,	"재간",	null],	
+        [128,	"오언",	1237,	0,	null,	47,	48,	20,	0,	160,	300,	"재간",	null],	
+        [126,	"오연",	1238,	0,	null,	35,	67,	13,	0,	160,	300,	"정복",	null],	
+        [ 69,	"오의",	1239,	0,	null,	48,	27,	56,	0,	160,	300,	"유지",	null],	
+        [ 19,	"오질",	1240,	0,	null,	37,	15,	67,	0,	160,	300,	"출세",	null],	
+        [ 51,	"올돌골",	1241,	0,	null,	49,	67,	8,	0,	160,	300,	"출세",	"척사"],	
+        [ 52,	"옹개",	1242,	0,	null,	42,	52,	20,	0,	160,	300,	"안전",	null],	
+        [ 20,	"왕경",	1243,	0,	null,	41,	19,	51,	0,	160,	300,	"재간",	null],	
+        [ 97,	"왕광",	1244,	0,	null,	47,	52,	21,	0,	160,	300,	"유지",	null],	
+        [ 30,	"왕기1",	1245,	0,	null,	48,	24,	54,	0,	160,	300,	"유지",	null],	
+        [ 34,	"왕랑",	1246,	0,	null,	39,	13,	51,	0,	160,	300,	"할거",	null],	
+        [ 57,	"왕루",	1247,	0,	null,	36,	12,	68,	0,	160,	300,	"유지",	null],	
+        [ 76,	"왕보",	1248,	0,	null,	39,	14,	68,	0,	160,	300,	"대의",	null],	
+        [ 86,	"왕수",	1249,	0,	null,	34,	14,	66,	0,	160,	300,	"재간",	null],	
+        [ 26,	"왕쌍",	1250,	0,	null,	42,	65,	8,	0,	160,	300,	"정복",	"보병"],	
+        [ 46,	"왕위",	1251,	0,	null,	43,	23,	52,	0,	160,	300,	"안전",	null],	
+        [ 92,	"왕윤",	1252,	0,	null,	14,	9,	68,	0,	160,	300,	"왕좌",	null],	
+        [ 40,	"왕융",	1253,	0,	null,	44,	17,	58,	0,	160,	300,	"재간",	null],	
+        [ 32,	"왕준",	1254,	0,	null,	50,	61,	28,	0,	160,	300,	"대의",	null],	
+        [ 30,	"왕찬",	1255,	0,	null,	27,	12,	68,	0,	160,	300,	"안전",	null],	
+        [ 33,	"왕창",	1256,	0,	null,	48,	46,	20,	0,	160,	300,	"정복",	null],	
+        [ 69,	"왕평",	1257,	0,	null,	49,	57,	27,	0,	160,	300,	"재간",	null],	
+        [ 71,	"왕항",	1258,	0,	null,	40,	17,	48,	0,	160,	300,	"대의",	null],	
+        [ 33,	"왕혼",	1259,	0,	null,	46,	14,	47,	0,	160,	300,	"정복",	null],	
+        [ 71,	"요립",	1260,	0,	null,	45,	17,	62,	0,	160,	300,	"출세",	null],	
+        [ 74,	"요화",	1261,	0,	null,	45,	22,	48,	0,	160,	300,	"의협",	null],	
+        [ 22,	"우금1",	1262,	0,	null,	50,	56,	27,	0,	160,	300,	"정복",	null],	
+        [ 27,	"우금2",	1263,	0,	null,	44,	58,	15,	0,	160,	300,	"대의",	null],	
+        [122,	"우번",	1264,	0,	null,	22,	17,	67,	0,	160,	300,	"유지",	null],	
+        [126,	"우전",	1265,	0,	null,	44,	45,	17,	0,	160,	300,	"안전",	null],	
+        [ 86,	"원담",	1266,	0,	null,	45,	47,	21,	0,	160,	300,	"왕좌",	null],	
+        [101,	"원상",	1267,	0,	null,	41,	55,	26,	0,	160,	300,	"패권",	null],	
+        [101,	"원소",	1268,	0,	null,	51,	25,	57,	0,	160,	300,	"패권",	"위압"],	
+        [140,	"원술",	1269,	0,	null,	49,	23,	54,	0,	160,	300,	"패권",	"축성"],	
+        [140,	"원윤",	1270,	0,	null,	37,	14,	60,	0,	160,	300,	"패권",	null],	
+        [101,	"원희",	1271,	0,	null,	46,	22,	55,	0,	160,	300,	"할거",	null],	
+        [131,	"위소",	1272,	0,	null,	36,	11,	69,	0,	160,	300,	"재간",	null],	
+        [147,	"위속",	1273,	0,	null,	42,	47,	17,	0,	160,	300,	"안전",	null],	
+        [ 81,	"위연",	1274,	0,	null,	49,	68,	24,	0,	160,	300,	"패권",	"보병"],	
+        [ 96,	"위유",	1275,	0,	null,	41,	26,	54,	0,	160,	300,	"재간",	null],	
+        [ 76,	"유기",	1276,	0,	null,	42,	9,	55,	0,	160,	300,	"왕좌",	null],	
+        [ 36,	"유대",	1277,	0,	null,	43,	22,	49,	0,	160,	300,	"재간",	null],	
+        [134,	"유도",	1278,	0,	null,	35,	14,	66,	0,	160,	300,	"재간",	null],	
+        [ 46,	"유벽",	1279,	0,	null,	44,	54,	11,	0,	160,	300,	"출세",	null],	
+        [ 75,	"유봉",	1280,	0,	null,	43,	51,	24,	0,	160,	300,	"출세",	null],	
+        [ 75,	"유비",	1281,	0,	null,	51,	57,	26,	0,	160,	300,	"왕좌",	"인덕"],	
+        [ 75,	"유선1",	1282,	0,	null,	23,	17,	24,	0,	160,	300,	"대의",	null],	
+        [ 55,	"유순",	1283,	0,	null,	45,	48,	21,	0,	160,	300,	"출세",	null],	
+        [ 75,	"유심",	1284,	0,	null,	44,	18,	54,	0,	160,	300,	"왕좌",	null],	
+        [129,	"유약",	1285,	0,	null,	45,	49,	23,	0,	160,	300,	"유지",	null],	
+        [ 55,	"유언",	1286,	0,	null,	43,	16,	56,	0,	160,	300,	"할거",	null],	
+        [ 27,	"유엽",	1287,	0,	null,	36,	13,	68,	0,	160,	300,	"유지",	null],	
+        [ 11,	"유요",	1288,	0,	null,	22,	10,	48,	0,	160,	300,	"안전",	"발명"],	
+        [ 96,	"유우",	1289,	0,	null,	46,	14,	55,	0,	160,	300,	"왕좌",	null],	
+        [ 55,	"유장",	1290,	0,	null,	36,	13,	63,	0,	160,	300,	"할거",	"수비"],	
+        [ 45,	"유종",	1291,	0,	null,	20,	12,	61,	0,	160,	300,	"할거",	null],	
+        [ 56,	"유파",	1292,	0,	null,	39,	14,	67,	0,	160,	300,	"대의",	null],	
+        [ 45,	"유표1",	1293,	0,	null,	47,	22,	54,	0,	160,	300,	"할거",	null],	
+        [ 27,	"유표2",	1294,	0,	null,	48,	21,	54,	0,	160,	300,	"안전",	null],	
+        [134,	"유현",	1295,	0,	null,	31,	56,	21,	0,	160,	300,	"안전",	null],	
+        [122,	"육개",	1296,	0,	null,	45,	13,	55,	0,	160,	300,	"재간",	null],	
+        [122,	"육손",	1297,	0,	null,	56,	26,	70,	0,	160,	300,	"왕좌",	"귀병"],	
+        [121,	"육적",	1298,	0,	null,	38,	13,	67,	0,	160,	300,	"안전",	null],	
+        [122,	"육항",	1299,	0,	null,	55,	26,	68,	0,	160,	300,	"왕좌",	null],	
+        [ 38,	"윤대목",	1300,	0,	null,	44,	19,	53,	0,	160,	300,	"재간",	null],	
+        [ 80,	"윤묵",	1301,	0,	null,	17,	12,	67,	0,	160,	300,	"대의",	null],	
+        [ 72,	"윤상",	1302,	0,	null,	29,	14,	42,	0,	160,	300,	"대의",	null],	
+        [136,	"윤직",	1303,	0,	null,	38,	58,	49,	0,	160,	300,	"재간",	null],	
+        [  2,	"이각",	1304,	0,	null,	42,	58,	17,	0,	160,	300,	"패권",	null],	
+        [146,	"이숙",	1305,	0,	null,	26,	18,	66,	0,	160,	300,	"재간",	null],	
+        [ 71,	"이엄",	1306,	0,	null,	50,	62,	30,	0,	160,	300,	"패권",	null],	
+        [  2,	"이유",	1307,	0,	null,	44,	10,	66,	0,	160,	300,	"패권",	"귀모"],	
+        [132,	"이이",	1308,	0,	null,	41,	57,	10,	0,	160,	300,	"정복",	null],	
+        [ 77,	"이적",	1309,	0,	null,	41,	12,	58,	0,	160,	300,	"할거",	null],	
+        [ 22,	"이전",	1310,	0,	null,	48,	26,	61,	0,	160,	300,	"왕좌",	null],	
+        [ 71,	"이풍1",	1311,	0,	null,	43,	22,	49,	0,	160,	300,	"재간",	null],	
+        [ 66,	"이회",	1312,	0,	null,	45,	20,	59,	0,	160,	300,	"유지",	null],	
+        [114,	"잠혼",	1313,	0,	null,	13,	8,	44,	0,	160,	300,	"할거",	null],	
+        [  7,	"장각",	1314,	0,	null,	54,	11,	67,	0,	160,	300,	"패권",	"환술"],	
+        [ 34,	"장간",	1315,	0,	null,	17,	10,	67,	0,	160,	300,	"재간",	null],	
+        [  7,	"장개",	1316,	0,	null,	39,	67,	9,	0,	160,	300,	"안전",	null],	
+        [122,	"장굉",	1317,	0,	null,	24,	10,	69,	0,	160,	300,	"왕좌",	null],	
+        [  7,	"장량",	1318,	0,	null,	46,	60,	26,	0,	160,	300,	"정복",	"환술"],	
+        [ 15,	"장로",	1319,	0,	null,	48,	18,	60,	0,	160,	300,	"유지",	"축성"],	
+        [ 23,	"장료",	1320,	0,	null,	53,	67,	31,	0,	160,	300,	"의협",	"견고"],	
+        [  7,	"장보",	1321,	0,	null,	49,	60,	28,	0,	160,	300,	"패권",	"환술"],	
         [ 76,	"장비",	1322,	0,	null,	49,	71,	19,	0,	160,	300,	"의협",	"무쌍",	"어쭈. 해보자 이거냐?"],
-        [ 62,	"장서",	1323,	0,	null,	38,	48,	15,	0,	160,	300,	"출세",	null],
-        [120,	"장소1",	1324,	0,	null,	37,	11,	91,	0,	160,	300,	"안전",	null],
-        [ 78,	"장소2",	1325,	0,	null,	40,	18,	54,	0,	160,	300,	"재간",	null],
-        [ 72,	"장송",	1326,	0,	null,	39,	12,	93,	0,	160,	300,	"할거",	"통찰"],
-        [148,	"장수",	1327,	0,	null,	47,	55,	26,	0,	160,	300,	"할거",	null],
-        [145,	"장양1",	1328,	0,	null,	44,	51,	25,	0,	160,	300,	"출세",	null],
-        [  8,	"장연",	1329,	0,	null,	49,	51,	19,	0,	160,	300,	"안전",	null],
-        [ 11,	"장영",	1330,	0,	null,	41,	51,	16,	0,	160,	300,	"재간",	null],
-        [118,	"장온",	1331,	0,	null,	19,	13,	69,	0,	160,	300,	"할거",	null],
-        [ 78,	"장완",	1332,	0,	null,	46,	21,	63,	0,	160,	300,	"할거",	"상재"],
-        [ 15,	"장위",	1333,	0,	null,	45,	54,	13,	0,	160,	300,	"대의",	null],
-        [ 36,	"장윤",	1334,	0,	null,	45,	23,	48,	0,	160,	300,	"정복",	null],
-        [104,	"장의거",	1335,	0,	null,	46,	47,	14,	0,	160,	300,	"대의",	null],
-        [ 68,	"장익",	1336,	0,	null,	48,	52,	24,	0,	160,	300,	"유지",	null],
-        [ 56,	"장임",	1337,	0,	null,	51,	61,	28,	0,	160,	300,	"대의",	"견고"],
-        [148,	"장제1",	1338,	0,	null,	46,	51,	23,	0,	160,	300,	"할거",	null],
-        [ 32,	"장제2",	1339,	0,	null,	29,	14,	84,	0,	160,	300,	"유지",	null],
-        [126,	"장제3",	1340,	0,	null,	48,	19,	48,	0,	160,	300,	"할거",	null],
-        [ 17,	"장패",	1341,	0,	null,	38,	78,	17,	0,	160,	300,	"할거",	null],
-        [ 76,	"장포1",	1342,	0,	null,	46,	63,	19,	0,	160,	300,	"재간",	"징병"],
-        [113,	"장포2",	1343,	0,	null,	44,	51,	20,	0,	160,	300,	"유지",	null],
-        [ 27,	"장합",	1344,	0,	null,	51,	66,	24,	0,	160,	300,	"출세",	"궁병"],
-        [ 23,	"장호",	1345,	0,	null,	42,	49,	21,	0,	160,	300,	"정복",	null],
-        [ 31,	"장화",	1346,	0,	null,	39,	11,	86,	0,	160,	300,	"유지",	null],
-        [ 48,	"장횡",	1347,	0,	null,	41,	52,	11,	0,	160,	300,	"재간",	null],
-        [141,	"장훈",	1348,	0,	null,	45,	48,	23,	0,	160,	300,	"안전",	null],
-        [120,	"장휴",	1349,	0,	null,	37,	15,	70,	0,	160,	300,	"재간",	null],
-        [126,	"장흠",	1350,	0,	null,	44,	25,	52,	0,	160,	300,	"대의",	"저격"],
-        [ 96,	"저수",	1351,	0,	null,	50,	21,	64,	0,	160,	300,	"할거",	"반계"],
-        [130,	"전단",	1352,	0,	null,	44,	55,	23,	0,	160,	300,	"출세",	null],
-        [ 42,	"전속",	1353,	0,	null,	45,	46,	19,	0,	160,	300,	"안전",	null],
-        [ 26,	"전위1",	1354,	0,	null,	43,	69,	14,	0,	160,	300,	"의협",	"필살"],
-        [130,	"전위2",	1355,	0,	null,	48,	53,	24,	0,	160,	300,	"출세",	null],
-        [128,	"전종",	1356,	0,	null,	49,	58,	28,	0,	160,	300,	"패권",	null],
-        [ 42,	"전주",	1357,	0,	null,	46,	52,	20,	0,	160,	300,	"의협",	null],
-        [ 96,	"전풍",	1358,	0,	null,	50,	17,	69,	0,	160,	300,	"왕좌",	null],
-        [ 24,	"정무",	1359,	0,	null,	41,	16,	56,	0,	160,	300,	"출세",	null],
-        [119,	"정병",	1360,	0,	null,	20,	11,	67,	0,	160,	300,	"유지",	null],
-        [126,	"정보",	1361,	0,	null,	50,	24,	57,	0,	160,	300,	"패권",	null],
-        [123,	"정봉1",	1362,	0,	null,	46,	58,	24,	0,	160,	300,	"패권",	null],
-        [ 24,	"정욱",	1363,	0,	null,	50,	16,	66,	0,	160,	300,	"패권",	"신중"],
-        [ 88,	"정원",	1364,	0,	null,	44,	58,	22,	0,	160,	300,	"왕좌",	"기병"],
-        [  7,	"정원지",	1365,	0,	null,	37,	74,	16,	0,	160,	300,	"출세",	null],
-        [ 69,	"정은",	1366,	0,	null,	41,	49,	12,	0,	160,	300,	"재간",	null],
-        [121,	"제갈각",	1367,	0,	null,	43,	21,	67,	0,	160,	300,	"왕좌",	null],
-        [ 76,	"제갈균",	1368,	0,	null,	43,	18,	56,	0,	160,	300,	"안전",	"상재"],
-        [121,	"제갈근",	1369,	0,	null,	43,	17,	64,	0,	160,	300,	"왕좌",	"경작"],
+        [ 62,	"장서",	1323,	0,	null,	38,	48,	15,	0,	160,	300,	"출세",	null],	
+        [120,	"장소1",	1324,	0,	null,	37,	11,	70,	0,	160,	300,	"안전",	null],	
+        [ 78,	"장소2",	1325,	0,	null,	40,	18,	54,	0,	160,	300,	"재간",	null],	
+        [ 72,	"장송",	1326,	0,	null,	39,	12,	70,	0,	160,	300,	"할거",	"통찰"],	
+        [148,	"장수",	1327,	0,	null,	47,	55,	26,	0,	160,	300,	"할거",	null],	
+        [145,	"장양1",	1328,	0,	null,	44,	51,	25,	0,	160,	300,	"출세",	null],	
+        [  8,	"장연",	1329,	0,	null,	49,	51,	19,	0,	160,	300,	"안전",	null],	
+        [ 11,	"장영",	1330,	0,	null,	41,	51,	16,	0,	160,	300,	"재간",	null],	
+        [118,	"장온",	1331,	0,	null,	19,	13,	67,	0,	160,	300,	"할거",	null],	
+        [ 78,	"장완",	1332,	0,	null,	46,	21,	63,	0,	160,	300,	"할거",	"상재"],	
+        [ 15,	"장위",	1333,	0,	null,	45,	54,	13,	0,	160,	300,	"대의",	null],	
+        [ 36,	"장윤",	1334,	0,	null,	45,	23,	48,	0,	160,	300,	"정복",	null],	
+        [104,	"장의거",	1335,	0,	null,	46,	47,	14,	0,	160,	300,	"대의",	null],	
+        [ 68,	"장익",	1336,	0,	null,	48,	52,	24,	0,	160,	300,	"유지",	null],	
+        [ 56,	"장임",	1337,	0,	null,	51,	61,	28,	0,	160,	300,	"대의",	"견고"],	
+        [148,	"장제1",	1338,	0,	null,	46,	51,	23,	0,	160,	300,	"할거",	null],	
+        [ 32,	"장제2",	1339,	0,	null,	29,	14,	69,	0,	160,	300,	"유지",	null],	
+        [126,	"장제3",	1340,	0,	null,	48,	19,	48,	0,	160,	300,	"할거",	null],	
+        [ 17,	"장패",	1341,	0,	null,	38,	68,	17,	0,	160,	300,	"할거",	null],	
+        [ 76,	"장포1",	1342,	0,	null,	46,	63,	19,	0,	160,	300,	"재간",	"징병"],	
+        [113,	"장포2",	1343,	0,	null,	44,	51,	20,	0,	160,	300,	"유지",	null],	
+        [ 27,	"장합",	1344,	0,	null,	51,	66,	24,	0,	160,	300,	"출세",	"궁병"],	
+        [ 23,	"장호",	1345,	0,	null,	42,	49,	21,	0,	160,	300,	"정복",	null],	
+        [ 31,	"장화",	1346,	0,	null,	39,	11,	69,	0,	160,	300,	"유지",	null],	
+        [ 48,	"장횡",	1347,	0,	null,	41,	52,	11,	0,	160,	300,	"재간",	null],	
+        [141,	"장훈",	1348,	0,	null,	45,	48,	23,	0,	160,	300,	"안전",	null],	
+        [120,	"장휴",	1349,	0,	null,	37,	15,	67,	0,	160,	300,	"재간",	null],	
+        [126,	"장흠",	1350,	0,	null,	44,	25,	52,	0,	160,	300,	"대의",	"저격"],	
+        [ 96,	"저수",	1351,	0,	null,	50,	21,	64,	0,	160,	300,	"할거",	"반계"],	
+        [130,	"전단",	1352,	0,	null,	44,	55,	23,	0,	160,	300,	"출세",	null],	
+        [ 42,	"전속",	1353,	0,	null,	45,	46,	19,	0,	160,	300,	"안전",	null],	
+        [ 26,	"전위1",	1354,	0,	null,	43,	69,	14,	0,	160,	300,	"의협",	"필살"],	
+        [130,	"전위2",	1355,	0,	null,	48,	53,	24,	0,	160,	300,	"출세",	null],	
+        [128,	"전종",	1356,	0,	null,	49,	58,	28,	0,	160,	300,	"패권",	null],	
+        [ 42,	"전주",	1357,	0,	null,	46,	52,	20,	0,	160,	300,	"의협",	null],	
+        [ 96,	"전풍",	1358,	0,	null,	50,	17,	69,	0,	160,	300,	"왕좌",	null],	
+        [ 24,	"정무",	1359,	0,	null,	41,	16,	56,	0,	160,	300,	"출세",	null],	
+        [119,	"정병",	1360,	0,	null,	20,	11,	66,	0,	160,	300,	"유지",	null],	
+        [126,	"정보",	1361,	0,	null,	50,	24,	57,	0,	160,	300,	"패권",	null],	
+        [123,	"정봉1",	1362,	0,	null,	46,	58,	24,	0,	160,	300,	"패권",	null],	
+        [ 24,	"정욱",	1363,	0,	null,	50,	16,	66,	0,	160,	300,	"패권",	"신중"],	
+        [ 88,	"정원",	1364,	0,	null,	44,	58,	22,	0,	160,	300,	"왕좌",	"기병"],	
+        [  7,	"정원지",	1365,	0,	null,	37,	68,	16,	0,	160,	300,	"출세",	null],	
+        [ 69,	"정은",	1366,	0,	null,	41,	49,	12,	0,	160,	300,	"재간",	null],	
+        [121,	"제갈각",	1367,	0,	null,	43,	21,	67,	0,	160,	300,	"왕좌",	null],	
+        [ 76,	"제갈균",	1368,	0,	null,	43,	18,	56,	0,	160,	300,	"안전",	"상재"],	
+        [121,	"제갈근",	1369,	0,	null,	43,	17,	64,	0,	160,	300,	"왕좌",	"경작"],	
         [ 76,	"제갈량",	1370,	0,	null,	55,	21,	72,	0,	160,	300,	"왕좌",	"집중",	"슬슬 나의 지모를 발휘해 보겠습니다..."],
-        [ 76,	"제갈상",	1371,	0,	null,	40,	57,	27,	0,	160,	300,	"대의",	null],
-        [135,	"제갈정",	1372,	0,	null,	42,	46,	21,	0,	160,	300,	"안전",	null],
-        [ 76,	"제갈첨",	1373,	0,	null,	47,	20,	57,	0,	160,	300,	"대의",	null],
-        [135,	"제갈탄",	1374,	0,	null,	49,	59,	27,	0,	160,	300,	"패권",	null],
-        [ 76,	"조광",	1375,	0,	null,	45,	52,	21,	0,	160,	300,	"재간",	null],
-        [ 74,	"조루",	1376,	0,	null,	39,	15,	60,	0,	160,	300,	"대의",	null],
-        [ 24,	"조모",	1377,	0,	null,	41,	31,	13,	0,	160,	300,	"할거",	null],
-        [127,	"조무",	1378,	0,	null,	47,	26,	54,	0,	160,	300,	"의협",	null],
-        [ 26,	"조방",	1379,	0,	null,	40,	10,	30,	0,	160,	300,	"정복",	null],
-        [ 83,	"조범",	1380,	0,	null,	42,	16,	49,	0,	160,	300,	"유지",	null],
-        [ 26,	"조비",	1381,	0,	null,	47,	26,	57,	0,	160,	300,	"패권",	"징병"],
-        [ 19,	"조상",	1382,	0,	null,	46,	49,	13,	0,	160,	300,	"패권",	null],
-        [147,	"조성",	1383,	0,	null,	38,	69,	20,	0,	160,	300,	"안전",	null],
-        [ 26,	"조순",	1384,	0,	null,	45,	22,	55,	0,	160,	300,	"정복",	null],
-        [ 25,	"조식",	1385,	0,	null,	17,	9,	90,	0,	160,	300,	"왕좌",	"귀모"],
-        [ 25,	"조앙",	1386,	0,	null,	38,	65,	24,	0,	160,	300,	"왕좌",	null],
-        [ 25,	"조예",	1387,	0,	null,	42,	21,	61,	0,	160,	300,	"정복",	null],
-        [ 26,	"조우",	1388,	0,	null,	45,	21,	52,	0,	160,	300,	"대의",	null],
+        [ 76,	"제갈상",	1371,	0,	null,	40,	57,	27,	0,	160,	300,	"대의",	null],	
+        [135,	"제갈정",	1372,	0,	null,	42,	46,	21,	0,	160,	300,	"안전",	null],	
+        [ 76,	"제갈첨",	1373,	0,	null,	47,	20,	57,	0,	160,	300,	"대의",	null],	
+        [135,	"제갈탄",	1374,	0,	null,	49,	59,	27,	0,	160,	300,	"패권",	null],	
+        [ 76,	"조광",	1375,	0,	null,	45,	52,	21,	0,	160,	300,	"재간",	null],	
+        [ 74,	"조루",	1376,	0,	null,	39,	15,	60,	0,	160,	300,	"대의",	null],	
+        [ 24,	"조모",	1377,	0,	null,	41,	31,	13,	0,	160,	300,	"할거",	null],	
+        [127,	"조무",	1378,	0,	null,	47,	26,	54,	0,	160,	300,	"의협",	null],	
+        [ 26,	"조방",	1379,	0,	null,	40,	10,	30,	0,	160,	300,	"정복",	null],	
+        [ 83,	"조범",	1380,	0,	null,	42,	16,	49,	0,	160,	300,	"유지",	null],	
+        [ 26,	"조비",	1381,	0,	null,	47,	26,	57,	0,	160,	300,	"패권",	"징병"],	
+        [ 19,	"조상",	1382,	0,	null,	46,	49,	13,	0,	160,	300,	"패권",	null],	
+        [147,	"조성",	1383,	0,	null,	38,	67,	20,	0,	160,	300,	"안전",	null],	
+        [ 26,	"조순",	1384,	0,	null,	45,	22,	55,	0,	160,	300,	"정복",	null],	
+        [ 25,	"조식",	1385,	0,	null,	17,	9,	70,	0,	160,	300,	"왕좌",	"귀모"],	
+        [ 25,	"조앙",	1386,	0,	null,	38,	65,	24,	0,	160,	300,	"왕좌",	null],	
+        [ 25,	"조예",	1387,	0,	null,	42,	21,	61,	0,	160,	300,	"정복",	null],	
+        [ 26,	"조우",	1388,	0,	null,	45,	21,	52,	0,	160,	300,	"대의",	null],	
         [ 76,	"조운",	1389,	0,	null,	55,	70,	32,	0,	160,	300,	"왕좌",	"무쌍",	"창술의 달인 상산 조자룡 여기 있소!"],
-        [ 25,	"조웅",	1390,	0,	null,	43,	12,	38,	0,	160,	300,	"안전",	null],
-        [ 26,	"조인",	1391,	0,	null,	48,	59,	24,	0,	160,	300,	"패권",	"보병"],
-        [ 25,	"조조",	1392,	0,	null,	56,	30,	69,	0,	160,	300,	"패권",	"반계"],
-        [ 26,	"조진",	1393,	0,	null,	50,	52,	25,	0,	160,	300,	"정복",	null],
-        [ 25,	"조창",	1394,	0,	null,	48,	64,	15,	0,	160,	300,	"정복",	"돌격"],
-        [ 76,	"조통",	1395,	0,	null,	45,	50,	21,	0,	160,	300,	"재간",	null],
-        [ 84,	"조표",	1396,	0,	null,	34,	70,	8,	0,	160,	300,	"안전",	null],
-        [  7,	"조홍1",	1397,	0,	null,	40,	51,	17,	0,	160,	300,	"유지",	null],
-        [ 24,	"조홍2",	1398,	0,	null,	47,	53,	18,	0,	160,	300,	"패권",	null],
-        [ 26,	"조환",	1399,	0,	null,	34,	11,	42,	0,	160,	300,	"정복",	null],
-        [ 19,	"조훈",	1400,	0,	null,	45,	49,	13,	0,	160,	300,	"출세",	null],
-        [ 26,	"조휴",	1401,	0,	null,	48,	54,	26,	0,	160,	300,	"패권",	null],
-        [ 19,	"조희",	1402,	0,	null,	44,	22,	54,	0,	160,	300,	"대의",	null],
-        [ 22,	"종요",	1403,	0,	null,	14,	10,	74,	0,	160,	300,	"유지",	null],
-        [ 20,	"종회",	1404,	0,	null,	51,	22,	67,	0,	160,	300,	"패권",	null],
-        [128,	"주거",	1405,	0,	null,	47,	27,	55,	0,	160,	300,	"유지",	null],
-        [118,	"주방",	1406,	0,	null,	42,	15,	57,	0,	160,	300,	"할거",	null],
-        [126,	"주연",	1407,	0,	null,	47,	55,	20,	0,	160,	300,	"할거",	null],
-        [126,	"주유",	1408,	0,	null,	55,	27,	70,	0,	160,	300,	"패권",	"신산"],
-        [128,	"주이",	1409,	0,	null,	43,	21,	48,	0,	160,	300,	"안전",	null],
-        [ 88,	"주준",	1410,	0,	null,	50,	57,	25,	0,	160,	300,	"왕좌",	null],
-        [ 32,	"주지",	1411,	0,	null,	40,	58,	19,	0,	160,	300,	"안전",	null],
-        [ 76,	"주창",	1412,	0,	null,	37,	79,	13,	0,	160,	300,	"의협",	"궁병"],
-        [126,	"주치",	1413,	0,	null,	42,	21,	45,	0,	160,	300,	"안전",	null],
-        [ 41,	"주태1",	1414,	0,	null,	44,	21,	48,	0,	160,	300,	"안전",	null],
-        [126,	"주태2",	1415,	0,	null,	48,	64,	23,	0,	160,	300,	"정복",	"필살"],
-        [128,	"주환",	1416,	0,	null,	51,	63,	28,	0,	160,	300,	"정복",	null],
-        [ 29,	"진건",	1417,	0,	null,	44,	54,	24,	0,	160,	300,	"정복",	null],
-        [ 29,	"진교",	1418,	0,	null,	19,	11,	67,	0,	160,	300,	"유지",	null],
-        [ 28,	"진군",	1419,	0,	null,	43,	16,	64,	0,	160,	300,	"대의",	null],
-        [143,	"진궁",	1420,	0,	null,	49,	20,	66,	0,	160,	300,	"할거",	"신중"],
-        [ 79,	"진규",	1421,	0,	null,	20,	9,	71,	0,	160,	300,	"할거",	null],
-        [ 72,	"진도",	1422,	0,	null,	47,	63,	26,	0,	160,	300,	"대의",	null],
-        [ 79,	"진등",	1423,	0,	null,	44,	24,	54,	0,	160,	300,	"할거",	null],
-        [ 37,	"진림",	1424,	0,	null,	40,	12,	61,	0,	160,	300,	"재간",	null],
-        [124,	"진무",	1425,	0,	null,	44,	56,	23,	0,	160,	300,	"재간",	null],
-        [ 66,	"진복",	1426,	0,	null,	35,	12,	76,	0,	160,	300,	"재간",	null],
-        [ 50,	"진수",	1427,	0,	null,	24,	13,	83,	0,	160,	300,	"대의",	null],
-        [ 81,	"진식",	1428,	0,	null,	39,	68,	20,	0,	160,	300,	"출세",	null],
-        [ 79,	"진진",	1429,	0,	null,	42,	16,	50,	0,	160,	300,	"재간",	null],
-        [ 28,	"진태",	1430,	0,	null,	49,	57,	26,	0,	160,	300,	"대의",	null],
-        [ 11,	"진횡",	1431,	0,	null,	36,	58,	19,	0,	160,	300,	"출세",	null],
-        [ 21,	"차주",	1432,	0,	null,	41,	51,	24,	0,	160,	300,	"안전",	null],
-        [ 11,	"착융",	1433,	0,	null,	44,	47,	10,	0,	160,	300,	"출세",	null],
-        [ 36,	"채모",	1434,	0,	null,	49,	53,	26,	0,	160,	300,	"정복",	"궁병"],
-        [ 36,	"채중",	1435,	0,	null,	42,	17,	45,	0,	160,	300,	"출세",	null],
-        [ 36,	"채화",	1436,	0,	null,	42,	19,	41,	0,	160,	300,	"안전",	null],
-        [ 66,	"초주",	1437,	0,	null,	20,	12,	81,	0,	160,	300,	"대의",	null],
-        [ 20,	"최염",	1438,	0,	null,	37,	54,	52,	0,	160,	300,	"대의",	null],
-        [ 60,	"축융",	1439,	0,	null,	43,	64,	11,	0,	160,	300,	"정복",	"척사"],
-        [ 60,	"타사대왕",	1440,	0,	null,	43,	55,	25,	0,	160,	300,	"출세",	"척사"],
-        [124,	"태사자",	1441,	0,	null,	47,	70,	25,	0,	160,	300,	"대의",	"무쌍"],
-        [124,	"태사향",	1442,	0,	null,	40,	53,	20,	0,	160,	300,	"재간",	null],
-        [ 12,	"포륭",	1443,	0,	null,	41,	56,	10,	0,	160,	300,	"안전",	null],
-        [ 74,	"풍습",	1444,	0,	null,	35,	64,	18,	0,	160,	300,	"재간",	null],
-        [  7,	"하의",	1445,	0,	null,	39,	68,	11,	0,	160,	300,	"출세",	null],
-        [121,	"하제",	1446,	0,	null,	48,	55,	24,	0,	160,	300,	"재간",	null],
-        [ 90,	"하진",	1447,	0,	null,	39,	69,	15,	0,	160,	300,	"왕좌",	null],
-        [ 24,	"하후덕",	1448,	0,	null,	45,	50,	16,	0,	160,	300,	"출세",	null],
+        [ 25,	"조웅",	1390,	0,	null,	43,	12,	38,	0,	160,	300,	"안전",	null],	
+        [ 26,	"조인",	1391,	0,	null,	48,	59,	24,	0,	160,	300,	"패권",	"보병"],	
+        [ 25,	"조조",	1392,	0,	null,	56,	30,	69,	0,	160,	300,	"패권",	"반계"],	
+        [ 26,	"조진",	1393,	0,	null,	50,	52,	25,	0,	160,	300,	"정복",	null],	
+        [ 25,	"조창",	1394,	0,	null,	48,	64,	15,	0,	160,	300,	"정복",	"돌격"],	
+        [ 76,	"조통",	1395,	0,	null,	45,	50,	21,	0,	160,	300,	"재간",	null],	
+        [ 84,	"조표",	1396,	0,	null,	34,	67,	8,	0,	160,	300,	"안전",	null],	
+        [  7,	"조홍1",	1397,	0,	null,	40,	51,	17,	0,	160,	300,	"유지",	null],	
+        [ 24,	"조홍2",	1398,	0,	null,	47,	53,	18,	0,	160,	300,	"패권",	null],	
+        [ 26,	"조환",	1399,	0,	null,	34,	11,	42,	0,	160,	300,	"정복",	null],	
+        [ 19,	"조훈",	1400,	0,	null,	45,	49,	13,	0,	160,	300,	"출세",	null],	
+        [ 26,	"조휴",	1401,	0,	null,	48,	54,	26,	0,	160,	300,	"패권",	null],	
+        [ 19,	"조희",	1402,	0,	null,	44,	22,	54,	0,	160,	300,	"대의",	null],	
+        [ 22,	"종요",	1403,	0,	null,	14,	10,	68,	0,	160,	300,	"유지",	null],	
+        [ 20,	"종회",	1404,	0,	null,	51,	22,	67,	0,	160,	300,	"패권",	null],	
+        [128,	"주거",	1405,	0,	null,	47,	27,	55,	0,	160,	300,	"유지",	null],	
+        [118,	"주방",	1406,	0,	null,	42,	15,	57,	0,	160,	300,	"할거",	null],	
+        [126,	"주연",	1407,	0,	null,	47,	55,	20,	0,	160,	300,	"할거",	null],	
+        [126,	"주유",	1408,	0,	null,	55,	27,	70,	0,	160,	300,	"패권",	"신산"],	
+        [128,	"주이",	1409,	0,	null,	43,	21,	48,	0,	160,	300,	"안전",	null],	
+        [ 88,	"주준",	1410,	0,	null,	50,	57,	25,	0,	160,	300,	"왕좌",	null],	
+        [ 32,	"주지",	1411,	0,	null,	40,	58,	19,	0,	160,	300,	"안전",	null],	
+        [ 76,	"주창",	1412,	0,	null,	37,	68,	13,	0,	160,	300,	"의협",	"궁병"],	
+        [126,	"주치",	1413,	0,	null,	42,	21,	45,	0,	160,	300,	"안전",	null],	
+        [ 41,	"주태1",	1414,	0,	null,	44,	21,	48,	0,	160,	300,	"안전",	null],	
+        [126,	"주태2",	1415,	0,	null,	48,	64,	23,	0,	160,	300,	"정복",	"필살"],	
+        [128,	"주환",	1416,	0,	null,	51,	63,	28,	0,	160,	300,	"정복",	null],	
+        [ 29,	"진건",	1417,	0,	null,	44,	54,	24,	0,	160,	300,	"정복",	null],	
+        [ 29,	"진교",	1418,	0,	null,	19,	11,	66,	0,	160,	300,	"유지",	null],	
+        [ 28,	"진군",	1419,	0,	null,	43,	16,	64,	0,	160,	300,	"대의",	null],	
+        [143,	"진궁",	1420,	0,	null,	49,	20,	66,	0,	160,	300,	"할거",	"신중"],	
+        [ 79,	"진규",	1421,	0,	null,	20,	9,	67,	0,	160,	300,	"할거",	null],	
+        [ 72,	"진도",	1422,	0,	null,	47,	63,	26,	0,	160,	300,	"대의",	null],	
+        [ 79,	"진등",	1423,	0,	null,	44,	24,	54,	0,	160,	300,	"할거",	null],	
+        [ 37,	"진림",	1424,	0,	null,	40,	12,	61,	0,	160,	300,	"재간",	null],	
+        [124,	"진무",	1425,	0,	null,	44,	56,	23,	0,	160,	300,	"재간",	null],	
+        [ 66,	"진복",	1426,	0,	null,	35,	12,	68,	0,	160,	300,	"재간",	null],	
+        [ 50,	"진수",	1427,	0,	null,	24,	13,	69,	0,	160,	300,	"대의",	null],	
+        [ 81,	"진식",	1428,	0,	null,	39,	66,	20,	0,	160,	300,	"출세",	null],	
+        [ 79,	"진진",	1429,	0,	null,	42,	16,	50,	0,	160,	300,	"재간",	null],	
+        [ 28,	"진태",	1430,	0,	null,	49,	57,	26,	0,	160,	300,	"대의",	null],	
+        [ 11,	"진횡",	1431,	0,	null,	36,	58,	19,	0,	160,	300,	"출세",	null],	
+        [ 21,	"차주",	1432,	0,	null,	41,	51,	24,	0,	160,	300,	"안전",	null],	
+        [ 11,	"착융",	1433,	0,	null,	44,	47,	10,	0,	160,	300,	"출세",	null],	
+        [ 36,	"채모",	1434,	0,	null,	49,	53,	26,	0,	160,	300,	"정복",	"궁병"],	
+        [ 36,	"채중",	1435,	0,	null,	42,	17,	45,	0,	160,	300,	"출세",	null],	
+        [ 36,	"채화",	1436,	0,	null,	42,	19,	41,	0,	160,	300,	"안전",	null],	
+        [ 66,	"초주",	1437,	0,	null,	20,	12,	69,	0,	160,	300,	"대의",	null],	
+        [ 20,	"최염",	1438,	0,	null,	37,	54,	52,	0,	160,	300,	"대의",	null],	
+        [ 60,	"축융",	1439,	0,	null,	43,	64,	11,	0,	160,	300,	"정복",	"척사"],	
+        [ 60,	"타사대왕",	1440,	0,	null,	43,	55,	25,	0,	160,	300,	"출세",	"척사"],	
+        [124,	"태사자",	1441,	0,	null,	47,	70,	25,	0,	160,	300,	"대의",	"무쌍"],	
+        [124,	"태사향",	1442,	0,	null,	40,	53,	20,	0,	160,	300,	"재간",	null],	
+        [ 12,	"포륭",	1443,	0,	null,	41,	56,	10,	0,	160,	300,	"안전",	null],	
+        [ 74,	"풍습",	1444,	0,	null,	35,	64,	18,	0,	160,	300,	"재간",	null],	
+        [  7,	"하의",	1445,	0,	null,	39,	66,	11,	0,	160,	300,	"출세",	null],	
+        [121,	"하제",	1446,	0,	null,	48,	55,	24,	0,	160,	300,	"재간",	null],	
+        [ 90,	"하진",	1447,	0,	null,	39,	67,	15,	0,	160,	300,	"왕좌",	null],	
+        [ 24,	"하후덕",	1448,	0,	null,	45,	50,	16,	0,	160,	300,	"출세",	null],	
         [ 26,	"하후돈",	1449,	0,	null,	52,	67,	27,	0,	160,	300,	"의협",	"돌격",	"다 나오거라! 상대해 주마!"],
-        [ 19,	"하후무",	1450,	0,	null,	36,	33,	34,	0,	160,	300,	"안전",	null],
-        [ 24,	"하후상",	1451,	0,	null,	45,	24,	54,	0,	160,	300,	"출세",	null],
+        [ 19,	"하후무",	1450,	0,	null,	36,	33,	34,	0,	160,	300,	"안전",	null],	
+        [ 24,	"하후상",	1451,	0,	null,	45,	24,	54,	0,	160,	300,	"출세",	null],	
         [ 26,	"하후연",	1452,	0,	null,	49,	66,	22,	0,	160,	300,	"패권",	"궁병",	"궁술로 날 당해낼 자가 있을까? 후후."],
-        [ 26,	"하후위",	1453,	0,	null,	47,	57,	27,	0,	160,	300,	"정복",	null],
-        [ 26,	"하후은",	1454,	0,	null,	39,	51,	16,	0,	160,	300,	"안전",	null],
-        [ 23,	"하후패",	1455,	0,	null,	49,	64,	26,	0,	160,	300,	"대의",	null],
-        [ 20,	"하후현",	1456,	0,	null,	42,	11,	57,	0,	160,	300,	"유지",	null],
-        [ 26,	"하후혜",	1457,	0,	null,	48,	25,	58,	0,	160,	300,	"정복",	null],
-        [ 26,	"하후화",	1458,	0,	null,	49,	23,	60,	0,	160,	300,	"정복",	null],
-        [ 22,	"학소",	1459,	0,	null,	53,	30,	63,	0,	160,	300,	"대의",	"견고"],
-        [126,	"한당",	1460,	0,	null,	46,	52,	24,	0,	160,	300,	"할거",	null],
-        [ 93,	"한복",	1461,	0,	null,	45,	47,	17,	0,	160,	300,	"안전",	null],
-        [  8,	"한섬",	1462,	0,	null,	36,	62,	15,	0,	160,	300,	"출세",	null],
-        [ 48,	"한수",	1463,	0,	null,	45,	28,	58,	0,	160,	300,	"대의",	"기병"],
-        [ 40,	"한숭",	1464,	0,	null,	19,	11,	70,	0,	160,	300,	"재간",	null],
-        [  7,	"한충",	1465,	0,	null,	37,	66,	13,	0,	160,	300,	"안전",	null],
-        [  9,	"한현",	1466,	0,	null,	37,	61,	10,	0,	160,	300,	"유지",	null],
-        [ 27,	"한호",	1467,	0,	null,	43,	55,	18,	0,	160,	300,	"유지",	null],
-        [ 79,	"향랑",	1468,	0,	null,	40,	10,	58,	0,	160,	300,	"대의",	null],
-        [ 79,	"향총",	1469,	0,	null,	48,	17,	55,	0,	160,	300,	"왕좌",	null],
-        [139,	"허공",	1470,	0,	null,	45,	49,	23,	0,	160,	300,	"유지",	null],
-        [ 21,	"허유",	1471,	0,	null,	39,	47,	46,	0,	160,	300,	"재간",	null],
-        [ 23,	"허의",	1472,	0,	null,	30,	74,	19,	0,	160,	300,	"출세",	null],
-        [ 26,	"허저",	1473,	0,	null,	42,	70,	12,	0,	160,	300,	"정복",	"무쌍"],
-        [ 87,	"허정",	1474,	0,	null,	16,	13,	74,	0,	160,	300,	"재간",	null],
-        [ 12,	"형도영",	1475,	0,	null,	39,	78,	11,	0,	160,	300,	"출세",	null],
-        [148,	"호거아",	1476,	0,	null,	35,	76,	23,	0,	160,	300,	"안전",	null],
-        [ 76,	"호반",	1477,	0,	null,	43,	46,	18,	0,	160,	300,	"재간",	null],
-        [ 20,	"호분",	1478,	0,	null,	47,	23,	48,	0,	160,	300,	"할거",	null],
-        [ 27,	"호주천",	1479,	0,	null,	49,	57,	25,	0,	160,	300,	"정복",	null],
-        [ 20,	"호준",	1480,	0,	null,	45,	48,	18,	0,	160,	300,	"재간",	null],
-        [  2,	"화웅",	1481,	0,	null,	46,	64,	11,	0,	160,	300,	"출세",	"돌격"],
-        [131,	"화핵",	1482,	0,	null,	35,	12,	75,	0,	160,	300,	"안전",	null],
-        [ 10,	"화흠",	1483,	0,	null,	16,	17,	75,	0,	160,	300,	"출세",	null],
-        [ 21,	"환범",	1484,	0,	null,	18,	11,	81,	0,	160,	300,	"유지",	null],
-        [127,	"황개",	1485,	0,	null,	49,	63,	26,	0,	160,	300,	"왕좌",	"징병"],
-        [ 56,	"황권",	1486,	0,	null,	48,	18,	58,	0,	160,	300,	"대의",	null],
-        [ 41,	"황란",	1487,	0,	null,	28,	70,	11,	0,	160,	300,	"재간",	null],
-        [ 88,	"황보숭",	1488,	0,	null,	51,	24,	55,	0,	160,	300,	"왕좌",	null],
-        [ 72,	"황충",	1489,	0,	null,	51,	68,	25,	0,	160,	300,	"왕좌",	"궁병"],
-        [ 50,	"황호",	1490,	0,	null,	13,	9,	48,	0,	160,	300,	"안전",	null],
+        [ 26,	"하후위",	1453,	0,	null,	47,	57,	27,	0,	160,	300,	"정복",	null],	
+        [ 26,	"하후은",	1454,	0,	null,	39,	51,	16,	0,	160,	300,	"안전",	null],	
+        [ 23,	"하후패",	1455,	0,	null,	49,	64,	26,	0,	160,	300,	"대의",	null],	
+        [ 20,	"하후현",	1456,	0,	null,	42,	11,	57,	0,	160,	300,	"유지",	null],	
+        [ 26,	"하후혜",	1457,	0,	null,	48,	25,	58,	0,	160,	300,	"정복",	null],	
+        [ 26,	"하후화",	1458,	0,	null,	49,	23,	60,	0,	160,	300,	"정복",	null],	
+        [ 22,	"학소",	1459,	0,	null,	53,	30,	63,	0,	160,	300,	"대의",	"견고"],	
+        [126,	"한당",	1460,	0,	null,	46,	52,	24,	0,	160,	300,	"할거",	null],	
+        [ 93,	"한복",	1461,	0,	null,	45,	47,	17,	0,	160,	300,	"안전",	null],	
+        [  8,	"한섬",	1462,	0,	null,	36,	62,	15,	0,	160,	300,	"출세",	null],	
+        [ 48,	"한수",	1463,	0,	null,	45,	28,	58,	0,	160,	300,	"대의",	"기병"],	
+        [ 40,	"한숭",	1464,	0,	null,	19,	11,	67,	0,	160,	300,	"재간",	null],	
+        [  7,	"한충",	1465,	0,	null,	37,	66,	13,	0,	160,	300,	"안전",	null],	
+        [  9,	"한현",	1466,	0,	null,	37,	61,	10,	0,	160,	300,	"유지",	null],	
+        [ 27,	"한호",	1467,	0,	null,	43,	55,	18,	0,	160,	300,	"유지",	null],	
+        [ 79,	"향랑",	1468,	0,	null,	40,	10,	58,	0,	160,	300,	"대의",	null],	
+        [ 79,	"향총",	1469,	0,	null,	48,	17,	55,	0,	160,	300,	"왕좌",	null],	
+        [139,	"허공",	1470,	0,	null,	45,	49,	23,	0,	160,	300,	"유지",	null],	
+        [ 21,	"허유",	1471,	0,	null,	39,	47,	46,	0,	160,	300,	"재간",	null],	
+        [ 23,	"허의",	1472,	0,	null,	30,	68,	19,	0,	160,	300,	"출세",	null],	
+        [ 26,	"허저",	1473,	0,	null,	42,	70,	12,	0,	160,	300,	"정복",	"무쌍"],	
+        [ 87,	"허정",	1474,	0,	null,	16,	13,	68,	0,	160,	300,	"재간",	null],	
+        [ 12,	"형도영",	1475,	0,	null,	39,	68,	11,	0,	160,	300,	"출세",	null],	
+        [148,	"호거아",	1476,	0,	null,	35,	68,	23,	0,	160,	300,	"안전",	null],	
+        [ 76,	"호반",	1477,	0,	null,	43,	46,	18,	0,	160,	300,	"재간",	null],	
+        [ 20,	"호분",	1478,	0,	null,	47,	23,	48,	0,	160,	300,	"할거",	null],	
+        [ 27,	"호주천",	1479,	0,	null,	49,	57,	25,	0,	160,	300,	"정복",	null],	
+        [ 20,	"호준",	1480,	0,	null,	45,	48,	18,	0,	160,	300,	"재간",	null],	
+        [  2,	"화웅",	1481,	0,	null,	46,	64,	11,	0,	160,	300,	"출세",	"돌격"],	
+        [131,	"화핵",	1482,	0,	null,	35,	12,	68,	0,	160,	300,	"안전",	null],	
+        [ 10,	"화흠",	1483,	0,	null,	16,	17,	68,	0,	160,	300,	"출세",	null],	
+        [ 21,	"환범",	1484,	0,	null,	18,	11,	69,	0,	160,	300,	"유지",	null],	
+        [127,	"황개",	1485,	0,	null,	49,	63,	26,	0,	160,	300,	"왕좌",	"징병"],	
+        [ 56,	"황권",	1486,	0,	null,	48,	18,	58,	0,	160,	300,	"대의",	null],	
+        [ 41,	"황란",	1487,	0,	null,	28,	67,	11,	0,	160,	300,	"재간",	null],	
+        [ 88,	"황보숭",	1488,	0,	null,	51,	24,	55,	0,	160,	300,	"왕좌",	null],	
+        [ 72,	"황충",	1489,	0,	null,	51,	68,	25,	0,	160,	300,	"왕좌",	"궁병"],	
+        [ 50,	"황호",	1490,	0,	null,	13,	9,	48,	0,	160,	300,	"안전",	null],	
         [147,	"후성",	1491,	0,	null,	42,	49,	14,	0,	160,	300,	"정복",	null]
-    ],
+    ],	
     "general_ex":[
-        [123,	"가화",	1492,	0,	null,	40,	51,	16,	0,	160,	300,	null,	null],
-        [999,	"건석",	1493,	0,	null,	19,	7,	61,	0,	160,	300,	null,	null],
-        [999,	"견씨",	1494,	0,	null,	35,	11,	58,	0,	160,	300,	null,	null],
-        [ 40,	"견홍",	1495,	0,	null,	48,	55,	25,	0,	160,	300,	null,	null],
-        [120,	"고담",	1496,	0,	null,	33,	10,	69,	0,	160,	300,	null,	null],
-        [101,	"고유",	1497,	0,	null,	42,	18,	55,	0,	160,	300,	null,	null],
-        [132,	"곽마",	1498,	0,	null,	46,	54,	19,	0,	160,	300,	null,	null],
-        [ 39,	"관구수",	1499,	0,	null,	42,	49,	15,	0,	160,	300,	null,	null],
-        [ 39,	"관구전",	1500,	0,	null,	44,	22,	52,	0,	160,	300,	null,	null],
-        [999,	"관로",	1501,	0,	null,	44,	10,	57,	0,	160,	300,	null,	null],
-        [ 65,	"관정",	1502,	0,	null,	35,	20,	73,	0,	160,	300,	null,	null],
-        [137,	"교수",	1503,	0,	null,	45,	53,	16,	0,	160,	300,	null,	null],
-        [ 33,	"구건",	1504,	0,	null,	37,	22,	53,	0,	160,	300,	null,	null],
-        [ 41,	"구본",	1505,	0,	null,	40,	17,	54,	0,	160,	300,	null,	null],
-        [ 12,	"구성",	1506,	0,	null,	42,	54,	13,	0,	160,	300,	null,	null],
-        [ 21,	"국연",	1507,	0,	null,	40,	10,	54,	0,	160,	300,	null,	null],
-        [ 99,	"국의",	1508,	0,	null,	51,	59,	20,	0,	160,	300,	null,	null],
-        [ 34,	"금의",	1509,	0,	null,	16,	16,	63,	0,	160,	300,	null,	null],
-        [ 76,	"나헌",	1510,	0,	null,	52,	25,	57,	0,	160,	300,	null,	null],
-        [999,	"남두",	1511,	0,	null,	35,	11,	54,	0,	160,	300,	null,	null],
-        [ 54,	"냉포",	1512,	0,	null,	46,	61,	26,	0,	160,	300,	null,	null],
-        [124,	"노숙2",	1513,	0,	null,	46,	21,	57,	0,	160,	300,	null,	null],
-        [ 42,	"누규",	1514,	0,	null,	41,	9,	64,	0,	160,	300,	null,	null],
-        [  6,	"누반",	1515,	0,	null,	45,	57,	16,	0,	160,	300,	null,	null],
-        [130,	"누현",	1516,	0,	null,	22,	10,	68,	0,	160,	300,	null,	null],
-        [ 40,	"당균",	1517,	0,	null,	33,	9,	81,	0,	160,	300,	null,	null],
-        [ 32,	"당빈",	1518,	0,	null,	46,	56,	24,	0,	160,	300,	null,	null],
-        [999,	"대교",	1519,	0,	null,	37,	6,	44,	0,	160,	300,	null,	null],
-        [ 28,	"대릉",	1520,	0,	null,	44,	57,	18,	0,	160,	300,	null,	null],
-        [129,	"동조",	1521,	0,	null,	14,	8,	51,	0,	160,	300,	null,	null],
-        [114,	"등수",	1522,	0,	null,	35,	10,	44,	0,	160,	300,	null,	null],
-        [ 50,	"마막",	1523,	0,	null,	20,	17,	5,	0,	160,	300,	null,	null],
-        [116,	"만욱",	1524,	0,	null,	18,	9,	66,	0,	160,	300,	null,	null],
-        [120,	"맹종",	1525,	0,	null,	39,	19,	52,	0,	160,	300,	null,	null],
-        [ 38,	"문호",	1526,	0,	null,	45,	56,	18,	0,	160,	300,	null,	null],
-        [999,	"미씨",	1527,	0,	null,	43,	8,	52,	0,	160,	300,	null,	null],
-        [ 39,	"반림",	1528,	0,	null,	45,	59,	6,	0,	160,	300,	null,	null],
-        [129,	"반장",	1529,	0,	null,	49,	58,	26,	0,	160,	300,	null,	null],
-        [ 94,	"방열",	1530,	0,	null,	42,	61,	12,	0,	160,	300,	null,	null],
-        [ 55,	"방희",	1531,	0,	null,	43,	16,	53,	0,	160,	300,	null,	null],
-        [ 30,	"배수",	1532,	0,	null,	7,	7,	77,	0,	160,	300,	null,	null],
-        [  8,	"번능",	1533,	0,	null,	46,	48,	19,	0,	160,	300,	null,	null],
-        [999,	"번씨",	1534,	0,	null,	31,	9,	45,	0,	160,	300,	null,	null],
-        [ 49,	"보도근",	1535,	0,	null,	44,	55,	20,	0,	160,	300,	null,	null],
-        [129,	"보천",	1536,	0,	null,	46,	23,	55,	0,	160,	300,	null,	null],
-        [121,	"보협",	1537,	0,	null,	47,	21,	57,	0,	160,	300,	null,	null],
-        [ 28,	"부하",	1538,	0,	null,	38,	15,	63,	0,	160,	300,	null,	null],
-        [ 26,	"비요",	1539,	0,	null,	46,	25,	55,	0,	160,	300,	null,	null],
-        [ 31,	"사마주",	1540,	0,	null,	44,	21,	49,	0,	160,	300,	null,	null],
-        [ 41,	"사찬",	1541,	0,	null,	43,	54,	21,	0,	160,	300,	null,	null],
-        [128,	"설후",	1542,	0,	null,	14,	8,	71,	0,	160,	300,	null,	null],
-        [ 36,	"성공영",	1543,	0,	null,	47,	22,	60,	0,	160,	300,	null,	null],
-        [126,	"성만",	1544,	0,	null,	43,	53,	25,	0,	160,	300,	null,	null],
-        [999,	"소교",	1545,	0,	null,	42,	11,	51,	0,	160,	300,	null,	null],
-        [ 46,	"소유",	1546,	0,	null,	40,	48,	19,	0,	160,	300,	null,	null],
-        [ 31,	"소제2",	1547,	0,	null,	20,	8,	78,	0,	160,	300,	null,	null],
-        [126,	"손교",	1548,	0,	null,	49,	23,	53,	0,	160,	300,	null,	null],
-        [116,	"손기",	1549,	0,	null,	44,	51,	20,	0,	160,	300,	null,	null],
-        [999,	"손상향",	1550,	0,	null,	47,	49,	17,	0,	160,	300,	null,	null],
-        [125,	"손익",	1551,	0,	null,	46,	57,	12,	0,	160,	300,	null,	null],
-        [125,	"손진",	1552,	0,	null,	44,	54,	19,	0,	160,	300,	null,	null],
-        [123,	"송겸",	1553,	0,	null,	43,	40,	18,	0,	160,	300,	null,	null],
-        [ 85,	"순심",	1554,	0,	null,	18,	10,	79,	0,	160,	300,	null,	null],
-        [ 31,	"순욱2",	1555,	0,	null,	7,	8,	77,	0,	160,	300,	null,	null],
-        [ 31,	"순의",	1556,	0,	null,	14,	7,	73,	0,	160,	300,	null,	null],
-        [129,	"시삭",	1557,	0,	null,	35,	66,	18,	0,	160,	300,	null,	null],
-        [ 29,	"신창",	1558,	0,	null,	40,	13,	39,	0,	160,	300,	null,	null],
-        [999,	"악신",	1559,	0,	null,	41,	7,	39,	0,	160,	300,	null,	null],
-        [138,	"악취",	1560,	0,	null,	42,	52,	22,	0,	160,	300,	null,	null],
-        [138,	"양강",	1561,	0,	null,	44,	54,	17,	0,	160,	300,	null,	null],
-        [ 21,	"양부",	1562,	0,	null,	46,	21,	63,	0,	160,	300,	null,	null],
-        [ 72,	"양서",	1563,	0,	null,	42,	24,	51,	0,	160,	300,	null,	null],
-        [ 34,	"양습",	1564,	0,	null,	45,	19,	55,	0,	160,	300,	null,	null],
-        [ 16,	"양앙",	1565,	0,	null,	45,	54,	16,	0,	160,	300,	null,	null],
-        [ 17,	"양임",	1566,	0,	null,	47,	58,	22,	0,	160,	300,	null,	null],
-        [ 32,	"양제",	1567,	0,	null,	46,	24,	54,	0,	160,	300,	null,	null],
-        [ 33,	"양조2",	1568,	0,	null,	45,	23,	52,	0,	160,	300,	null,	null],
-        [ 48,	"양추2",	1569,	0,	null,	45,	52,	23,	0,	160,	300,	null,	null],
-        [140,	"양홍",	1570,	0,	null,	17,	9,	76,	0,	160,	300,	null,	null],
-        [ 31,	"양혼",	1571,	0,	null,	43,	52,	24,	0,	160,	300,	null,	null],
-        [123,	"여거",	1572,	0,	null,	47,	22,	53,	0,	160,	300,	null,	null],
-        [130,	"여대",	1573,	0,	null,	51,	55,	26,	0,	160,	300,	null,	null],
-        [136,	"염상",	1574,	0,	null,	28,	12,	69,	0,	160,	300,	null,	null],
-        [ 36,	"염행",	1575,	0,	null,	46,	63,	16,	0,	160,	300,	null,	null],
-        [ 73,	"영수",	1576,	0,	null,	46,	26,	56,	0,	160,	300,	null,	null],
-        [ 39,	"오거",	1577,	0,	null,	39,	49,	14,	0,	160,	300,	null,	null],
-        [126,	"오경",	1578,	0,	null,	47,	48,	22,	0,	160,	300,	null,	null],
-        [999,	"오국태",	1579,	0,	null,	30,	7,	60,	0,	160,	300,	null,	null],
-        [126,	"오찬",	1580,	0,	null,	46,	17,	58,	0,	160,	300,	null,	null],
-        [ 23,	"온회",	1581,	0,	null,	37,	16,	58,	0,	160,	300,	null,	null],
-        [ 21,	"왕기2",	1582,	0,	null,	46,	51,	24,	0,	160,	300,	null,	null],
-        [ 32,	"왕도",	1583,	0,	null,	39,	18,	54,	0,	160,	300,	null,	null],
-        [123,	"왕돈",	1584,	0,	null,	43,	51,	17,	0,	160,	300,	null,	null],
-        [ 34,	"왕릉",	1585,	0,	null,	47,	23,	54,	0,	160,	300,	null,	null],
-        [ 63,	"왕문",	1586,	0,	null,	44,	52,	14,	0,	160,	300,	null,	null],
-        [ 32,	"왕상",	1587,	0,	null,	24,	9,	65,	0,	160,	300,	null,	null],
-        [ 34,	"왕숙",	1588,	0,	null,	35,	10,	80,	0,	160,	300,	null,	null],
-        [ 33,	"왕업",	1589,	0,	null,	31,	5,	46,	0,	160,	300,	null,	null],
-        [ 35,	"왕충",	1590,	0,	null,	37,	46,	10,	0,	160,	300,	null,	null],
-        [  1,	"우보",	1591,	0,	null,	37,	49,	7,	0,	160,	300,	null,	null],
-        [122,	"우사",	1592,	0,	null,	46,	14,	59,	0,	160,	300,	null,	null],
-        [138,	"원요",	1593,	0,	null,	38,	17,	39,	0,	160,	300,	null,	null],
-        [ 95,	"원유",	1594,	0,	null,	42,	16,	55,	0,	160,	300,	null,	null],
-        [ 31,	"위관",	1595,	0,	null,	46,	18,	60,	0,	160,	300,	null,	null],
-        [129,	"위막",	1596,	0,	null,	42,	49,	23,	0,	160,	300,	null,	null],
-        [ 55,	"유괴",	1597,	0,	null,	48,	55,	25,	0,	160,	300,	null,	null],
-        [129,	"유략",	1598,	0,	null,	47,	52,	23,	0,	160,	300,	null,	null],
-        [ 45,	"유반",	1599,	0,	null,	48,	59,	19,	0,	160,	300,	null,	null],
-        [ 29,	"유복",	1600,	0,	null,	41,	20,	55,	0,	160,	300,	null,	null],
-        [ 78,	"유선2",	1601,	0,	null,	6,	10,	39,	0,	160,	300,	null,	null],
-        [139,	"유섭",	1602,	0,	null,	44,	59,	12,	0,	160,	300,	null,	null],
-        [ 28,	"유소",	1603,	0,	null,	45,	20,	55,	0,	160,	300,	null,	null],
-        [128,	"유승",	1604,	0,	null,	38,	53,	13,	0,	160,	300,	null,	null],
-        [129,	"유찬",	1605,	0,	null,	48,	57,	25,	0,	160,	300,	null,	null],
-        [129,	"유평",	1606,	0,	null,	45,	54,	25,	0,	160,	300,	null,	null],
-        [138,	"유훈",	1607,	0,	null,	40,	50,	20,	0,	160,	300,	null,	null],
-        [ 48,	"이감",	1608,	0,	null,	43,	52,	14,	0,	160,	300,	null,	null],
-        [ 19,	"이승",	1609,	0,	null,	11,	12,	32,	0,	160,	300,	null,	null],
-        [ 22,	"이통",	1610,	0,	null,	48,	62,	20,	0,	160,	300,	null,	null],
-        [138,	"이풍2",	1611,	0,	null,	47,	58,	20,	0,	160,	300,	null,	null],
-        [ 20,	"이풍3",	1612,	0,	null,	22,	11,	71,	0,	160,	300,	null,	null],
-        [ 29,	"장구",	1613,	0,	null,	46,	54,	19,	0,	160,	300,	null,	null],
-        [ 21,	"장기",	1614,	0,	null,	49,	15,	59,	0,	160,	300,	null,	null],
-        [ 74,	"장남",	1615,	0,	null,	47,	50,	16,	0,	160,	300,	null,	null],
-        [100,	"장막",	1616,	0,	null,	41,	20,	54,	0,	160,	300,	null,	null],
-        [  7,	"장만성",	1617,	0,	null,	47,	61,	19,	0,	160,	300,	null,	null],
-        [135,	"장반",	1618,	0,	null,	42,	55,	25,	0,	160,	300,	null,	null],
-        [ 78,	"장빈",	1619,	0,	null,	29,	12,	67,	0,	160,	300,	null,	null],
-        [124,	"장승",	1620,	0,	null,	48,	26,	57,	0,	160,	300,	null,	null],
-        [999,	"장양2",	1621,	0,	null,	42,	42,	19,	0,	160,	300,	null,	null],
-        [ 68,	"장억",	1622,	0,	null,	50,	60,	21,	0,	160,	300,	null,	null],
-        [ 75,	"장준",	1623,	0,	null,	45,	52,	25,	0,	160,	300,	null,	null],
-        [ 20,	"장집",	1624,	0,	null,	30,	12,	74,	0,	160,	300,	null,	null],
-        [ 39,	"장특",	1625,	0,	null,	47,	21,	56,	0,	160,	300,	null,	null],
-        [ 96,	"저곡",	1626,	0,	null,	42,	21,	52,	0,	160,	300,	null,	null],
-        [128,	"전기",	1627,	0,	null,	40,	53,	21,	0,	160,	300,	null,	null],
-        [ 23,	"전만",	1628,	0,	null,	40,	56,	16,	0,	160,	300,	null,	null],
-        [128,	"전상",	1629,	0,	null,	2,	5,	11,	0,	160,	300,	null,	null],
-        [130,	"전역",	1630,	0,	null,	43,	49,	15,	0,	160,	300,	null,	null],
-        [ 75,	"전예",	1631,	0,	null,	50,	24,	61,	0,	160,	300,	null,	null],
-        [ 64,	"전해",	1632,	0,	null,	47,	49,	22,	0,	160,	300,	null,	null],
-        [123,	"정봉2",	1633,	0,	null,	45,	52,	20,	0,	160,	300,	null,	null],
-        [ 22,	"정의",	1634,	0,	null,	15,	4,	66,	0,	160,	300,	null,	null],
-        [ 81,	"제갈교",	1635,	0,	null,	41,	9,	58,	0,	160,	300,	null,	null],
-        [ 40,	"제갈서",	1636,	0,	null,	38,	37,	12,	0,	160,	300,	null,	null],
-        [ 25,	"조충",	1637,	0,	null,	12,	5,	80,	0,	160,	300,	null,	null],
-        [121,	"종리목",	1638,	0,	null,	51,	26,	57,	0,	160,	300,	null,	null],
-        [ 22,	"종육",	1639,	0,	null,	26,	7,	71,	0,	160,	300,	null,	null],
-        [122,	"좌혁",	1640,	0,	null,	43,	51,	20,	0,	160,	300,	null,	null],
-        [ 36,	"주령",	1641,	0,	null,	49,	54,	26,	0,	160,	300,	null,	null],
-        [115,	"주앙",	1642,	0,	null,	48,	24,	24,	0,	160,	300,	null,	null],
-        [ 52,	"주포",	1643,	0,	null,	43,	55,	7,	0,	160,	300,	null,	null],
-        [ 11,	"주흔",	1644,	0,	null,	45,	21,	58,	0,	160,	300,	null,	null],
-        [140,	"진기",	1645,	0,	null,	42,	52,	18,	0,	160,	300,	null,	null],
-        [142,	"진란",	1646,	0,	null,	45,	54,	17,	0,	160,	300,	null,	null],
-        [ 25,	"진랑",	1647,	0,	null,	42,	54,	16,	0,	160,	300,	null,	null],
-        [ 12,	"진응",	1648,	0,	null,	44,	53,	19,	0,	160,	300,	null,	null],
-        [124,	"진표",	1649,	0,	null,	44,	19,	56,	0,	160,	300,	null,	null],
-        [999,	"채염",	1650,	0,	null,	36,	10,	50,	0,	160,	300,	null,	null],
-        [999,	"초선",	1651,	0,	null,	45,	8,	55,	0,	160,	300,	null,	null],
-        [135,	"초이",	1652,	0,	null,	41,	51,	21,	0,	160,	300,	null,	null],
-        [ 65,	"추단",	1653,	0,	null,	44,	54,	15,	0,	160,	300,	null,	null],
-        [999,	"추씨",	1654,	0,	null,	35,	7,	54,	0,	160,	300,	null,	null],
-        [ 71,	"추정",	1655,	0,	null,	45,	25,	51,	0,	160,	300,	null,	null],
-        [145,	"파재",	1656,	0,	null,	46,	57,	20,	0,	160,	300,	null,	null],
-        [ 22,	"포신",	1657,	0,	null,	49,	23,	61,	0,	160,	300,	null,	null],
-        [114,	"하식",	1658,	0,	null,	16,	38,	13,	0,	160,	300,	null,	null],
-        [ 36,	"하안",	1659,	0,	null,	3,	12,	72,	0,	160,	300,	null,	null],
-        [999,	"하후씨",	1660,	0,	null,	28,	8,	47,	0,	160,	300,	null,	null],
-        [  5,	"학맹",	1661,	0,	null,	42,	51,	17,	0,	160,	300,	null,	null],
-        [ 98,	"한거자",	1662,	0,	null,	41,	47,	13,	0,	160,	300,	null,	null],
-        [ 19,	"한덕",	1663,	0,	null,	44,	59,	11,	0,	160,	300,	null,	null],
-        [140,	"한윤",	1664,	0,	null,	26,	11,	68,	0,	160,	300,	null,	null],
-        [999,	"허소",	1665,	0,	null,	41,	12,	48,	0,	160,	300,	null,	null],
-        [ 30,	"호열",	1666,	0,	null,	49,	26,	57,	0,	160,	300,	null,	null],
-        [ 76,	"호제",	1667,	0,	null,	42,	17,	52,	0,	160,	300,	null,	null],
-        [149,	"호진",	1668,	0,	null,	45,	58,	7,	0,	160,	300,	null,	null],
-        [ 29,	"호질",	1669,	0,	null,	47,	20,	57,	0,	160,	300,	null,	null],
-        [  7,	"환계",	1670,	0,	null,	9,	11,	67,	0,	160,	300,	null,	null],
-        [ 56,	"황숭",	1671,	0,	null,	46,	24,	56,	0,	160,	300,	null,	null],
-        [999,	"황승언",	1672,	0,	null,	46,	9,	60,	0,	160,	300,	null,	null],
-        [999,	"황월영",	1673,	0,	null,	42,	8,	57,	0,	160,	300,	null,	null],
-        [ 45,	"황조",	1674,	0,	null,	48,	51,	22,	0,	160,	300,	null,	null],
-        [ 48,	"후선",	1675,	0,	null,	42,	51,	15,	0,	160,	300,	null,	null],
-        [  8,	"휴고",	1676,	0,	null,	43,	55,	16,	0,	160,	300,	null,	null],
-        [ 98,	"휴원진",	1677,	0,	null,	41,	49,	16,	0,	160,	300,	null,	null],
-        [ 22,	"희지재",	1678,	0,	null,	23,	5,	86,	0,	160,	300,	null,	null]
+        [123,	"가화",	1492,	0,	null,	40,	51,	16,	0,	160,	300,	null,	null],	
+        [999,	"건석",	1493,	0,	null,	19,	7,	61,	0,	160,	300,	null,	null],	
+        [999,	"견씨",	1494,	0,	null,	35,	11,	58,	0,	160,	300,	null,	null],	
+        [ 40,	"견홍",	1495,	0,	null,	48,	55,	25,	0,	160,	300,	null,	null],	
+        [120,	"고담",	1496,	0,	null,	33,	10,	67,	0,	160,	300,	null,	null],	
+        [101,	"고유",	1497,	0,	null,	42,	18,	55,	0,	160,	300,	null,	null],	
+        [132,	"곽마",	1498,	0,	null,	46,	54,	19,	0,	160,	300,	null,	null],	
+        [ 39,	"관구수",	1499,	0,	null,	42,	49,	15,	0,	160,	300,	null,	null],	
+        [ 39,	"관구전",	1500,	0,	null,	44,	22,	52,	0,	160,	300,	null,	null],	
+        [999,	"관로",	1501,	0,	null,	44,	10,	57,	0,	160,	300,	null,	null],	
+        [ 65,	"관정",	1502,	0,	null,	35,	20,	67,	0,	160,	300,	null,	null],	
+        [137,	"교수",	1503,	0,	null,	45,	53,	16,	0,	160,	300,	null,	null],	
+        [ 33,	"구건",	1504,	0,	null,	37,	56,	53,	0,	160,	300,	null,	null],	
+        [ 41,	"구본",	1505,	0,	null,	40,	17,	54,	0,	160,	300,	null,	null],	
+        [ 12,	"구성",	1506,	0,	null,	42,	54,	13,	0,	160,	300,	null,	null],	
+        [ 21,	"국연",	1507,	0,	null,	40,	10,	54,	0,	160,	300,	null,	null],	
+        [ 99,	"국의",	1508,	0,	null,	51,	59,	20,	0,	160,	300,	null,	null],	
+        [ 34,	"금의",	1509,	0,	null,	16,	16,	63,	0,	160,	300,	null,	null],	
+        [ 76,	"나헌",	1510,	0,	null,	52,	25,	57,	0,	160,	300,	null,	null],	
+        [999,	"남두",	1511,	0,	null,	35,	11,	54,	0,	160,	300,	null,	null],	
+        [ 54,	"냉포",	1512,	0,	null,	46,	61,	26,	0,	160,	300,	null,	null],	
+        [124,	"노숙2",	1513,	0,	null,	46,	21,	57,	0,	160,	300,	null,	null],	
+        [ 42,	"누규",	1514,	0,	null,	41,	9,	64,	0,	160,	300,	null,	null],	
+        [  6,	"누반",	1515,	0,	null,	45,	57,	16,	0,	160,	300,	null,	null],	
+        [130,	"누현",	1516,	0,	null,	22,	10,	66,	0,	160,	300,	null,	null],	
+        [ 40,	"당균",	1517,	0,	null,	33,	9,	69,	0,	160,	300,	null,	null],	
+        [ 32,	"당빈",	1518,	0,	null,	46,	56,	24,	0,	160,	300,	null,	null],	
+        [999,	"대교",	1519,	0,	null,	37,	6,	54,	0,	160,	300,	null,	null],	
+        [ 28,	"대릉",	1520,	0,	null,	44,	57,	18,	0,	160,	300,	null,	null],	
+        [129,	"동조",	1521,	0,	null,	14,	8,	51,	0,	160,	300,	null,	null],	
+        [114,	"등수",	1522,	0,	null,	35,	10,	44,	0,	160,	300,	null,	null],	
+        [ 50,	"마막",	1523,	0,	null,	20,	17,	5,	0,	160,	300,	null,	null],	
+        [116,	"만욱",	1524,	0,	null,	18,	9,	66,	0,	160,	300,	null,	null],	
+        [120,	"맹종",	1525,	0,	null,	39,	19,	66,	0,	160,	300,	null,	null],	
+        [ 38,	"문호",	1526,	0,	null,	45,	56,	18,	0,	160,	300,	null,	null],	
+        [999,	"미씨",	1527,	0,	null,	43,	8,	52,	0,	160,	300,	null,	null],	
+        [ 39,	"반림",	1528,	0,	null,	45,	59,	6,	0,	160,	300,	null,	null],	
+        [129,	"반장",	1529,	0,	null,	49,	58,	26,	0,	160,	300,	null,	null],	
+        [ 94,	"방열",	1530,	0,	null,	42,	61,	12,	0,	160,	300,	null,	null],	
+        [ 55,	"방희",	1531,	0,	null,	43,	16,	53,	0,	160,	300,	null,	null],	
+        [ 30,	"배수",	1532,	0,	null,	7,	7,	68,	0,	160,	300,	null,	null],	
+        [  8,	"번능",	1533,	0,	null,	46,	48,	19,	0,	160,	300,	null,	null],	
+        [999,	"번씨",	1534,	0,	null,	31,	9,	45,	0,	160,	300,	null,	null],	
+        [ 49,	"보도근",	1535,	0,	null,	44,	55,	20,	0,	160,	300,	null,	null],	
+        [129,	"보천",	1536,	0,	null,	46,	23,	55,	0,	160,	300,	null,	null],	
+        [121,	"보협",	1537,	0,	null,	47,	21,	57,	0,	160,	300,	null,	null],	
+        [ 28,	"부하",	1538,	0,	null,	38,	15,	69,	0,	160,	300,	null,	null],	
+        [ 26,	"비요",	1539,	0,	null,	46,	25,	55,	0,	160,	300,	null,	null],	
+        [ 31,	"사마주",	1540,	0,	null,	44,	21,	49,	0,	160,	300,	null,	null],	
+        [ 41,	"사찬",	1541,	0,	null,	43,	54,	21,	0,	160,	300,	null,	null],	
+        [128,	"설후",	1542,	0,	null,	14,	8,	67,	0,	160,	300,	null,	null],	
+        [ 36,	"성공영",	1543,	0,	null,	47,	22,	60,	0,	160,	300,	null,	null],	
+        [126,	"성만",	1544,	0,	null,	43,	53,	25,	0,	160,	300,	null,	null],	
+        [999,	"소교",	1545,	0,	null,	42,	11,	51,	0,	160,	300,	null,	null],	
+        [ 46,	"소유",	1546,	0,	null,	40,	48,	19,	0,	160,	300,	null,	null],	
+        [ 31,	"소제2",	1547,	0,	null,	20,	8,	68,	0,	160,	300,	null,	null],	
+        [126,	"손교",	1548,	0,	null,	49,	23,	53,	0,	160,	300,	null,	null],	
+        [116,	"손기",	1549,	0,	null,	44,	51,	20,	0,	160,	300,	null,	null],	
+        [999,	"손상향",	1550,	0,	null,	47,	49,	17,	0,	160,	300,	null,	null],	
+        [125,	"손익",	1551,	0,	null,	46,	57,	12,	0,	160,	300,	null,	null],	
+        [125,	"손진",	1552,	0,	null,	44,	54,	19,	0,	160,	300,	null,	null],	
+        [123,	"송겸",	1553,	0,	null,	43,	40,	18,	0,	160,	300,	null,	null],	
+        [ 85,	"순심",	1554,	0,	null,	18,	10,	68,	0,	160,	300,	null,	null],	
+        [ 31,	"순욱2",	1555,	0,	null,	7,	8,	68,	0,	160,	300,	null,	null],	
+        [ 31,	"순의",	1556,	0,	null,	14,	7,	67,	0,	160,	300,	null,	null],	
+        [129,	"시삭",	1557,	0,	null,	35,	66,	18,	0,	160,	300,	null,	null],	
+        [ 29,	"신창",	1558,	0,	null,	40,	13,	39,	0,	160,	300,	null,	null],	
+        [999,	"악신",	1559,	0,	null,	41,	7,	39,	0,	160,	300,	null,	null],	
+        [138,	"악취",	1560,	0,	null,	42,	52,	22,	0,	160,	300,	null,	null],	
+        [138,	"양강",	1561,	0,	null,	44,	54,	17,	0,	160,	300,	null,	null],	
+        [ 21,	"양부",	1562,	0,	null,	46,	21,	63,	0,	160,	300,	null,	null],	
+        [ 72,	"양서",	1563,	0,	null,	42,	24,	51,	0,	160,	300,	null,	null],	
+        [ 34,	"양습",	1564,	0,	null,	45,	19,	55,	0,	160,	300,	null,	null],	
+        [ 16,	"양앙",	1565,	0,	null,	45,	54,	16,	0,	160,	300,	null,	null],	
+        [ 17,	"양임",	1566,	0,	null,	47,	58,	22,	0,	160,	300,	null,	null],	
+        [ 32,	"양제",	1567,	0,	null,	46,	24,	54,	0,	160,	300,	null,	null],	
+        [ 33,	"양조2",	1568,	0,	null,	45,	23,	52,	0,	160,	300,	null,	null],	
+        [ 48,	"양추2",	1569,	0,	null,	45,	52,	23,	0,	160,	300,	null,	null],	
+        [140,	"양홍",	1570,	0,	null,	17,	9,	68,	0,	160,	300,	null,	null],	
+        [ 31,	"양혼",	1571,	0,	null,	43,	52,	24,	0,	160,	300,	null,	null],	
+        [123,	"여거",	1572,	0,	null,	47,	22,	53,	0,	160,	300,	null,	null],	
+        [130,	"여대",	1573,	0,	null,	51,	55,	26,	0,	160,	300,	null,	null],	
+        [136,	"염상",	1574,	0,	null,	28,	12,	67,	0,	160,	300,	null,	null],	
+        [ 36,	"염행",	1575,	0,	null,	46,	63,	16,	0,	160,	300,	null,	null],	
+        [ 73,	"영수",	1576,	0,	null,	46,	26,	56,	0,	160,	300,	null,	null],	
+        [ 39,	"오거",	1577,	0,	null,	39,	63,	14,	0,	160,	300,	null,	null],	
+        [126,	"오경",	1578,	0,	null,	47,	48,	22,	0,	160,	300,	null,	null],	
+        [999,	"오국태",	1579,	0,	null,	30,	7,	60,	0,	160,	300,	null,	null],	
+        [126,	"오찬",	1580,	0,	null,	46,	17,	58,	0,	160,	300,	null,	null],	
+        [ 23,	"온회",	1581,	0,	null,	37,	16,	68,	0,	160,	300,	null,	null],	
+        [ 21,	"왕기2",	1582,	0,	null,	46,	51,	24,	0,	160,	300,	null,	null],	
+        [ 32,	"왕도",	1583,	0,	null,	39,	18,	67,	0,	160,	300,	null,	null],	
+        [123,	"왕돈",	1584,	0,	null,	43,	51,	17,	0,	160,	300,	null,	null],	
+        [ 34,	"왕릉",	1585,	0,	null,	47,	23,	54,	0,	160,	300,	null,	null],	
+        [ 63,	"왕문",	1586,	0,	null,	44,	52,	14,	0,	160,	300,	null,	null],	
+        [ 32,	"왕상",	1587,	0,	null,	24,	9,	65,	0,	160,	300,	null,	null],	
+        [ 34,	"왕숙",	1588,	0,	null,	35,	10,	68,	0,	160,	300,	null,	null],	
+        [ 33,	"왕업",	1589,	0,	null,	31,	5,	46,	0,	160,	300,	null,	null],	
+        [ 35,	"왕충",	1590,	0,	null,	37,	58,	10,	0,	160,	300,	null,	null],	
+        [  1,	"우보",	1591,	0,	null,	37,	63,	7,	0,	160,	300,	null,	null],	
+        [122,	"우사",	1592,	0,	null,	46,	14,	59,	0,	160,	300,	null,	null],	
+        [138,	"원요",	1593,	0,	null,	38,	42,	39,	0,	160,	300,	null,	null],	
+        [ 95,	"원유",	1594,	0,	null,	42,	16,	55,	0,	160,	300,	null,	null],	
+        [ 31,	"위관",	1595,	0,	null,	46,	18,	60,	0,	160,	300,	null,	null],	
+        [129,	"위막",	1596,	0,	null,	42,	49,	23,	0,	160,	300,	null,	null],	
+        [ 55,	"유괴",	1597,	0,	null,	48,	55,	25,	0,	160,	300,	null,	null],	
+        [129,	"유략",	1598,	0,	null,	47,	52,	23,	0,	160,	300,	null,	null],	
+        [ 45,	"유반",	1599,	0,	null,	48,	59,	19,	0,	160,	300,	null,	null],	
+        [ 29,	"유복",	1600,	0,	null,	41,	20,	55,	0,	160,	300,	null,	null],	
+        [ 78,	"유선2",	1601,	0,	null,	6,	10,	39,	0,	160,	300,	null,	null],	
+        [139,	"유섭",	1602,	0,	null,	44,	59,	12,	0,	160,	300,	null,	null],	
+        [ 28,	"유소",	1603,	0,	null,	45,	20,	55,	0,	160,	300,	null,	null],	
+        [128,	"유승",	1604,	0,	null,	38,	67,	13,	0,	160,	300,	null,	null],	
+        [129,	"유찬",	1605,	0,	null,	48,	57,	25,	0,	160,	300,	null,	null],	
+        [129,	"유평",	1606,	0,	null,	45,	54,	25,	0,	160,	300,	null,	null],	
+        [138,	"유훈",	1607,	0,	null,	40,	50,	20,	0,	160,	300,	null,	null],	
+        [ 48,	"이감",	1608,	0,	null,	43,	52,	14,	0,	160,	300,	null,	null],	
+        [ 19,	"이승",	1609,	0,	null,	11,	26,	31,	0,	160,	300,	null,	null],	
+        [ 22,	"이통",	1610,	0,	null,	48,	62,	20,	0,	160,	300,	null,	null],	
+        [138,	"이풍2",	1611,	0,	null,	47,	58,	20,	0,	160,	300,	null,	null],	
+        [ 20,	"이풍3",	1612,	0,	null,	22,	11,	67,	0,	160,	300,	null,	null],	
+        [ 29,	"장구",	1613,	0,	null,	46,	54,	19,	0,	160,	300,	null,	null],	
+        [ 21,	"장기",	1614,	0,	null,	49,	15,	59,	0,	160,	300,	null,	null],	
+        [ 74,	"장남",	1615,	0,	null,	47,	50,	16,	0,	160,	300,	null,	null],	
+        [100,	"장막",	1616,	0,	null,	41,	20,	54,	0,	160,	300,	null,	null],	
+        [  7,	"장만성",	1617,	0,	null,	47,	61,	19,	0,	160,	300,	null,	null],	
+        [135,	"장반",	1618,	0,	null,	42,	55,	25,	0,	160,	300,	null,	null],	
+        [ 78,	"장빈",	1619,	0,	null,	29,	12,	66,	0,	160,	300,	null,	null],	
+        [124,	"장승",	1620,	0,	null,	48,	26,	57,	0,	160,	300,	null,	null],	
+        [999,	"장양2",	1621,	0,	null,	42,	42,	19,	0,	160,	300,	null,	null],	
+        [ 68,	"장억",	1622,	0,	null,	50,	60,	21,	0,	160,	300,	null,	null],	
+        [ 75,	"장준",	1623,	0,	null,	45,	52,	25,	0,	160,	300,	null,	null],	
+        [ 20,	"장집",	1624,	0,	null,	30,	12,	68,	0,	160,	300,	null,	null],	
+        [ 39,	"장특",	1625,	0,	null,	47,	21,	56,	0,	160,	300,	null,	null],	
+        [ 96,	"저곡",	1626,	0,	null,	42,	21,	52,	0,	160,	300,	null,	null],	
+        [128,	"전기",	1627,	0,	null,	40,	53,	21,	0,	160,	300,	null,	null],	
+        [ 23,	"전만",	1628,	0,	null,	40,	56,	16,	0,	160,	300,	null,	null],	
+        [128,	"전상",	1629,	0,	null,	2,	5,	11,	0,	160,	300,	null,	null],	
+        [130,	"전역",	1630,	0,	null,	43,	49,	15,	0,	160,	300,	null,	null],	
+        [ 75,	"전예",	1631,	0,	null,	50,	24,	61,	0,	160,	300,	null,	null],	
+        [ 64,	"전해",	1632,	0,	null,	47,	49,	22,	0,	160,	300,	null,	null],	
+        [123,	"정봉2",	1633,	0,	null,	45,	52,	20,	0,	160,	300,	null,	null],	
+        [ 22,	"정의",	1634,	0,	null,	15,	4,	66,	0,	160,	300,	null,	null],	
+        [ 81,	"제갈교",	1635,	0,	null,	41,	9,	58,	0,	160,	300,	null,	null],	
+        [ 40,	"제갈서",	1636,	0,	null,	38,	43,	12,	0,	160,	300,	null,	null],	
+        [ 25,	"조충",	1637,	0,	null,	12,	5,	68,	0,	160,	300,	null,	null],	
+        [121,	"종리목",	1638,	0,	null,	51,	26,	57,	0,	160,	300,	null,	null],	
+        [ 22,	"종육",	1639,	0,	null,	26,	7,	67,	0,	160,	300,	null,	null],	
+        [122,	"좌혁",	1640,	0,	null,	43,	51,	20,	0,	160,	300,	null,	null],	
+        [ 36,	"주령",	1641,	0,	null,	49,	54,	26,	0,	160,	300,	null,	null],	
+        [115,	"주앙",	1642,	0,	null,	48,	24,	24,	0,	160,	300,	null,	null],	
+        [ 52,	"주포",	1643,	0,	null,	43,	55,	7,	0,	160,	300,	null,	null],	
+        [ 11,	"주흔",	1644,	0,	null,	45,	21,	58,	0,	160,	300,	null,	null],	
+        [140,	"진기",	1645,	0,	null,	42,	52,	18,	0,	160,	300,	null,	null],	
+        [142,	"진란",	1646,	0,	null,	45,	54,	17,	0,	160,	300,	null,	null],	
+        [ 25,	"진랑",	1647,	0,	null,	42,	54,	16,	0,	160,	300,	null,	null],	
+        [ 12,	"진응",	1648,	0,	null,	44,	53,	19,	0,	160,	300,	null,	null],	
+        [124,	"진표",	1649,	0,	null,	44,	19,	56,	0,	160,	300,	null,	null],	
+        [999,	"채염",	1650,	0,	null,	36,	10,	64,	0,	160,	300,	null,	null],	
+        [999,	"초선",	1651,	0,	null,	45,	8,	55,	0,	160,	300,	null,	null],	
+        [135,	"초이",	1652,	0,	null,	41,	51,	21,	0,	160,	300,	null,	null],	
+        [ 65,	"추단",	1653,	0,	null,	44,	54,	15,	0,	160,	300,	null,	null],	
+        [999,	"추씨",	1654,	0,	null,	35,	7,	54,	0,	160,	300,	null,	null],	
+        [ 71,	"추정",	1655,	0,	null,	45,	25,	51,	0,	160,	300,	null,	null],	
+        [145,	"파재",	1656,	0,	null,	46,	57,	20,	0,	160,	300,	null,	null],	
+        [ 22,	"포신",	1657,	0,	null,	49,	23,	61,	0,	160,	300,	null,	null],	
+        [114,	"하식",	1658,	0,	null,	16,	38,	13,	0,	160,	300,	null,	null],	
+        [ 36,	"하안",	1659,	0,	null,	3,	12,	67,	0,	160,	300,	null,	null],	
+        [999,	"하후씨",	1660,	0,	null,	28,	8,	47,	0,	160,	300,	null,	null],	
+        [  5,	"학맹",	1661,	0,	null,	42,	51,	17,	0,	160,	300,	null,	null],	
+        [ 98,	"한거자",	1662,	0,	null,	41,	47,	13,	0,	160,	300,	null,	null],	
+        [ 19,	"한덕",	1663,	0,	null,	44,	59,	11,	0,	160,	300,	null,	null],	
+        [140,	"한윤",	1664,	0,	null,	26,	11,	66,	0,	160,	300,	null,	null],	
+        [999,	"허소",	1665,	0,	null,	41,	12,	48,	0,	160,	300,	null,	null],	
+        [ 30,	"호열",	1666,	0,	null,	49,	26,	57,	0,	160,	300,	null,	null],	
+        [ 76,	"호제",	1667,	0,	null,	42,	17,	52,	0,	160,	300,	null,	null],	
+        [149,	"호진",	1668,	0,	null,	45,	58,	7,	0,	160,	300,	null,	null],	
+        [ 29,	"호질",	1669,	0,	null,	47,	20,	57,	0,	160,	300,	null,	null],	
+        [  7,	"환계",	1670,	0,	null,	9,	11,	66,	0,	160,	300,	null,	null],	
+        [ 56,	"황숭",	1671,	0,	null,	46,	24,	56,	0,	160,	300,	null,	null],	
+        [999,	"황승언",	1672,	0,	null,	46,	9,	60,	0,	160,	300,	null,	null],	
+        [999,	"황월영",	1673,	0,	null,	42,	8,	57,	0,	160,	300,	null,	null],	
+        [ 45,	"황조",	1674,	0,	null,	48,	51,	22,	0,	160,	300,	null,	null],	
+        [ 48,	"후선",	1675,	0,	null,	42,	51,	15,	0,	160,	300,	null,	null],	
+        [  8,	"휴고",	1676,	0,	null,	43,	55,	16,	0,	160,	300,	null,	null],	
+        [ 98,	"휴원진",	1677,	0,	null,	41,	49,	16,	0,	160,	300,	null,	null],	
+        [ 22,	"희지재",	1678,	0,	null,	23,	5,	69,	0,	160,	300,	null,	null]
     ],
     "cities":[
 
diff --git a/hwe/templates/commandButton.php b/hwe/templates/commandButton.php
index 583aa89c..830e0e12 100644
--- a/hwe/templates/commandButton.php
+++ b/hwe/templates/commandButton.php
@@ -3,7 +3,7 @@
     <a href='b_nationboard.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>회 의 실</button></a>
     <a href='b_chiefboard.php'><button class='commandButton' <?=$meLevel>=5?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>기 밀 실</button></a>
     <a href='b_troop.php'><button class='commandButton' <?=($meLevel>=1&&$nationLevel>=1)?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>부대 편성</button></a>
-    <a href='b_myBossInfo.php'><button class='commandButton' <?=($meLevel>=1&&$nationLevel>=1)?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>인 사 부</button></a>
+    <a href='b_myBossInfo.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>인 사 부</button></a>
     <a href='b_dipcenter.php'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>내 무 부</button></a>
     <a href='b_chiefcenter.php'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>사 령 부</button></a>
     <a href='b_genList.php' target='_blank'><button class='commandButton' <?=$showSecret?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>암 행 부</button></a>
@@ -14,7 +14,7 @@
 <div>
 
     <a href='b_myKingdomInfo.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>세력 정보</button></a>
-    <a href='b_myCityInfo.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>세력 도시</button></a>
+    <a href='b_myCityInfo.php'><button class='commandButton' <?=($meLevel>=1&&$nationLevel>=1)?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>세력 도시</button></a>
     <a href='b_myGenInfo.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>세력 장수</button></a>
     <a href='b_nationrule.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>국 법</button></a>
     <a href='b_diplomacy.php'><button class='commandButton' style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>중원 정보</button></a>

From 131a6cb6c30965ca043fc1d39e1b39ec46539113 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 23:08:51 +0900
Subject: [PATCH 118/184] =?UTF-8?q?=EA=B1=B4=EA=B5=AD=20=EB=B2=84=EA=B7=B8?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/preprocessing.php | 16 +---------------
 hwe/processing.php    |  2 +-
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/hwe/preprocessing.php b/hwe/preprocessing.php
index 3bc5ecb5..8f807e08 100644
--- a/hwe/preprocessing.php
+++ b/hwe/preprocessing.php
@@ -19,24 +19,10 @@ extractMissingPostToGlobals();
 increaseRefresh("턴입력", 1);
 
 if(!$turn || $commandtype === null){
-    header('location:./');
+    header('location:commandlist.php');
     die();
 }
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
-
-$query = "select no,name,nation,con from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
-if($con >= 2) { 
-    header('location:./');
-    exit();
- }
-
 $count = count($turn);
 for($i=0; $i < $count; $i++) {
     if($turn[$i] == 100 || $turn[$i] == 99 || $turn[$i] == 98) {
diff --git a/hwe/processing.php b/hwe/processing.php
index ff27ec54..a28bf6e5 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -1552,7 +1552,7 @@ function command_46($turn, $command) {
             continue;
         }
 
-        if(isset($nationcolor[$nation['color']])){
+        if(!isset($nationcolor[$nation['color']])){
             $nationcolor[$nation['color']] = 1;
         }
         else{

From 556e1059f999e7b4e1f4cb6c65b4648b5e7d69e7 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 23:19:29 +0900
Subject: [PATCH 119/184] =?UTF-8?q?=EC=9D=B8=EC=82=AC=EB=B6=80=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95=20=EB=A9=94=EC=9D=B8=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=EC=9E=AC=EC=95=BC=20?=
 =?UTF-8?q?=EC=9D=B8=EC=82=AC=20=EC=97=90=EB=9F=AC=20=EC=95=88=EB=82=98?=
 =?UTF-8?q?=EA=B2=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_myBossInfo.php  |  9 +++++++--
 hwe/func_template.php | 10 ++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/hwe/b_myBossInfo.php b/hwe/b_myBossInfo.php
index 06fe7f51..3cbdf3e8 100644
--- a/hwe/b_myBossInfo.php
+++ b/hwe/b_myBossInfo.php
@@ -205,7 +205,10 @@ if($meLevel >= 5 && $nation['l11set'] == 0) {
     $query = "select name,city from general where nation='{$me['nation']}' and level='11'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
-    echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
+    if($general){
+        echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
+    }
+    
 }
 echo "
         </td>
@@ -257,7 +260,9 @@ for($i=10; $i >= $lv; $i--) {
         $query = "select name,city from general where nation='{$me['nation']}' and level={$i}";
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $general = MYDB_fetch_array($result);
-        echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
+        if($general){
+            echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
+        }
     }
     echo "</td></form>";
     if($i % 2 == 1) { echo "</tr>"; }
diff --git a/hwe/func_template.php b/hwe/func_template.php
index 908e0cf2..ad13fe60 100644
--- a/hwe/func_template.php
+++ b/hwe/func_template.php
@@ -101,10 +101,12 @@ function commandButton() {
     $db = DB::db();
     $me = $db->queryFirstRow("select no,nation,level,belong from general where owner=%i", $userID);
 
-    $nation = $db->queryFirstRow("select nation,level,color,secretlimit from nation where nation=%i",$me['nation']);
-
-    if($nation['color'] == "") { $nation['color'] = "#000000"; }
-
+    $nation = $db->queryFirstRow("select nation,level,color,secretlimit from nation where nation=%i",$me['nation'])??[
+        'nation'=>0,
+        'level'=>0,
+        'secretlimit'=>99,
+        'color'=>'#000000'
+    ];
 
     $bgColor = Util::array_get($nation['color'])?:'#000000';
     $fgColor = newColor($bgColor);

From 36409cf0667ed8182a8fafb260e1a7ebe58f3273 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 21 Apr 2018 23:47:02 +0900
Subject: [PATCH 120/184] =?UTF-8?q?game,=20nation,=20city,=20general?=
 =?UTF-8?q?=EC=9D=84=20myisam=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sql/schema.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index 25e12be8..0f0071e4 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -159,7 +159,7 @@ CREATE TABLE `general` (
 	INDEX `npcid` (`npcid`)
 )
 DEFAULT CHARSET=utf8mb4
-ENGINE=InnoDB;
+ENGINE=MyISAM;
 
 ###########################################################################
 ## 국가 테이블
@@ -272,7 +272,7 @@ create table nation (
   l8turn11 char(14) default '00000000000099', l7turn11 char(14) default '00000000000099', l6turn11 char(14) default '00000000000099', l5turn11 char(14) default '00000000000099',
 
   PRIMARY KEY (nation)
-) ENGINE=INNODB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
 
 ###########################################################################
 ## 도시 테이블
@@ -315,7 +315,7 @@ create table city (
 
   PRIMARY KEY (city),
   KEY (nation)
-) ENGINE=INNODB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
 
 ###########################################################################
 ## 부대 테이블
@@ -404,7 +404,7 @@ CREATE TABLE `game` (
 	`bet14` INT(8) NULL DEFAULT '0',
 	`bet15` INT(8) NULL DEFAULT '0',
 	PRIMARY KEY (`no`)
-) ENGINE=INNODB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
 
 ###########################################################################
 ## 메시지 테이블

From d73c0c6f0c5c0ba56fbfd72738a98f8f7dc3ddb4 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 22 Apr 2018 01:32:25 +0900
Subject: [PATCH 121/184] =?UTF-8?q?=EB=82=A8=EA=B7=80=EB=B3=91=EC=9D=B4=20?=
 =?UTF-8?q?=EA=B8=B0=EC=88=A0=201=EB=93=B1=EA=B8=89=20=EB=B3=91=EC=A2=85?=
 =?UTF-8?q?=EC=9D=B4=EC=97=88=EB=8B=A4=EB=8B=88!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/GameUnitConst.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/sammo/GameUnitConst.php b/hwe/sammo/GameUnitConst.php
index aad1bf30..ebffaada 100644
--- a/hwe/sammo/GameUnitConst.php
+++ b/hwe/sammo/GameUnitConst.php
@@ -73,7 +73,7 @@ class GameUnitConst{
             [32, '백귀병',    80, 130, 7,  5,  9, 11, 2, '오환', true, ['저렴하고 튼튼합니다.']],
             [33, '흑귀병',   130,  80, 7,  5, 11,  9, 2, '왜', true, ['저렴하고 강력합니다.']],
             [34, '악귀병',   130, 130, 7,  0, 12, 12, 2, '장안', true, ['백병전에도 능숙합니다.']],
-            [35, '남귀병',    60,  60, 7, 10,  8,  8, 0, 0, false, ['전투를 포기하고 계략에 몰두합니다.']],
+            [35, '남귀병',    60,  60, 7, 10,  8,  8, 0, 1000, false, ['전투를 포기하고 계략에 몰두합니다.']],
             [36, '황귀병',   110, 110, 7,  0, 13, 10, 2, '낙양', true, ['고도로 훈련된 귀병입니다.']],
             [37, '천귀병',    80, 130, 7, 15, 11, 12, 2, '성도', true, ['갑주를 두른 귀병입니다.']],
             [38, '마귀병',   130,  80, 7, 15, 12, 11, 2, '업', true, ['날카로운 무기를 가진 귀병입니다.']],

From 31f1eb2d285700e69e9690679c3351bbfdef9540 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 22 Apr 2018 02:18:51 +0900
Subject: [PATCH 122/184] =?UTF-8?q?=ED=84=B4=20=EC=8B=A4=ED=96=89=20?=
 =?UTF-8?q?=EB=8D=B0=EB=AA=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/run_daemon.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/run_daemon.py

diff --git a/src/run_daemon.py b/src/run_daemon.py
new file mode 100644
index 00000000..37f9fb42
--- /dev/null
+++ b/src/run_daemon.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+
+import os
+import glob
+import urllib.request
+
+basepath = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+hiddenList = []
+
+for path in glob.glob(basepath+'/*/.htaccess'):
+    hiddenList.append(os.path.dirname(path))
+
+webBase = 'http://127.0.0.1'
+for line in open(basepath+'/d_shared/common_path.js'):
+    if not "root:" in line:
+        continue
+    webBase = line[line.find('root:')+5:-1]
+    webBase = webBase.strip('\'",')
+    break
+
+for path in glob.glob(basepath+'/*/d_setting/DB.php'):
+    servPath = os.path.dirname(os.path.dirname(path))
+    if servPath in hiddenList:
+        continue
+
+    servRelPath = os.path.relpath(servPath, basepath)
+
+    webPath = webBase + '/' + servRelPath + '/proc.php'
+    print(webPath)
+
+
+
+
+    obj = urllib.request.urlopen(webPath)
+    res = obj.read()

From 3a84e0d064dd703e4ed6bc422daf6af0aef11aa4 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 22 Apr 2018 02:35:21 +0900
Subject: [PATCH 123/184] =?UTF-8?q?run=5Fdaemon=20=EA=B3=A0=EB=8F=84?=
 =?UTF-8?q?=ED=99=94.=201=EB=B6=84=EC=97=90=204=EB=B2=88=20=EB=B6=80?=
 =?UTF-8?q?=EB=A6=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/run_daemon.py | 70 +++++++++++++++++++++++++++++------------------
 1 file changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/run_daemon.py b/src/run_daemon.py
index 37f9fb42..9e00ebf3 100644
--- a/src/run_daemon.py
+++ b/src/run_daemon.py
@@ -1,35 +1,51 @@
 #!/usr/bin/env python3
 
 import os
+import time
 import glob
 import urllib.request
+import concurrent.futures
 
-basepath = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-hiddenList = []
-
-for path in glob.glob(basepath+'/*/.htaccess'):
-    hiddenList.append(os.path.dirname(path))
-
-webBase = 'http://127.0.0.1'
-for line in open(basepath+'/d_shared/common_path.js'):
-    if not "root:" in line:
-        continue
-    webBase = line[line.find('root:')+5:-1]
-    webBase = webBase.strip('\'",')
-    break
-
-for path in glob.glob(basepath+'/*/d_setting/DB.php'):
-    servPath = os.path.dirname(os.path.dirname(path))
-    if servPath in hiddenList:
-        continue
-
-    servRelPath = os.path.relpath(servPath, basepath)
-
-    webPath = webBase + '/' + servRelPath + '/proc.php'
+def run(webPath):
     print(webPath)
-
-
-
-
     obj = urllib.request.urlopen(webPath)
-    res = obj.read()
+    obj.read()
+
+def main():
+    basepath = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    hiddenList = []
+
+    for path in glob.glob(basepath+'/*/.htaccess'):
+        hiddenList.append(os.path.dirname(path))
+
+    webBase = 'http://127.0.0.1'
+    for line in open(basepath+'/d_shared/common_path.js'):
+        if not "root:" in line:
+            continue
+        webBase = line[line.find('root:')+5:-1]
+        webBase = webBase.strip(' \'",')
+        break
+
+    servList = []
+    for path in glob.glob(basepath+'/*/d_setting/DB.php'):
+        servPath = os.path.dirname(os.path.dirname(path))
+        if servPath in hiddenList:
+            continue
+
+        servRelPath = os.path.relpath(servPath, basepath)
+        webPath = webBase + '/' + servRelPath + '/proc.php'
+        servList.append(webPath)
+
+    with concurrent.futures.ThreadPoolExecutor(max_workers=len(servList)) as executor:
+        waiters=[]
+        for _ in range(4):
+            for webPath in servList:
+                future = executor.submit(run, webPath)
+                waiters.append(future)
+            time.sleep(15)
+        for future in waiters:
+            future.done()
+
+if __name__ == "__main__":
+    # execute only if run as a script
+    main()

From a4beab86c2a1cae6da94d424283a9cbf86f9ca8d Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 22 Apr 2018 12:24:42 +0900
Subject: [PATCH 124/184] =?UTF-8?q?=EB=8F=84=EC=8B=9C=20=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=20=ED=84=B4=20=EC=8B=9C=EA=B0=84=EA=B0=92=EC=9D=84=20+1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_currentCity.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index bb594fce..f31bcc07 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -323,7 +323,8 @@ for($j=0; $j < $gencount; $j++) {
 
     if($ourGeneral && !$isNPC){
         $turnText = [];
-        foreach(getTurn($general, 1) as $turnIdx=>$turn){
+        foreach(getTurn($general, 1) as $turnRawIdx=>$turn){
+            $turnIdx = $turnRawIdx+1;
             $turnText[] = "{$turnIdx} : $turn";
         }
         $turnText = join('<br>', $turnText);

From b3cd29ac95367dc6c64932b0986d835c93e9d747 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Mon, 23 Apr 2018 01:21:05 +0900
Subject: [PATCH 125/184] =?UTF-8?q?=EB=AA=85=EC=A0=84=20=ED=85=8C=EC=9D=B4?=
 =?UTF-8?q?=EB=B8=94=EC=97=90=20unique=20index=EA=B0=80=20=EC=95=88?=
 =?UTF-8?q?=EA=B1=B8=EB=A0=A4=EC=9E=88=EB=8D=98=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sql/schema.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index 0f0071e4..a0810ca1 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -437,7 +437,8 @@ create table if not exists hall (
   color char(12) default '',
   picture char(32) default '',
 
-  PRIMARY KEY (no)
+  PRIMARY KEY (no),
+  UNIQUE INDEX `type` (`type`, `rank`)
   ) ENGINE=INNODB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
 
 ###########################################################################

From 603599d666d301dfb3268a78d3b43d3ce76b3d64 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Mon, 23 Apr 2018 23:48:59 +0900
Subject: [PATCH 126/184] =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20?=
 =?UTF-8?q?=ED=9B=84=20=EC=84=9C=EB=B2=84=EB=A5=BC=20=EB=8B=AB=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 j_updateServer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/j_updateServer.php b/j_updateServer.php
index 3f8a5c5c..01724280 100644
--- a/j_updateServer.php
+++ b/j_updateServer.php
@@ -152,7 +152,7 @@ $result = Util::generateFileUsingSimpleTemplate(
 );
 
 
-AppConf::getList()[$server]->closeServer();
+//AppConf::getList()[$server]->closeServer();
 
 Json::die([
     'server'=>$server,

From 9c266b7b1c0b1bdafd70ada4563bec26f1482ac8 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Mon, 23 Apr 2018 23:51:02 +0900
Subject: [PATCH 127/184] =?UTF-8?q?=EB=B6=88=EA=B0=80=EC=B9=A8=20=EC=88=98?=
 =?UTF-8?q?=EB=9D=BD=20=EB=85=84=EB=8F=84=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20?=
 =?UTF-8?q?=EC=95=88=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/DiplomaticMessage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php
index 6d4ea7fc..101893bd 100644
--- a/hwe/sammo/DiplomaticMessage.php
+++ b/hwe/sammo/DiplomaticMessage.php
@@ -90,8 +90,8 @@ class DiplomaticMessage extends Message{
         $mylog[] = "<C>●</><D><b>{$this->src->nationName}</b></>(와)과 <C>$year</>년 불가침에 합의했습니다.";
         pushGenLog(['no'=>$this->dest->generalID], $mylog);
         pushGenLog(['no'=>$this->src->generalID], $youlog);
-        pushGeneralHistory(['no'=>$this->src->generalID], "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->dest->nationName}</b></>(와)과 {$when}년 불가침 성공");
-        pushGeneralHistory(['no'=>$this->dest->generalID], "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->src->nationName}</b></>(와)과 {$when}년 불가침 수락");
+        pushGeneralHistory(['no'=>$this->src->generalID], "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->dest->nationName}</b></>(와)과 {$year}년 불가침 성공");
+        pushGeneralHistory(['no'=>$this->dest->generalID], "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->src->nationName}</b></>(와)과 {$year}년 불가침 수락");
 
         return $chk;
     }

From 230fc5ba530eb41aa8f5390505f871a73c317ced Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Mon, 23 Apr 2018 23:51:47 +0900
Subject: [PATCH 128/184] =?UTF-8?q?=ED=9B=BC=EC=84=AD=EC=9D=80=20=EB=8B=AB?=
 =?UTF-8?q?=ED=9E=88=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=EB=A7=88=EC=A0=80=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 j_updateServer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/j_updateServer.php b/j_updateServer.php
index 01724280..76115a2e 100644
--- a/j_updateServer.php
+++ b/j_updateServer.php
@@ -99,7 +99,7 @@ if($server == $baseServerName){
         ], true
     );
 
-    AppConf::getList()[$server]->closeServer();
+    //AppConf::getList()[$server]->closeServer();
 
     Json::die([
         'server'=>$server,

From 99b459766a5bcdc6dfa67bfb28309be51b4292e5 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 24 Apr 2018 00:53:26 +0900
Subject: [PATCH 129/184] =?UTF-8?q?=EB=AC=B4=EC=A7=80=EC=9E=A5=20=ED=97=8C?=
 =?UTF-8?q?=EB=82=A9=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80=20=ED=8F=AC?=
 =?UTF-8?q?=EC=83=81=20=EB=A1=9C=EC=A7=81=EC=97=90=EC=84=9C=20=EB=AC=B4?=
 =?UTF-8?q?=EC=A7=80=EC=9E=A5.=20=EC=82=AC=EB=A7=9D=20=EC=98=88=EC=A0=95?=
 =?UTF-8?q?=EC=9E=A5=EC=9D=80=20=EC=A0=9C=EC=99=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 43 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 3aea1334..7c7ce4c0 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -627,7 +627,7 @@ function processAI($no) {
                     } else {    // 포상
                         // 포상 대상
                         list($npcGenID, $npcGenValue) = $db->queryFirstList(
-                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND npc >= 2 ORDER BY %b ASC LIMIT 1',
+                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND npc >= 2 AND killturn > 5 AND leader >= 40 ORDER BY %b ASC LIMIT 1',
                             $type,
                             $general['nation'],
                             $general['no'],
@@ -636,7 +636,7 @@ function processAI($no) {
                         );
 
                         list($userGenID, $userGenValue) = $db->queryFirstList(
-                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND npc < 2 ORDER BY %b ASC LIMIT 1',
+                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND npc < 2 AND killturn > 5 ORDER BY %b ASC LIMIT 1',
                             $type,
                             $general['nation'],
                             $general['no'],
@@ -709,6 +709,43 @@ function processAI($no) {
             MYDB_query($query, $connect) or Error("processAI23 ".MYDB_error($connect),"");
             return;
         }
+
+        $resrc = $tech * 700;//XXX: 왜 700이지?
+
+        if($general['leader'] < 40){
+            //무지장인데
+            
+            if(
+                (($nation['rice'] - GameConst::$baserice) * 3 <= $general['rice'] && $general['rice'] >= $resrc + 2100) ||
+                ($general['rice'] >= 11000)
+            ){
+                //쌀을 많이 들고 있다면
+                $amount = $general['rice'] * 0.9;
+                $amount = intdiv(Util::valueFit($amount, $resrc + 700, 10000), 100);
+
+                $command = EncodeCommand(0, 2, $amount, 44);  //헌납
+                $db->update('general', [
+                    'turn0'=>$command
+                ], 'no=%i',$general['no']);
+                return;
+            }
+
+            if(
+                (($nation['gold'] - GameConst::$basegold) * 3 <= $general['gold'] && $general['gold'] >= $resrc + 2100) ||
+                ($general['gold'] >= 12000)
+            ){
+                //금을 많이 들고 있다면
+                $amount = $general['gold'] * 0.9;
+                $amount = intdiv(Util::valueFit($amount, $resrc + 700, 10000), 100);
+                
+                $command = EncodeCommand(0, 1, $amount, 44);  //헌납
+                $db->update('general', [
+                    'turn0'=>$command
+                ], 'no=%i',$general['no']);
+                return;
+            }
+        }
+
         //국가 병량이 없을때 바로 헌납
         if($nation['rice'] < 2000 && $general['rice'] > 200) {
             $amount = intdiv($general['rice'] - 200, 100) + 1;
@@ -727,7 +764,7 @@ function processAI($no) {
 //    ┃조┃        ┃쌀삼
 //   0┗━┻━━━━┻━━━> G
 //       100       700
-        $resrc = $tech * 700;
+        
         $target = array();
         // 평시거나 초반아니면서 공격가능 없으면서 병사 있으면 해제(25%)
         if($dipState == 0 && $isStart == 0 && $attackable == 0 && $general['crew'] > 0 && rand()% 100 < 25) {

From 388afe6fb45ce4236a54ff8ebf2b352053c663fa Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 24 Apr 2018 01:15:05 +0900
Subject: [PATCH 130/184] =?UTF-8?q?CityHelper=EC=97=90=EC=84=9C=20getAllNa?=
 =?UTF-8?q?tionCities=EA=B0=80=20=EC=98=AC=EB=B0=94=EB=A5=B4=EA=B2=8C=20?=
 =?UTF-8?q?=EB=8F=99=EC=9E=91=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8D=98=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/CityHelper.php | 7 ++++---
 hwe/sammo/Scenario.php   | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hwe/sammo/CityHelper.php b/hwe/sammo/CityHelper.php
index 1bad62bb..de664322 100644
--- a/hwe/sammo/CityHelper.php
+++ b/hwe/sammo/CityHelper.php
@@ -29,13 +29,14 @@ class CityHelper{
         foreach (DB::db()->query('SELECT `city` as `id`, `name`, `level`, `nation` from city') as $city) {
             $id = $city['id'];
             $name = $city['name'];
+            $nationID = $city['nation'];
             $list[$id] = $city;
             $listInv[$city['name']] = $city;
 
-            if(!key_exists($id, $listByNation)){
-                $listByNation[$id] = [];
+            if(!key_exists($nationID, $listByNation)){
+                $listByNation[$nationID] = [];
             }
-            $listByNation[$id][] = $city;
+            $listByNation[$nationID][] = $city;
         }
 
         self::$list = $list;
diff --git a/hwe/sammo/Scenario.php b/hwe/sammo/Scenario.php
index b3cad337..deb28cdd 100644
--- a/hwe/sammo/Scenario.php
+++ b/hwe/sammo/Scenario.php
@@ -312,6 +312,8 @@ class Scenario{
 
             $nation->build($env);
         }
+        
+        refreshNationStaticInfo();
         CityHelper::flushCache();
 
         $remainGenerals = $this->buildGenerals($env);

From 48207b93002d9ac2e29f80bd1abece15b0f7ebd2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 24 Apr 2018 01:58:07 +0900
Subject: [PATCH 131/184] =?UTF-8?q?=ED=8F=AC=EC=83=81=20=EC=A1=B0=EA=B1=B4?=
 =?UTF-8?q?=20=EC=9E=AC=20=EC=88=98=EC=A0=95.=20=EB=AC=B4=EC=A7=80?=
 =?UTF-8?q?=EC=9E=A5=EC=9D=B4=EB=9D=BC=EB=8F=84=20=EA=B8=88=EC=8C=80?=
 =?UTF-8?q?=EC=9D=B4=20=EB=84=88=EB=AC=B4=20=EC=A0=81=EC=9C=BC=EB=A9=B4=20?=
 =?UTF-8?q?=EC=A3=BC=EA=B8=B4=20=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 7c7ce4c0..69d93ab1 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -261,6 +261,7 @@ function processAI($no) {
     }
 
     $tech = getTechCost($nation['tech']);
+    $resrc = $tech * 700;//XXX: 왜 700이지?
 
     if($general['atmos'] >= 90 && $general['train'] >= 90) {
         if($general['mode'] == 0) {
@@ -626,12 +627,13 @@ function processAI($no) {
                         }
                     } else {    // 포상
                         // 포상 대상
-                        list($npcGenID, $npcGenValue) = $db->queryFirstList(
-                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND npc >= 2 AND killturn > 5 AND leader >= 40 ORDER BY %b ASC LIMIT 1',
+                        list($npcGenID, $npcGenValue, $npcLeadership) = $db->queryFirstList(
+                            'SELECT `no`, %b, leader FROM general WHERE nation=%i AND `no`!=%i AND npc >= 2 AND killturn > 5 AND (leader >= 40 OR %b < %i) ORDER BY %b ASC LIMIT 1',
                             $type,
                             $general['nation'],
                             $general['no'],
                             $type,
+                            $resrc,
                             $type
                         );
 
@@ -640,7 +642,6 @@ function processAI($no) {
                             $type,
                             $general['nation'],
                             $general['no'],
-                            $type,
                             $type
                         );
 
@@ -657,6 +658,10 @@ function processAI($no) {
                         if ($genID) {
                             if($genID === $npcGenID){
                                 $amount = min(100, intdiv(($nation[$type]-GameConst::$baserice), 5000)*10 + 10);
+                                if($npcLeadership < 40){
+                                    $amount = min($amount, intdiv($resrc, 1000)*10 + 10);
+                                }
+                                
                             }
                             else{
                                 $amount = min(100, intdiv(($nation[$type]-GameConst::$baserice), 2000)*10 + 10);
@@ -710,8 +715,6 @@ function processAI($no) {
             return;
         }
 
-        $resrc = $tech * 700;//XXX: 왜 700이지?
-
         if($general['leader'] < 40){
             //무지장인데
             

From ddb4011b5d8317e4eb5b1498674411a642874fb9 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 24 Apr 2018 02:12:04 +0900
Subject: [PATCH 132/184] =?UTF-8?q?=EB=AA=B0=EC=88=98=20=EC=A1=B0=EA=B1=B4?=
 =?UTF-8?q?=20=EA=B0=95=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 69d93ab1..63f16a0f 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -587,7 +587,7 @@ function processAI($no) {
                     if(rand() % 2 == 0) { $type = "gold"; $type2 = 1; }
                     else { $type = "rice"; $type2 = 2; }
 
-                    if($nation[$type] < $type2*2000) {  // 몰수
+                    if($nation[$type] < $type2*3000) {  // 몰수
                         // 몰수 대상
                         list($npcGenID, $npcGenValue) = $db->queryFirstList(
                             'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND %b>3000 AND npc >= 2 ORDER BY %b DESC LIMIT 1',
@@ -657,14 +657,14 @@ function processAI($no) {
 
                         if ($genID) {
                             if($genID === $npcGenID){
-                                $amount = min(100, intdiv(($nation[$type]-GameConst::$baserice), 5000)*10 + 10);
+                                $amount = min(100, intdiv(($nation[$type]-($type=='rice'?(GameConst::$baserice):(GameConst::$basegold))), 5000)*10 + 10);
                                 if($npcLeadership < 40){
                                     $amount = min($amount, intdiv($resrc, 1000)*10 + 10);
                                 }
                                 
                             }
                             else{
-                                $amount = min(100, intdiv(($nation[$type]-GameConst::$baserice), 2000)*10 + 10);
+                                $amount = min(100, intdiv(($nation[$type]-($type=='rice'?(GameConst::$baserice):(GameConst::$basegold))), 2000)*10 + 10);
                             }
                             
                             // 포상

From 717c576cbaa044654cb2481a4ef786d817e49f09 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 24 Apr 2018 02:16:50 +0900
Subject: [PATCH 133/184] =?UTF-8?q?n=EC=9E=A5=20=EB=81=BC=EB=A6=AC=20?=
 =?UTF-8?q?=ED=8F=AC=EC=83=81=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20=EC=95=88?=
 =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 63f16a0f..2793e17f 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -648,7 +648,7 @@ function processAI($no) {
                         if($npcGenID === null && $userGenID === null){
                             $genID = 0;
                         }
-                        else if($npcGenID === null || $userGenValue < $npcGenValue * 3){
+                        else if($npcGenID === null || ($userGenValue !== null && $userGenValue < $npcGenValue * 3)){
                             $genID = $userGenID;
                         }
                         else{

From 3da256cc29ca649aadea1d889cecb084e07225db Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 00:05:08 +0900
Subject: [PATCH 134/184] =?UTF-8?q?=ED=86=A0=EB=84=88=EB=A8=BC=ED=8A=B8=20?=
 =?UTF-8?q?=ED=83=80=EC=9D=B4=ED=8B=80=20=EC=A0=95=EB=B3=B4=20=EC=95=BD?=
 =?UTF-8?q?=EA=B0=84=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_betting.php       | 8 +++++++-
 hwe/b_tournament.php    | 8 +++++++-
 hwe/func_tournament.php | 2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/hwe/b_betting.php b/hwe/b_betting.php
index 4c9a9e1a..cb80cc32 100644
--- a/hwe/b_betting.php
+++ b/hwe/b_betting.php
@@ -37,7 +37,13 @@ case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "itl"; $tp2 = "
 
 $str1 = getTournament($admin['tournament']);
 $str2 = getTournamentTime();
+if($str2){
+    $str2 = ', '+$str2;
+}
 $str3 = getTournamentTerm();
+if($str3){
+    $str3 = ', '+$str3;
+}
 
 ?>
 <!DOCTYPE html>
@@ -67,7 +73,7 @@ select { font-family:'굴림'; line-height:100%; }
 </table>
 <table align=center width=1120 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:10px;word-break:break-all; id=bg0>
     <tr><td colspan=16><input type=button value='갱신' onclick='location.reload()'></td></tr>
-    <tr><td colspan=16 align=center><font color=white size=6><?=$tnmt_type?> (<?=$str1.", ".$str2.", ".$str3?>)</font></td></tr>
+    <tr><td colspan=16 align=center><font color=white size=6><?=$tnmt_type?> (<?=$str1.$str2.$str3?>)</font></td></tr>
     <tr><td height=50 colspan=16 align=center id=bg2><font color=limegreen size=6>16강 상황</font><br><font color=orange size=3>(전체 금액 : <?=$admin['bet']?> / 내 투자 금액 : <?=$me['bet']?>)</font></td></tr>
 </table>
 <table align=center width=1120 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:10px;word-break:break-all; id=bg0>
diff --git a/hwe/b_tournament.php b/hwe/b_tournament.php
index d06b5d78..aa90fe70 100644
--- a/hwe/b_tournament.php
+++ b/hwe/b_tournament.php
@@ -176,10 +176,16 @@ if ($session->userGrade >= 5) {
 
 $str1 = getTournament($admin['tournament']);
 $str2 = getTournamentTime();
+if($str2){
+    $str2 = ', '+$str2;
+}
 $str3 = getTournamentTerm();
+if($str3){
+    $str3 = ', '+$str3;
+}
 ?>
     <tr><td colspan=8>운영자 메세지 : <font color=orange size=5><?=$admin['tnmt_msg']?></font></td></tr>
-    <tr><td colspan=8 align=center><font color=white size=6><?=$tnmt_type?> (<?=$str1.", ".$str2.", ".$str3?>)</font></td></tr>
+    <tr><td colspan=8 align=center><font color=white size=6><?=$tnmt_type?> (<?=$str1.$str2.$str3?>)</font></td></tr>
     <tr><td colspan=8 align=center id=bg2><font color=magenta size=5>16강 승자전</font></td></tr>
     <tr><td height=10 colspan=8 align=center></td></tr>
 <?php
diff --git a/hwe/func_tournament.php b/hwe/func_tournament.php
index 3f794ee2..c8a72ad5 100644
--- a/hwe/func_tournament.php
+++ b/hwe/func_tournament.php
@@ -117,7 +117,7 @@ function getTournamentTerm() {
     $admin = MYDB_fetch_array($result);
 
     switch($admin['tnmt_auto']) {
-    case 0: $str = '설정 안됨'; break;
+    case 0: $str = ''; break;
     case 1: $str = "경기당 12분"; break;
     case 2: $str = "경기당 7분"; break;
     case 3: $str = "경기당 3분"; break;

From 5c7f4c43ae4e8762fd8d2f5f3fe23136360e447a Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 00:28:26 +0900
Subject: [PATCH 135/184] =?UTF-8?q?=EB=A6=AC=EC=85=8B=20=EC=8B=9C=20?=
 =?UTF-8?q?=ED=86=A0=EB=84=88=EB=A8=BC=ED=8A=B8=20=EA=B0=9C=EC=B5=9C=20?=
 =?UTF-8?q?=EC=97=AC=EB=B6=80=EB=8F=84=20=EA=B0=99=EC=9D=B4=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/install.php   | 36 ++++++++++++++++++++++++++++++++++--
 hwe/j_install.php | 14 ++++++++++++--
 hwe/js/install.js |  4 +++-
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/hwe/install.php b/hwe/install.php
index bc34267c..0a39ef46 100644
--- a/hwe/install.php
+++ b/hwe/install.php
@@ -155,10 +155,42 @@ if($session->userGrade < 5){
                                     <input type="radio" name="show_img_level" value="1">전콘
                                 </label>
                                 <label class="btn btn-secondary active">
-                                    <input type="radio" name="show_img_level" value="2" checked>전콘, 병종
+                                    <input type="radio" name="show_img_level" value="2">전콘, 병종
                                 </label>
                                 <label class="btn btn-secondary">
-                                    <input type="radio" name="show_img_level" value="3">전콘, 병종, NPC
+                                    <input type="radio" name="show_img_level" value="3" checked>전콘, 병종, NPC
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group row">
+                        <label for="tournament_trig" class="col-sm-3 col-form-label">토너먼트 자동 시작<br>경기 단위</label>
+                        <div class="col-sm-9" id="tournament_trig">
+                            <div id="tournament_trig" class="btn-group-toggle btn-group flex-wrap" data-toggle="buttons">
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="0">안함
+                                </label>
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="1">12분(총 5일)
+                                </label>
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="2">7분(총 10시간)
+                                </label>
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="3">3분(총 4시간)
+                                </label>
+                                <label class="btn btn-secondary w-25 active">
+                                    <input type="radio" name="tournament_trig" value="4" checked>1분(총 82분)
+                                </label>
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="5">30초(총 41분)
+                                </label>
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="6">15초(총 21분)
+                                </label>
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="7">5초(총 7분)
                                 </label>
                             </div>
                         </div>
diff --git a/hwe/j_install.php b/hwe/j_install.php
index 28349223..005057aa 100644
--- a/hwe/j_install.php
+++ b/hwe/j_install.php
@@ -28,7 +28,8 @@ $v->rule('required', [
     'fiction',
     'extend',
     'npcmode',
-    'show_img_level'
+    'show_img_level',
+    'tournament_trig'
 ]);
 if(!$v->validate()){
     Json::die([
@@ -44,6 +45,7 @@ $fiction = (int)$_POST['fiction'];
 $extend = (int)$_POST['extend'];
 $npcmode = (int)$_POST['npcmode'];
 $show_img_level = (int)$_POST['show_img_level'];
+$tournament_trig = (int)$_POST['tournament_trig'];
 
 if(120 % $turnterm != 0){
     Json::die([
@@ -52,6 +54,13 @@ if(120 % $turnterm != 0){
     ]);
 }
 
+if($tournament_trig < 0 || $tournament_trig > 7){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 토너먼트 주기입니다.'
+    ]);
+}
+
 if(!file_exists(__dir__.'/logs') || !file_exists(__dir__.'/data')){
     if(!is_writable(__dir__)){
         Json::die([
@@ -184,7 +193,8 @@ $env = [
     'show_img_level'=>$show_img_level,
     'npcmode'=>$npcmode,
     'extended_general'=>$extend,
-    'fiction'=>$fiction
+    'fiction'=>$fiction,
+    'tnmt_trig'=>$tournament_trig
 ];
 
 foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){
diff --git a/hwe/js/install.js b/hwe/js/install.js
index 6f76bf75..12c19f9e 100644
--- a/hwe/js/install.js
+++ b/hwe/js/install.js
@@ -113,6 +113,7 @@ function formSetup(){
             extend:"required",
             npcmode:"required",
             show_img_level:"required",
+            tournament_trig:"required"
         },
         errorElement: "div",
         errorPlacement: function ( error, element ) {
@@ -149,7 +150,8 @@ function formSetup(){
                 fiction:$('#fiction input:radio:checked').val(),
                 extend:$('#extend input:radio:checked').val(),
                 npcmode:$('#npcmode input:radio:checked').val(),
-                show_img_level:$('#show_img_level input:radio:checked').val()
+                show_img_level:$('#show_img_level input:radio:checked').val(),
+                tournament_trig:$('#tournament_trig input:radio:checked').val()
             }
         }).then(function(result){
             var deferred = $.Deferred();

From fb42a3208915b56ef6a0b28115cf3c82e660143a Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 00:43:09 +0900
Subject: [PATCH 136/184] =?UTF-8?q?=EB=A6=AC=EC=85=8B=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=EB=A5=BC=20=EB=B3=84=EB=8F=84=20=EC=BD=94=EB=93=9C=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_install.php         | 187 ++---------------------------------
 hwe/sammo/ResetHelper.php | 198 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 208 insertions(+), 177 deletions(-)
 create mode 100644 hwe/sammo/ResetHelper.php

diff --git a/hwe/j_install.php b/hwe/j_install.php
index 005057aa..f2573c24 100644
--- a/hwe/j_install.php
+++ b/hwe/j_install.php
@@ -47,180 +47,13 @@ $npcmode = (int)$_POST['npcmode'];
 $show_img_level = (int)$_POST['show_img_level'];
 $tournament_trig = (int)$_POST['tournament_trig'];
 
-if(120 % $turnterm != 0){
-    Json::die([
-        'result'=>false,
-        'reason'=>'turnterm은 120의 약수여야 합니다.'
-    ]);
-}
-
-if($tournament_trig < 0 || $tournament_trig > 7){
-    Json::die([
-        'result'=>false,
-        'reason'=>'올바르지 않은 토너먼트 주기입니다.'
-    ]);
-}
-
-if(!file_exists(__dir__.'/logs') || !file_exists(__dir__.'/data')){
-    if(!is_writable(__dir__)){
-        Json::die([
-            'result'=>false,
-            'reason'=>'logs, data 디렉토리를 생성할 권한이 없습니다.'
-        ]);
-    }
-    mkdir(__dir__.'/logs', 0644);
-    mkdir(__dir__.'/data', 0644);
-}
-
-if(!is_writable(__dir__.'/logs')){
-    Json::die([
-        'result'=>false,
-        'reason'=>'logs 디렉토리의 쓰기 권한이 없습니다'
-    ]);
-}
-
-if(!is_writable(__dir__.'/data')){
-    Json::die([
-        'result'=>false,
-        'reason'=>'data 디렉토리의 쓰기 권한이 없습니다'
-    ]);
-}
-
-if(!is_writable(__dir__.'/d_setting')){
-    Json::die([
-        'result'=>false,
-        'reason'=>'d_setting 디렉토리의 쓰기 권한이 없습니다'
-    ]);
-}
-
-if(!file_exists(__dir__.'/logs/.htaccess')){
-    @file_put_contents(__dir__.'/logs/.htaccess', 'Deny from  all');
-}
-
-if(!file_exists(__dir__.'/data/.htaccess')){
-    @file_put_contents(__dir__.'/data/.htaccess', 'Deny from  all');
-}
-
-
-$db = DB::db();
-$mysqli_obj = $db->get();
-
-
-$scenarioObj = new Scenario($scenario, false);
-$startyear = $scenarioObj->getYear()??GameConst::$defaultStartYear;
-
-FileUtil::delInDir(__dir__."/logs");
-FileUtil::delInDir(__dir__."/data");
-
-$result = Util::generateFileUsingSimpleTemplate(
-    __DIR__.'/d_setting/UniqueConst.orig.php',
-    __DIR__.'/d_setting/UniqueConst.php',[
-        'serverID'=>DB::prefix().'_'.Util::randomStr(8)
-    ], true
-);
-
-if($mysqli_obj->multi_query(file_get_contents(__dir__.'/sql/reset.sql'))){
-    while(true){
-        if (!$mysqli_obj->more_results()) {
-            break;
-        }
-        if(!$mysqli_obj->next_result()){
-            break;
-        }
-    }
-    
-}
-
-if($mysqli_obj->multi_query(file_get_contents(__dir__.'/sql/schema.sql'))){
-    while(true){
-        if (!$mysqli_obj->more_results()) {
-            break;
-        }
-        if(!$mysqli_obj->next_result()){
-            break;
-        }
-    }
-}
-
-
-$db->insert('plock', [
-    'plock'=>1
-]);
-
-CityConst::build();
-
-
-
-
-$turntime = date('Y-m-d H:i:s');
-$time = substr($turntime, 11, 2);
-if($sync == 0) {
-    // 현재 시간을 1월로 맞춤
-    $starttime = cutTurn($turntime, $turnterm);
-    $month = 1;
-    $year = $startyear;
-} else {
-    // 현재 시간과 동기화
-    list($starttime, $yearPulled, $month) = cutDay($turntime, $turnterm);
-    if($yearPulled){
-        $year = $startyear-1;
-    }
-    else{
-        $year = $startyear;
-    }
-}
-
-$killturn = 4800 / $turnterm;
-if($npcmode == 1) { $killturn = intdiv($killturn, 3); }
-
-$env = [
-    'scenario'=>$scenario,
-    'scenario_text'=>$scenarioObj->getTitle(),
-    'startyear'=>$startyear,
-    'year'=> $year,
-    'month'=> $month,
-    'msg'=>'공지사항',//TODO:공지사항
-    'maxgeneral'=>GameConst::$defaultMaxGeneral,
-    'maxnation'=>GameConst::$defaultMaxNation,
-    'conlimit'=>300,
-    'gold_rate'=>100,
-    'rice_rate'=>100,
-    'turntime'=>$turntime,
-    'starttime'=>$starttime,
-    'turnterm'=>$turnterm,
-    'killturn'=>$killturn,
-    'genius'=>GameConst::$defaultMaxGenius,
-    'show_img_level'=>$show_img_level,
-    'npcmode'=>$npcmode,
-    'extended_general'=>$extend,
-    'fiction'=>$fiction,
-    'tnmt_trig'=>$tournament_trig
-];
-
-foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){
-    $db->insert('general', [
-        'owner'=>$admin['no'],
-        'name'=>$admin['name'],
-        'picture'=>$admin['picture'],
-        'imgsvr'=>$admin['imgsvr'],
-        'turntime'=>$turntime,
-        'killturn'=>9999
-    ]);
-}
-
-$db->insert('game', $env);
-
-$scenarioObj->build($env);
-
-$db->update('plock', [
-    'plock'=>0
-], true);
-
-LogHistory(1);
-
-$prefix = DB::prefix();
-AppConf::getList()[$prefix]->closeServer();
-
-Json::die([
-    'result'=>true
-]);
\ No newline at end of file
+Json::die(ResetHelper::doReset(
+    $turnterm,
+    $sync,
+    $scenario,
+    $fiction,
+    $extend,
+    $npcmode,
+    $show_img_level,
+    $tournament_trig
+));
\ No newline at end of file
diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php
new file mode 100644
index 00000000..b0971036
--- /dev/null
+++ b/hwe/sammo/ResetHelper.php
@@ -0,0 +1,198 @@
+<?php
+namespace sammo;
+
+class ResetHelper{
+    private function __construct(){
+
+    }
+
+    static public function doReset(
+        int $turnterm,
+        int $sync,
+        int $scenario,
+        int $fiction,
+        int $extend,
+        int $npcmode,
+        int $show_img_level,
+        int $tournament_trig
+    ):array{
+        
+        if(120 % $turnterm != 0){
+            return [
+                'result'=>false,
+                'reason'=>'turnterm은 120의 약수여야 합니다.'
+            ];
+        }
+
+        if($tournament_trig < 0 || $tournament_trig > 7){
+            return [
+                'result'=>false,
+                'reason'=>'올바르지 않은 토너먼트 주기입니다.'
+            ];
+        }
+
+        $servRoot = realpath(__dir__.'/../');
+
+        if(!file_exists($servRoot.'/logs') || !file_exists($servRoot.'/data')){
+            if(!is_writable($servRoot)){
+                return [
+                    'result'=>false,
+                    'reason'=>'logs, data 디렉토리를 생성할 권한이 없습니다.'
+                ];
+            }
+            mkdir($servRoot.'/logs', 0644);
+            mkdir($servRoot.'/data', 0644);
+        }
+
+        if(!is_writable($servRoot.'/logs')){
+            return [
+                'result'=>false,
+                'reason'=>'logs 디렉토리의 쓰기 권한이 없습니다'
+            ];
+        }
+
+        if(!is_writable($servRoot.'/data')){
+            return [
+                'result'=>false,
+                'reason'=>'data 디렉토리의 쓰기 권한이 없습니다'
+            ];
+        }
+
+        if(!is_writable($servRoot.'/d_setting')){
+            return [
+                'result'=>false,
+                'reason'=>'d_setting 디렉토리의 쓰기 권한이 없습니다'
+            ];
+        }
+
+        if(!file_exists($servRoot.'/logs/.htaccess')){
+            @file_put_contents($servRoot.'/logs/.htaccess', 'Deny from  all');
+        }
+
+        if(!file_exists($servRoot.'/data/.htaccess')){
+            @file_put_contents($servRoot.'/data/.htaccess', 'Deny from  all');
+        }
+
+
+        $db = DB::db();
+        $mysqli_obj = $db->get();
+
+
+        $scenarioObj = new Scenario($scenario, false);
+        $startyear = $scenarioObj->getYear()??GameConst::$defaultStartYear;
+
+        FileUtil::delInDir($servRoot."/logs");
+        FileUtil::delInDir($servRoot."/data");
+
+        $result = Util::generateFileUsingSimpleTemplate(
+            $servRoot.'/d_setting/UniqueConst.orig.php',
+            $servRoot.'/d_setting/UniqueConst.php',[
+                'serverID'=>DB::prefix().'_'.Util::randomStr(8)
+            ], true
+        );
+
+        if($mysqli_obj->multi_query(file_get_contents($servRoot.'/sql/reset.sql'))){
+            while(true){
+                if (!$mysqli_obj->more_results()) {
+                    break;
+                }
+                if(!$mysqli_obj->next_result()){
+                    break;
+                }
+            }
+            
+        }
+
+        if($mysqli_obj->multi_query(file_get_contents($servRoot.'/sql/schema.sql'))){
+            while(true){
+                if (!$mysqli_obj->more_results()) {
+                    break;
+                }
+                if(!$mysqli_obj->next_result()){
+                    break;
+                }
+            }
+        }
+
+
+        $db->insert('plock', [
+            'plock'=>1
+        ]);
+
+        CityConst::build();
+
+
+        $turntime = date('Y-m-d H:i:s');
+        $time = substr($turntime, 11, 2);
+        if($sync == 0) {
+            // 현재 시간을 1월로 맞춤
+            $starttime = cutTurn($turntime, $turnterm);
+            $month = 1;
+            $year = $startyear;
+        } else {
+            // 현재 시간과 동기화
+            list($starttime, $yearPulled, $month) = cutDay($turntime, $turnterm);
+            if($yearPulled){
+                $year = $startyear-1;
+            }
+            else{
+                $year = $startyear;
+            }
+        }
+
+        $killturn = 4800 / $turnterm;
+        if($npcmode == 1) { $killturn = intdiv($killturn, 3); }
+
+        $env = [
+            'scenario'=>$scenario,
+            'scenario_text'=>$scenarioObj->getTitle(),
+            'startyear'=>$startyear,
+            'year'=> $year,
+            'month'=> $month,
+            'msg'=>'공지사항',//TODO:공지사항
+            'maxgeneral'=>GameConst::$defaultMaxGeneral,
+            'maxnation'=>GameConst::$defaultMaxNation,
+            'conlimit'=>300,
+            'gold_rate'=>100,
+            'rice_rate'=>100,
+            'turntime'=>$turntime,
+            'starttime'=>$starttime,
+            'turnterm'=>$turnterm,
+            'killturn'=>$killturn,
+            'genius'=>GameConst::$defaultMaxGenius,
+            'show_img_level'=>$show_img_level,
+            'npcmode'=>$npcmode,
+            'extended_general'=>$extend,
+            'fiction'=>$fiction,
+            'tnmt_trig'=>$tournament_trig
+        ];
+
+        foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){
+            $db->insert('general', [
+                'owner'=>$admin['no'],
+                'name'=>$admin['name'],
+                'picture'=>$admin['picture'],
+                'imgsvr'=>$admin['imgsvr'],
+                'turntime'=>$turntime,
+                'killturn'=>9999
+            ]);
+        }
+
+        $db->insert('game', $env);
+
+        $scenarioObj->build($env);
+
+        $db->update('plock', [
+            'plock'=>0
+        ], true);
+
+        LogHistory(1);
+
+        $prefix = DB::prefix();
+        AppConf::getList()[$prefix]->closeServer();
+
+        return [
+            'result'=>true
+        ];
+    }
+}
\ No newline at end of file

From 9122342fb91676dd46b36c051a6f6d01af785bf4 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 00:44:33 +0900
Subject: [PATCH 137/184] =?UTF-8?q?FIXME:=20=EB=A6=AC=EC=85=8B=20=ED=97=AC?=
 =?UTF-8?q?=ED=8D=BC=20=EA=BC=B4=EB=B3=B4=EA=B8=B0=20=EC=8B=AB=EC=9C=BC?=
 =?UTF-8?q?=EB=8B=88=20=EB=B6=84=EB=A6=AC=ED=95=A0=20=EA=B2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/ResetHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php
index b0971036..0007c8a5 100644
--- a/hwe/sammo/ResetHelper.php
+++ b/hwe/sammo/ResetHelper.php
@@ -16,7 +16,7 @@ class ResetHelper{
         int $show_img_level,
         int $tournament_trig
     ):array{
-        
+        //FIXME: 분리할 것
         if(120 % $turnterm != 0){
             return [
                 'result'=>false,

From 6253b757ecff4e5b2e70b1489403eea91bf162c7 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 02:13:40 +0900
Subject: [PATCH 138/184] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EC=98=88=EC=95=BD?=
 =?UTF-8?q?=20=EB=A6=AC=EC=85=8B=20=EB=8F=99=EC=9E=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/install.php           |  7 ++++
 hwe/j_autoreset.php       | 43 +++++++++++++++++++++++
 hwe/j_install.php         | 28 ++++++++++++++-
 hwe/js/install.js         |  3 +-
 hwe/sammo/ResetHelper.php | 73 +++++++++++++++++++++++----------------
 5 files changed, 123 insertions(+), 31 deletions(-)
 create mode 100644 hwe/j_autoreset.php

diff --git a/hwe/install.php b/hwe/install.php
index 0a39ef46..2ec5cf27 100644
--- a/hwe/install.php
+++ b/hwe/install.php
@@ -196,6 +196,13 @@ if($session->userGrade < 5){
                         </div>
                     </div>
 
+                    <div class="form-group row">
+                        <label for="reserve_open" class="col-sm-3 col-form-label">오픈 예약</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" name="reserve_open" id="reserve_open"  placeholder="YYYY-MM-DD hh:mm" value="" />
+                        </div>
+                    </div>
+
                     <div class="form-group row">
                         <div class="col-sm-3"></div>
                         <div class="col-sm-9">
diff --git a/hwe/j_autoreset.php b/hwe/j_autoreset.php
new file mode 100644
index 00000000..a1711c3c
--- /dev/null
+++ b/hwe/j_autoreset.php
@@ -0,0 +1,43 @@
+<?php
+namespace sammo;
+
+include 'lib.php';
+include "func.php";
+
+$db = DB::db();
+
+$reserved = $db->queryFirstRow(
+    'SELECT * FROM reserved_open WHERE `date` <= %s LIMIT 1',
+    (new \DateTime())->format('Y-m-d H:i:s')
+);
+
+if(!$reserved){
+    Json::die([
+        'result'=>true,
+        'affected'=>0
+    ]);
+}
+
+$options = Json::decode($reserved['options']);
+
+$result = ResetHelper::buildScenario(
+    $options['turnterm'],
+    $options['sync'],
+    $options['scenario'],
+    $options['fiction'],
+    $options['extend'],
+    $options['npcmode'],
+    $options['show_img_level'],
+    $options['tournament_trig']
+);
+
+if($result['result']){
+    $db->delete('reserved_open', 'id=%i', $reserved['id']);   
+}
+
+$result['affected']=1;
+
+$prefix = DB::prefix();
+AppConf::getList()[$prefix]->openServer();
+
+Json::die($result);
\ No newline at end of file
diff --git a/hwe/j_install.php b/hwe/j_install.php
index f2573c24..48a3966a 100644
--- a/hwe/j_install.php
+++ b/hwe/j_install.php
@@ -47,7 +47,33 @@ $npcmode = (int)$_POST['npcmode'];
 $show_img_level = (int)$_POST['show_img_level'];
 $tournament_trig = (int)$_POST['tournament_trig'];
 
-Json::die(ResetHelper::doReset(
+$reserve_open = Util::getReq('reserve_open');
+if($reserve_open){
+    $reserve_open = new \DateTime($reserve_open);
+    $db = DB::db();
+    
+    ResetHelper::clearDB();
+
+    $db->insert('reserved_open', [
+        'options'=>Json::encode([
+            'turnterm'=>$turnterm,
+            'sync'=>$sync,
+            'scenario'=>$scenario,
+            'fiction'=>$fiction,
+            'extend'=>$extend,
+            'npcmode'=>$npcmode,
+            'show_img_level'=>$show_img_level,
+            'tournament_trig'=>$tournament_trig
+        ]),
+        'date'=>$reserve_open->format('Y-m-d H:i:s')
+    ]);
+    Json::die([
+        'result'=>true,
+        'reason'=>'예약'
+    ]);
+}
+
+Json::die(ResetHelper::buildScenario(
     $turnterm,
     $sync,
     $scenario,
diff --git a/hwe/js/install.js b/hwe/js/install.js
index 12c19f9e..2e2e2719 100644
--- a/hwe/js/install.js
+++ b/hwe/js/install.js
@@ -151,7 +151,8 @@ function formSetup(){
                 extend:$('#extend input:radio:checked').val(),
                 npcmode:$('#npcmode input:radio:checked').val(),
                 show_img_level:$('#show_img_level input:radio:checked').val(),
-                tournament_trig:$('#tournament_trig input:radio:checked').val()
+                tournament_trig:$('#tournament_trig input:radio:checked').val(),
+                reserve_open:$('#reserve_open').val()
             }
         }).then(function(result){
             var deferred = $.Deferred();
diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php
index 0007c8a5..ee89b953 100644
--- a/hwe/sammo/ResetHelper.php
+++ b/hwe/sammo/ResetHelper.php
@@ -6,31 +6,7 @@ class ResetHelper{
 
     }
 
-    static public function doReset(
-        int $turnterm,
-        int $sync,
-        int $scenario,
-        int $fiction,
-        int $extend,
-        int $npcmode,
-        int $show_img_level,
-        int $tournament_trig
-    ):array{
-        //FIXME: 분리할 것
-        if(120 % $turnterm != 0){
-            return [
-                'result'=>false,
-                'reason'=>'turnterm은 120의 약수여야 합니다.'
-            ];
-        }
-
-        if($tournament_trig < 0 || $tournament_trig > 7){
-            return [
-                'result'=>false,
-                'reason'=>'올바르지 않은 토너먼트 주기입니다.'
-            ];
-        }
-
+    static public function clearDB(){
         $servRoot = realpath(__dir__.'/../');
 
         if(!file_exists($servRoot.'/logs') || !file_exists($servRoot.'/data')){
@@ -73,14 +49,12 @@ class ResetHelper{
             @file_put_contents($servRoot.'/data/.htaccess', 'Deny from  all');
         }
 
+        $prefix = DB::prefix();
+        AppConf::getList()[$prefix]->closeServer();
 
         $db = DB::db();
         $mysqli_obj = $db->get();
 
-
-        $scenarioObj = new Scenario($scenario, false);
-        $startyear = $scenarioObj->getYear()??GameConst::$defaultStartYear;
-
         FileUtil::delInDir($servRoot."/logs");
         FileUtil::delInDir($servRoot."/data");
 
@@ -114,7 +88,48 @@ class ResetHelper{
             }
         }
 
+        
 
+        return [
+            'result'=>true
+        ];
+    }
+
+    static public function buildScenario(
+        int $turnterm,
+        int $sync,
+        int $scenario,
+        int $fiction,
+        int $extend,
+        int $npcmode,
+        int $show_img_level,
+        int $tournament_trig
+    ):array{
+        //FIXME: 분리할 것
+        if(120 % $turnterm != 0){
+            return [
+                'result'=>false,
+                'reason'=>'turnterm은 120의 약수여야 합니다.'
+            ];
+        }
+
+        if($tournament_trig < 0 || $tournament_trig > 7){
+            return [
+                'result'=>false,
+                'reason'=>'올바르지 않은 토너먼트 주기입니다.'
+            ];
+        }
+
+        $clearResult = self::clearDB();
+        if(!$clearResult['result']){
+            return $clearResult;
+        }
+
+        $scenarioObj = new Scenario($scenario, false);
+        $startyear = $scenarioObj->getYear()??GameConst::$defaultStartYear;
+
+
+        $db = DB::db();
         $db->insert('plock', [
             'plock'=>1
         ]);

From 23fb1194ee71060944960736b53933de2e679416 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 02:56:11 +0900
Subject: [PATCH 139/184] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=98=88=EC=95=BD?=
 =?UTF-8?q?=20=EC=98=A4=ED=94=88=EC=9D=84=20UI=EC=97=90=20=ED=86=B5?=
 =?UTF-8?q?=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_install.php                      |  5 +++-
 hwe/j_server_basic_info.php            | 36 +++++++++++++++++++++++++-
 hwe/sql/schema.sql                     | 14 +++++++++-
 i_entrance/j_server_get_status.php     |  1 +
 js/entrance.js                         | 18 ++++++++++++-
 src/run_daemon.py                      | 13 +++++++++-
 src/sammo/templates/block_htaccess.php | 15 ++++++++++-
 7 files changed, 96 insertions(+), 6 deletions(-)

diff --git a/hwe/j_install.php b/hwe/j_install.php
index 48a3966a..2c5c66d8 100644
--- a/hwe/j_install.php
+++ b/hwe/j_install.php
@@ -51,14 +51,17 @@ $reserve_open = Util::getReq('reserve_open');
 if($reserve_open){
     $reserve_open = new \DateTime($reserve_open);
     $db = DB::db();
-    
+
     ResetHelper::clearDB();
 
+    $scenarioObj = new Scenario($scenario, true);
+    $db->delete('reserved_open', true);
     $db->insert('reserved_open', [
         'options'=>Json::encode([
             'turnterm'=>$turnterm,
             'sync'=>$sync,
             'scenario'=>$scenario,
+            'scenarioName'=>$scenarioObj->getTitle(),
             'fiction'=>$fiction,
             'extend'=>$extend,
             'npcmode'=>$npcmode,
diff --git a/hwe/j_server_basic_info.php b/hwe/j_server_basic_info.php
index 480978bb..a4340280 100644
--- a/hwe/j_server_basic_info.php
+++ b/hwe/j_server_basic_info.php
@@ -4,15 +4,49 @@ namespace sammo;
 include "lib.php";
 
 $session = Session::requireLogin([
-    'game'=>'x',
+    'game'=>null,
     'me'=>null
 ])->setReadOnly();
 $userID = Session::getUserID();
 
+if(!class_exists('\\sammo\\DB')){
+    Json::die([
+        'game'=>null,
+        'me'=>null
+    ]);
+}
+
 $db = DB::db();
 
 $game = $db->queryFirstRow('SELECT isUnited, npcMode, year, month, scenario, scenario_text, maxgeneral as maxUserCnt, turnTerm from game where `no`=1');
 
+if(!$game){
+    $reserved = $db->queryFirstRow(
+        'SELECT * FROM reserved_open ORDER BY `date` ASC LIMIT 1'
+    );
+    if(!$reserved){
+        Json::die([
+            'game'=>null,
+            'me'=>null
+        ]);
+    }
+
+    $options = Json::decode($reserved['options']);
+
+    Json::die([
+        'reserved'=>[
+            'scenarioName'=>$options['scenarioName'],
+            'turnterm'=>$options['turnterm'],
+            'fictionMode'=>($options['fiction']?'연의':'가상'),
+            'npcMode'=>($options['npcmode']?'가능':'불가'),
+            'openDatetime'=>$reserved['date']
+        ],
+        'game'=>null,
+        'me'=>null
+    ]);
+    
+}
+
 $nationCnt = $db->queryFirstField('SELECT count(`nation`) from nation where `level` > 0');
 $genCnt = $db->queryFirstField('SELECT count(`no`) from general where `npc` < 2');
 $npcCnt = $db->queryFirstField('SELECT count(`no`) from general where `npc` >= 2');
diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index a0810ca1..0ecc986a 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -643,4 +643,16 @@ CREATE TABLE `general_public_record` (
 )
 DEFAULT CHARSET=utf8mb4
 ENGINE=InnoDB
-;
\ No newline at end of file
+;
+
+######
+# 예약 오픈 테이블
+CREATE TABLE `reserved_open` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`options` TEXT NULL DEFAULT NULL,
+	`date` DATETIME NULL DEFAULT NULL,
+	PRIMARY KEY (`id`),
+	INDEX `date` (`date`)
+)
+DEFAULT CHARSET=utf8mb4
+ENGINE=MyISAM;
diff --git a/i_entrance/j_server_get_status.php b/i_entrance/j_server_get_status.php
index 1110f3f2..b78448e9 100644
--- a/i_entrance/j_server_get_status.php
+++ b/i_entrance/j_server_get_status.php
@@ -12,6 +12,7 @@ foreach(AppConf::getList() as $setting){
         'color'=>$setting->getColor(),
         'korName'=>$setting->getKorName(),
         'name'=>$setting->getShortName(),
+        'exists'=>$setting->isExists(),
         'enable'=>$setting->isRunning()
     ];
 
diff --git a/js/entrance.js b/js/entrance.js
index 93b47a18..07f8b800 100644
--- a/js/entrance.js
+++ b/js/entrance.js
@@ -42,6 +42,14 @@ var serverLoginTemplate = "\
 </td>\
 ";
 
+
+var serverReservedTemplate = "\
+<td colspan='4' class='server_reserved'>\
+- 오픈 일시 : <%openDatetime%> - <br>\
+<span style='color:orange;'><%scenarioName%></span> <span style='color:limegreen;'><%turnterm%>분 턴 서버</span><br>\
+(연의 모드:<%fictionMode%>), (빙의 여부:<%npcMode%>)</td>\
+";
+
 $(function(){
     $("#btn_logout").click(Entrance_Logout);
     Entrance_UpdateServer();
@@ -64,7 +72,7 @@ function Entrance_drawServerList(serverInfos){
     $.each(serverInfos, function(idx, serverInfo){
         var $serverHtml = $(TemplateEngine(serverListTemplate, serverInfo));
         $serverList.append($serverHtml);
-        if(!serverInfo.enable){
+        if(!serverInfo.exists){
             return true;
         }
 
@@ -72,6 +80,14 @@ function Entrance_drawServerList(serverInfos){
 
 
         $.getJSON("../"+serverInfo.name+'/j_server_basic_info.php',{}, function(result){
+            if(result.reserved){
+                $serverHtml.find('.server_down').detach();
+                $serverHtml.append(
+                    TemplateEngine(serverReservedTemplate, result.reserved)
+                );
+                return;
+            }
+
             if(!result.game){
                 return;
             }
diff --git a/src/run_daemon.py b/src/run_daemon.py
index 9e00ebf3..78d0268f 100644
--- a/src/run_daemon.py
+++ b/src/run_daemon.py
@@ -27,17 +27,28 @@ def main():
         break
 
     servList = []
+    autoResetList = []
     for path in glob.glob(basepath+'/*/d_setting/DB.php'):
         servPath = os.path.dirname(os.path.dirname(path))
+        servRelPath = os.path.relpath(servPath, basepath)
+
+        resetAbsPath = servPath + '/j_autoreset.php'
+        resetPath = webBase + '/' + servRelPath + '/j_autoreset.php'
+        if os.path.exists(resetAbsPath):
+            autoResetList.append(resetPath)
+
         if servPath in hiddenList:
             continue
 
-        servRelPath = os.path.relpath(servPath, basepath)
         webPath = webBase + '/' + servRelPath + '/proc.php'
+        
         servList.append(webPath)
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=len(servList)) as executor:
         waiters=[]
+        for resetPath in autoResetList:
+            future = executor.submit(run, resetPath)
+            waiters.append(future)
         for _ in range(4):
             for webPath in servList:
                 future = executor.submit(run, webPath)
diff --git a/src/sammo/templates/block_htaccess.php b/src/sammo/templates/block_htaccess.php
index d3c18fb2..174f1338 100644
--- a/src/sammo/templates/block_htaccess.php
+++ b/src/sammo/templates/block_htaccess.php
@@ -7,4 +7,17 @@ Deny from  all
 SetEnvIf X-Forwarded-For ^<?=str_replace('.', '\\.', $allow_ip)?> env_allow_1
 Allow from env=env_allow_1
 Allow from <?=$allow_ip?>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
+
+<Files j_install.php>
+    Allow from all
+</Files>
+<Files install.php>
+    Allow from all
+</Files>
+<Files j_server_basic_info.php>
+    Allow from all
+</Files>
+<Files ~ "\.(xml|css|jpe?g|png|gif|js|pdf)$">
+    Allow from all
+</Files>
\ No newline at end of file

From 77aca09f539aa1b6f449ed6b03ce6b88a578be23 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 03:02:31 +0900
Subject: [PATCH 140/184] =?UTF-8?q?=EC=83=81=EC=84=B1=20=EC=97=AC=EB=B6=80?=
 =?UTF-8?q?=EB=A1=9C=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_server_basic_info.php | 2 +-
 js/entrance.js              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/j_server_basic_info.php b/hwe/j_server_basic_info.php
index a4340280..2cd38545 100644
--- a/hwe/j_server_basic_info.php
+++ b/hwe/j_server_basic_info.php
@@ -37,7 +37,7 @@ if(!$game){
         'reserved'=>[
             'scenarioName'=>$options['scenarioName'],
             'turnterm'=>$options['turnterm'],
-            'fictionMode'=>($options['fiction']?'연의':'가상'),
+            'fictionMode'=>($options['fiction']?'사실':'가상'),
             'npcMode'=>($options['npcmode']?'가능':'불가'),
             'openDatetime'=>$reserved['date']
         ],
diff --git a/js/entrance.js b/js/entrance.js
index 07f8b800..6b1c734e 100644
--- a/js/entrance.js
+++ b/js/entrance.js
@@ -47,7 +47,7 @@ var serverReservedTemplate = "\
 <td colspan='4' class='server_reserved'>\
 - 오픈 일시 : <%openDatetime%> - <br>\
 <span style='color:orange;'><%scenarioName%></span> <span style='color:limegreen;'><%turnterm%>분 턴 서버</span><br>\
-(연의 모드:<%fictionMode%>), (빙의 여부:<%npcMode%>)</td>\
+(상성 설정:<%fictionMode%>), (빙의 여부:<%npcMode%>)</td>\
 ";
 
 $(function(){

From bc37dd1df74aaf29e84f05a193da62d90afdc477 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 03:07:02 +0900
Subject: [PATCH 141/184] =?UTF-8?q?'=ED=8F=90=EC=87=84=20=EC=97=AC?=
 =?UTF-8?q?=EB=B6=80'=EB=A5=BC=20server=5Fbasic=5Finfo=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=20=ED=8C=90=EB=8B=A8=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_server_basic_info.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/hwe/j_server_basic_info.php b/hwe/j_server_basic_info.php
index 2cd38545..3233b132 100644
--- a/hwe/j_server_basic_info.php
+++ b/hwe/j_server_basic_info.php
@@ -3,6 +3,13 @@ namespace sammo;
 
 include "lib.php";
 
+if(file_exists(__dir__.'/.htaccess')){
+    Json::die([
+        'game'=>null,
+        'me'=>null
+    ]);
+}
+
 $session = Session::requireLogin([
     'game'=>null,
     'me'=>null

From 7e00500870e20ee00467af44ec3516a1c7ef0806 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 03:10:09 +0900
Subject: [PATCH 142/184] =?UTF-8?q?=EC=98=88=EC=95=BD=20=EB=A6=AC=EC=85=8B?=
 =?UTF-8?q?=EC=8B=9C=20=EC=B4=88=EA=B8=B0=ED=99=94=20=EC=97=90=EB=9F=AC=20?=
 =?UTF-8?q?=ED=91=9C=EA=B8=B0=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_install.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hwe/j_install.php b/hwe/j_install.php
index 2c5c66d8..4b535e53 100644
--- a/hwe/j_install.php
+++ b/hwe/j_install.php
@@ -52,7 +52,10 @@ if($reserve_open){
     $reserve_open = new \DateTime($reserve_open);
     $db = DB::db();
 
-    ResetHelper::clearDB();
+    $clearResult = ResetHelper::clearDB();
+    if(!$clearResult['result']){
+        Json::die($clearResult);
+    }
 
     $scenarioObj = new Scenario($scenario, true);
     $db->delete('reserved_open', true);

From 6ebe3454af3aaa824ab358eed0940cf0618ffc32 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 08:15:55 +0900
Subject: [PATCH 143/184] =?UTF-8?q?=EC=98=88=EC=95=BD=20=EC=95=88=EB=82=B4?=
 =?UTF-8?q?=20=EC=A1=B0=EA=B1=B4=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_server_basic_info.php | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/hwe/j_server_basic_info.php b/hwe/j_server_basic_info.php
index 3233b132..fa7aefab 100644
--- a/hwe/j_server_basic_info.php
+++ b/hwe/j_server_basic_info.php
@@ -3,13 +3,6 @@ namespace sammo;
 
 include "lib.php";
 
-if(file_exists(__dir__.'/.htaccess')){
-    Json::die([
-        'game'=>null,
-        'me'=>null
-    ]);
-}
-
 $session = Session::requireLogin([
     'game'=>null,
     'me'=>null
@@ -25,9 +18,7 @@ if(!class_exists('\\sammo\\DB')){
 
 $db = DB::db();
 
-$game = $db->queryFirstRow('SELECT isUnited, npcMode, year, month, scenario, scenario_text, maxgeneral as maxUserCnt, turnTerm from game where `no`=1');
-
-if(!$game){
+if(file_exists(__dir__.'/.htaccess')){
     $reserved = $db->queryFirstRow(
         'SELECT * FROM reserved_open ORDER BY `date` ASC LIMIT 1'
     );
@@ -51,9 +42,12 @@ if(!$game){
         'game'=>null,
         'me'=>null
     ]);
-    
 }
 
+//TODO: 천통시에도 예약 오픈 알림이 필요..?
+
+$game = $db->queryFirstRow('SELECT isUnited, npcMode, year, month, scenario, scenario_text, maxgeneral as maxUserCnt, turnTerm from game where `no`=1');
+
 $nationCnt = $db->queryFirstField('SELECT count(`nation`) from nation where `level` > 0');
 $genCnt = $db->queryFirstField('SELECT count(`no`) from general where `npc` < 2');
 $npcCnt = $db->queryFirstField('SELECT count(`no`) from general where `npc` >= 2');

From f540f87e771c4ee1166c75f0473a7a594c8e1ddd Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 25 Apr 2018 18:04:01 +0900
Subject: [PATCH 144/184] =?UTF-8?q?KBO=20=EC=98=AC=EC=8A=A4=ED=83=80?=
 =?UTF-8?q?=EC=A0=84=20=EC=8B=9C=EB=82=98=EB=A6=AC=EC=98=A4=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/scenario/scenario_30.json | 298 ++++++++++++++++++++++++++++++++++
 1 file changed, 298 insertions(+)
 create mode 100644 hwe/scenario/scenario_30.json

diff --git a/hwe/scenario/scenario_30.json b/hwe/scenario/scenario_30.json
new file mode 100644
index 00000000..76e7aae7
--- /dev/null
+++ b/hwe/scenario/scenario_30.json
@@ -0,0 +1,298 @@
+{
+    "title":"【가상모드10】 KBO 올스타전",
+    "life":0,
+    "fiction":1,
+    "nation":[
+    ],
+    "diplomacy":[
+    ],
+    "general":[
+        [100, "김일융", -1, 0, null, 88, 83, 79, 160, 300, null, null],
+        [107, "이승엽", -1, 0, null, 90, 108, 37, 160, 300, null, null, "안녕하세요 국민타자 이승엽입니다."],
+        [80, "마해영", -1, 0, null, 84, 84, 22, 160, 300, null, null],
+        [34, "채태인", -1, 0, null, 86, 54, 15, 160, 300, null, null, "신대륙은 어디에…"],
+        [143, "김성래", -1, 0, null, 75, 86, 19, 160, 300, null, null],
+        [148, "강기웅", -1, 0, null, 82, 61, 83, 160, 300, null, null],
+        [75, "나바로", -1, 0, null, 82, 85, 79, 160, 300, null, null],
+        [46, "김한수", -1, 0, null, 80, 82, 48, 160, 300, null, null],
+        [1, "조동찬", -1, 0, null, 55, 68, 75, 160, 300, null, null],
+        [115, "류중일", -1, 0, null, 68, 34, 78, 160, 300, null, null, "내 아들 상수야…"],
+        [62, "김상수", -1, 0, null, 68, 21, 80, 160, 300, null, null, "예 아부지…"],
+        [71, "박진만", -1, 0, null, 72, 78, 69, 160, 300, null, null],
+        [42, "양준혁", -1, 0, null, 97, 98, 91, 160, 300, null, null, "내보다 강미노가 머리 더 큰데?"],
+        [124, "박한이", -1, 0, null, 83, 77, 79, 160, 300, null, null, "킁킁"],
+        [56, "최형우", -1, 0, null, 87, 86, 20, 160, 300, null, null],
+        [119, "장효조", -1, 0, null, 95, 39, 68, 160, 300, null, null],
+        [56, "동봉철", -1, 0, null, 65, 41, 74, 160, 300, null, null],
+        [66, "강동우", -1, 0, null, 67, 53, 79, 160, 300, null, null],
+        [118, "신동주", -1, 0, null, 68, 71, 76, 160, 300, null, null],
+        [60, "이만수", -1, 0, null, 89, 97, 49, 160, 300, null, null],
+        [23, "진갑용", -1, 0, null, 74, 80, 15, 160, 300, null, null],
+        [37, "김시진", -1, 0, null, 84, 88, 75, 160, 300, null, null],
+        [38, "배영수", -1, 0, null, 79, 86, 87, 160, 300, null, null],
+        [21, "윤성환", -1, 0, null, 74, 86, 87, 160, 300, null, null],
+        [68, "안지만", -1, 0, null, 69, 79, 75, 160, 300, null, null],
+        [138, "김현욱", -1, 0, null, 82, 85, 84, 160, 300, null, null],
+        [147, "정현욱", -1, 0, null, 74, 83, 77, 160, 300, null, null],
+        [123, "권혁", -1, 0, null, 75, 86, 62, 160, 300, null, null],
+        [97, "임창용", -1, 0, null, 83, 86, 80, 160, 300, null, null],
+        [9, "오승환", -1, 0, null, 97, 92, 89, 160, 300, null, null],
+        [115, "권영호", -1, 0, null, 83, 53, 76, 160, 300, null, null],
+        [146, "이선희", -1, 0, null, 83, 49, 74, 160, 300, null, null],
+        [71, "공필성", -1, 0, null, 46, 47, 77, 160, 300, null, null],
+        [59, "양상문", -1, 0, null, 76, 54, 76, 160, 300, null, null],
+        [79, "윤형배", -1, 0, null, 77, 69, 73, 160, 300, null, null],
+        [142, "박정태", -1, 0, null, 84, 74, 39, 160, 300, null, null],
+        [10, "주형광", -1, 0, null, 79, 86, 84, 160, 300, null, null],
+        [27, "강영식", -1, 0, null, 63, 69, 60, 160, 300, null, null],
+        [124, "김사율", -1, 0, null, 74, 66, 67, 160, 300, null, null],
+        [30, "배장호", -1, 0, null, 62, 48, 60, 160, 300, null, null],
+        [129, "손민한", -1, 0, null, 85, 84, 94, 160, 300, null, null, "팝콘이 먹고싶다"],
+        [134, "송승준", -1, 0, null, 65, 84, 67, 160, 300, null, null],
+        [142, "이용훈", -1, 0, null, 48, 58, 63, 160, 300, null, null],
+        [92, "임경완", -1, 0, null, 68, 57, 39, 160, 300, null, null],
+        [137, "장원준", -1, 0, null, 75, 83, 74, 160, 300, null, null],
+        [10, "조정훈", -1, 0, null, 67, 59, 79, 160, 300, null, null],
+        [73, "최대성", -1, 0, null, 69, 63, 38, 160, 300, null, null],
+        [127, "허준혁", -1, 0, null, 58, 51, 48, 160, 300, null, null],
+        [56, "강민호", -1, 0, null, 75, 86, 48, 160, 300, null, null],
+        [46, "최기문", -1, 0, null, 65, 37, 64, 160, 300, null, null],
+        [105, "임수혁", -1, 0, null, 67, 44, 56, 160, 300, null, null],
+        [64, "김주찬", -1, 0, null, 75, 53, 88, 160, 300, null, null],
+        [91, "문규현", -1, 0, null, 46, 22, 49, 160, 300, null, null],
+        [114, "박기혁", -1, 0, null, 48, 25, 70, 160, 300, null, null],
+        [5, "이대호", -1, 0, null, 95, 98, 10, 160, 300, null, null, "마 니 일로 내리와 "],
+        [120, "전준우", -1, 0, null, 80, 72, 75, 160, 300, null, null, "홈런! 홈런!....아냐?"],
+        [93, "손아섭", -1, 0, null, 89, 75, 82, 160, 300, null, null],
+        [101, "홍성흔", -1, 0, null, 86, 77, 53, 160, 300, null, null],
+        [21, "조성환", -1, 0, null, 79, 42, 77, 160, 300, null, null],
+        [121, "가르시아", -1, 0, null, 70, 85, 12, 160, 300, null, null],
+        [149, "정보명", -1, 0, null, 69, 31, 39, 160, 300, null, null],
+        [144, "이재곤", -1, 0, null, 40, 41, 39, 160, 300, null, null],
+        [142, "염종석", -1, 0, null, 83, 90, 93, 160, 300, null, null],
+        [27, "황재균", -1, 0, null, 79, 77, 83, 160, 300, null, null],
+        [25, "윤학길", -1, 0, null, 81, 76, 82, 160, 300, null, null],
+        [55, "가득염", -1, 0, null, 60, 67, 61, 160, 300, null, null],
+        [68, "조경환", -1, 0, null, 57, 78, 20, 160, 300, null, null],
+        [7, "강상수", -1, 0, null, 65, 66, 58, 160, 300, null, null],
+        [39, "최준석", -1, 0, null, 79, 86, 10, 160, 300, null, null],
+        [79, "최동원", -1, 0, null, 98, 94, 96, 160, 300, null, null],
+        [132, "김용철", -1, 0, null, 77, 79, 67, 160, 300, null, null],
+        [66, "김용희", -1, 0, null, 67, 64, 21, 160, 300, null, null],
+        [46, "호세", -1, 0, null, 88, 86, 39, 160, 300, null, null, "헤이 영쑤! 돈 두 댓!"],
+        [51, "감사용", -1, 0, null, 37, 18, 65, 160, 300, null, null],
+        [121, "금광옥", -1, 0, null, 31, 30, 39, 160, 300, null, null],
+        [44, "김무관", -1, 0, null, 20, 7, 43, 160, 300, null, null],
+        [122, "양승관", -1, 0, null, 46, 44, 22, 160, 300, null, null],
+        [131, "박철순", -1, 0, null, 89, 82, 80, 160, 300, null, null],
+        [75, "하기룡", -1, 0, null, 82, 58, 64, 160, 300, null, null],
+        [41, "황규봉", -1, 0, null, 83, 48, 72, 160, 300, null, null],
+        [73, "계형철", -1, 0, null, 74, 75, 70, 160, 300, null, null],
+        [11, "김경문", -1, 0, null, 48, 9, 34, 160, 300, null, null],
+        [142, "조범현", -1, 0, null, 29, 25, 83, 160, 300, null, null],
+        [140, "백인천", -1, 0, null, 95, 77, 66, 160, 300, null, null],
+        [4, "김인식", -1, 0, null, 58, 15, 75, 160, 300, null, null],
+        [13, "김재박", -1, 0, null, 73, 29, 91, 160, 300, null, null],
+        [85, "박정현", -1, 0, null, 82, 78, 80, 160, 300, null, null],
+        [138, "전준호", -1, 0, null, 79, 42, 101, 160, 300, null, null, "전설의 대도"],
+        [84, "심정수", -1, 0, null, 80, 92, 41, 160, 300, null, null],
+        [87, "박재홍", -1, 0, null, 87, 95, 94, 160, 300, null, null],
+        [42, "박경완", -1, 0, null, 48, 89, 79, 160, 300, null, null],
+        [31, "박종호", -1, 0, null, 76, 76, 81, 160, 300, null, null],
+        [116, "이숭용", -1, 0, null, 81, 83, 67, 160, 300, null, null],
+        [60, "송지만", -1, 0, null, 78, 89, 86, 160, 300, null, null],
+        [93, "나이트", -1, 0, null, 75, 79, 82, 160, 300, null, null],
+        [35, "송신영", -1, 0, null, 67, 69, 69, 160, 300, null, null],
+        [139, "이택근", -1, 0, null, 86, 80, 83, 160, 300, null, null],
+        [149, "위재영", -1, 0, null, 80, 69, 67, 160, 300, null, null],
+        [43, "김성래", -1, 0, null, 77, 81, 23, 160, 300, null, null],
+        [100, "데이비스", -1, 0, null, 89, 83, 77, 160, 300, null, null],
+        [43, "임선동", -1, 0, null, 67, 72, 76, 160, 300, null, null],
+        [14, "우즈", -1, 0, null, 89, 90, 36, 160, 300, null, null],
+        [142, "성준", -1, 0, null, 78, 58, 67, 160, 300, null, null],
+        [127, "장명부", -1, 0, null, 84, 82, 76, 160, 300, null, null],
+        [4, "정명원", -1, 0, null, 89, 84, 76, 160, 300, null, null],
+        [112, "김응국", -1, 0, null, 82, 79, 86, 160, 300, null, null],
+        [96, "강정호", -1, 0, null, 81, 81, 48, 160, 300, null, null],
+        [147, "박병호", -1, 0, null, 80, 95, 56, 160, 300, null, null],
+        [86, "김민성", -1, 0, null, 79, 80, 38, 160, 300, null, null],
+        [71, "서건창", -1, 0, null, 94, 26, 91, 160, 300, null, null],
+        [45, "김하성", -1, 0, null, 80, 63, 69, 160, 300, null, null],
+        [22, "이정후", -1, 0, null, 86, 8, 15, 160, 300, null, null],
+        [111, "정민태", -1, 0, null, 77, 78, 82, 160, 300, null, null],
+        [45, "정경배", -1, 0, null, 64, 76, 67, 160, 300, null, null],
+        [62, "김기태", -1, 0, null, 86, 90, 76, 160, 300, null, null],
+        [20, "이승호", -1, 0, null, 71, 80, 53, 160, 300, null, null],
+        [90, "김광현", -1, 0, null, 84, 90, 86, 160, 300, null, null, "제가 현진이형보단 낫죠"],
+        [99, "박정배", -1, 0, null, 62, 63, 67, 160, 300, null, null],
+        [127, "채병용", -1, 0, null, 68, 77, 79, 160, 300, null, null],
+        [142, "윤희상", -1, 0, null, 56, 58, 67, 160, 300, null, null],
+        [135, "이재원", -1, 0, null, 83, 67, 10, 160, 300, null, null],
+        [134, "박정권", -1, 0, null, 78, 83, 53, 160, 300, null, null],
+        [35, "나주환", -1, 0, null, 68, 67, 72, 160, 300, null, null],
+        [44, "최정", -1, 0, null, 89, 91, 88, 160, 300, null, null],
+        [30, "조동화", -1, 0, null, 48, 11, 83, 160, 300, null, null],
+        [50, "김강민", -1, 0, null, 77, 77, 82, 160, 300, null, null],
+        [77, "박용택", -1, 0, null, 92, 90, 92, 160, 300, null, null],
+        [22, "이병규", -1, 0, null, 93, 90, 89, 160, 300, null, null],
+        [135, "조인성", -1, 0, null, 49, 86, 25, 160, 300, null, null],
+        [88, "김동수", -1, 0, null, 65, 86, 65, 160, 300, null, null],
+        [147, "유지현", -1, 0, null, 76, 57, 87, 160, 300, null, null],
+        [91, "김재현", -1, 0, null, 85, 86, 77, 160, 300, null, null],
+        [66, "이상훈", -1, 0, null, 95, 90, 87, 160, 300, null, null],
+        [106, "서용빈", -1, 0, null, 81, 22, 87, 160, 300, null, null],
+        [71, "봉중근", -1, 0, null, 77, 68, 44, 160, 300, null, null],
+        [40, "차우찬", -1, 0, null, 67, 82, 49, 160, 300, null, null],
+        [118, "오지환", -1, 0, null, 57, 68, 80, 160, 300, null, null, "경기를 지배하는 오지배입니다"],
+        [85, "금민철", -1, 0, null, 61, 50, 42, 160, 300, null, null],
+        [70, "김동주", -1, 0, null, 92, 92, 48, 160, 300, null, null],
+        [22, "김선우", -1, 0, null, 65, 67, 74, 160, 300, null, null],
+        [12, "김재호", -1, 0, null, 68, 21, 58, 160, 300, null, null],
+        [11, "노경은", -1, 0, null, 48, 59, 61, 160, 300, null, null],
+        [19, "니퍼트", -1, 0, null, 76, 88, 67, 160, 300, null, null],
+        [126, "류택현", -1, 0, null, 65, 79, 63, 160, 300, null, null],
+        [68, "민병헌", -1, 0, null, 84, 53, 81, 160, 300, null, null],
+        [140, "박명환", -1, 0, null, 72, 80, 41, 160, 300, null, null, "배추 좀 주세요"],
+        [9, "안경현", -1, 0, null, 67, 78, 34, 160, 300, null, null],
+        [120, "양의지", -1, 0, null, 83, 77, 39, 160, 300, null, null],
+        [65, "오재원", -1, 0, null, 67, 30, 87, 160, 300, null, null, "식빵!"],
+        [6, "유희관", -1, 0, null, 65, 76, 69, 160, 300, null, null, "싸인해드릴까요?"],
+        [3, "이용찬", -1, 0, null, 68, 72, 74, 160, 300, null, null],
+        [19, "이성열", -1, 0, null, 48, 77, 41, 160, 300, null, null],
+        [94, "이재영", -1, 0, null, 63, 64, 39, 160, 300, null, null],
+        [5, "이종욱", -1, 0, null, 83, 35, 91, 160, 300, null, null],
+        [88, "이현승", -1, 0, null, 63, 65, 67, 160, 300, null, null],
+        [39, "이혜천", -1, 0, null, 62, 50, 48, 160, 300, null, null],
+        [138, "전병두", -1, 0, null, 71, 78, 29, 160, 300, null, null],
+        [47, "정대현", -1, 0, null, 88, 58, 70, 160, 300, null, null],
+        [90, "정수빈", -1, 0, null, 72, 19, 83, 160, 300, null, null],
+        [24, "정수근", -1, 0, null, 76, 26, 89, 160, 300, null, null],
+        [54, "홍상삼", -1, 0, null, 59, 49, 51, 160, 300, null, null],
+        [41, "손시헌", -1, 0, null, 68, 57, 31, 160, 300, null, null],
+        [93, "박민우", -1, 0, null, 86, 8, 76, 160, 300, null, null],
+        [24, "모창민", -1, 0, null, 68, 57, 60, 160, 300, null, null],
+        [55, "지석훈", -1, 0, null, 39, 38, 12, 160, 300, null, null],
+        [35, "박석민", -1, 0, null, 79, 84, 23, 160, 300, null, null, "브로콜리 돼지 나가신다"],
+        [123, "이민호", -1, 0, null, 57, 78, 53, 160, 300, null, null],
+        [28, "김진성", -1, 0, null, 63, 67, 69, 160, 300, null, null],
+        [104, "권희동", -1, 0, null, 49, 41, 21, 160, 300, null, null],
+        [133, "임창민", -1, 0, null, 71, 67, 63, 160, 300, null, null],
+        [37, "원종현", -1, 0, null, 62, 67, 71, 160, 300, null, null],
+        [82, "이재학", -1, 0, null, 62, 53, 58, 160, 300, null, null],
+        [96, "최금강", -1, 0, null, 44, 48, 53, 160, 300, null, null],
+        [55, "김상엽", -1, 0, null, 68, 60, 39, 160, 300, null, null],
+        [107, "김수경", -1, 0, null, 67, 82, 58, 160, 300, null, null],
+        [19, "테임즈", -1, 0, null, 94, 96, 76, 160, 300, null, null, "황재균은 섹x머신이다"],
+        [49, "나성범", -1, 0, null, 90, 83, 70, 160, 300, null, null],
+        [133, "김성한", -1, 0, null, 80, 86, 79, 160, 300, null, null],
+        [128, "방수원", -1, 0, null, 74, 53, 76, 160, 300, null, null],
+        [49, "김봉연", -1, 0, null, 74, 79, 40, 160, 300, null, null],
+        [115, "김일권", -1, 0, null, 53, 29, 95, 160, 300, null, null],
+        [88, "김종모", -1, 0, null, 85, 70, 31, 160, 300, null, null],
+        [108, "선동열", -1, 0, null, 104, 96, 99, 160, 300, null, null, "무등산 폭격기"],
+        [5, "이종범", -1, 0, null, 91, 93, 103, 160, 300, null, null, "내겐 보이지 않는 무언가가 있다"],
+        [81, "문희수", -1, 0, null, 72, 61, 63, 160, 300, null, null],
+        [25, "유승안", -1, 0, null, 65, 73, 34, 160, 300, null, null],
+        [67, "이순철", -1, 0, null, 63, 80, 87, 160, 300, null, null, "LG는 내 덕에 강팀이 되었지"],
+        [29, "차동철", -1, 0, null, 73, 23, 67, 160, 300, null, null],
+        [41, "한대화", -1, 0, null, 79, 82, 71, 160, 300, null, null],
+        [45, "이강철", -1, 0, null, 83, 81, 62, 160, 300, null, null],
+        [55, "조계현", -1, 0, null, 86, 71, 73, 160, 300, null, null],
+        [87, "최향남", -1, 0, null, 63, 64, 34, 160, 300, null, null],
+        [45, "홍현우", -1, 0, null, 71, 84, 81, 160, 300, null, null],
+        [144, "이대진", -1, 0, null, 73, 74, 58, 160, 300, null, null],
+        [57, "장채근", -1, 0, null, 30, 72, 31, 160, 300, null, null],
+        [104, "김종국", -1, 0, null, 46, 62, 86, 160, 300, null, null],
+        [130, "곽채진", -1, 0, null, 61, 67, 59, 160, 300, null, null],
+        [43, "황두성", -1, 0, null, 73, 79, 51, 160, 300, null, null],
+        [4, "이호준", -1, 0, null, 82, 86, 51, 160, 300, null, null],
+        [117, "장성호", -1, 0, null, 84, 83, 74, 160, 300, null, null],
+        [12, "정성훈", -1, 0, null, 84, 80, 77, 160, 300, null, null],
+        [99, "최상덕", -1, 0, null, 61, 67, 73, 160, 300, null, null],
+        [86, "홍세완", -1, 0, null, 67, 72, 39, 160, 300, null, null],
+        [28, "리오스", -1, 0, null, 81, 76, 71, 160, 300, null, null],
+        [84, "차일목", -1, 0, null, 38, 31, 34, 160, 300, null, null],
+        [72, "진필중", -1, 0, null, 79, 83, 75, 160, 300, null, null],
+        [35, "유동훈", -1, 0, null, 74, 51, 64, 160, 300, null, null],
+        [29, "이재주", -1, 0, null, 48, 77, 6, 160, 300, null, null],
+        [59, "심재학", -1, 0, null, 66, 75, 26, 160, 300, null, null],
+        [101, "이용규", -1, 0, null, 86, 20, 86, 160, 300, null, null],
+        [65, "윤석민", -1, 0, null, 86, 79, 81, 160, 300, null, null, "죄송합니다 제가 공황장애가 와서.."],
+        [80, "조규제", -1, 0, null, 83, 76, 58, 160, 300, null, null],
+        [70, "한기주", -1, 0, null, 72, 57, 58, 160, 300, null, null, "속이 꽉찬 남자 99.9"],
+        [136, "이동현", -1, 0, null, 71, 63, 50, 160, 300, null, null],
+        [64, "김원섭", -1, 0, null, 67, 29, 77, 160, 300, null, null],
+        [87, "신동주", -1, 0, null, 68, 76, 79, 160, 300, null, null],
+        [4, "김진우", -1, 0, null, 70, 72, 59, 160, 300, null, null],
+        [6, "최희섭", -1, 0, null, 82, 79, 29, 160, 300, null, null, "형 저 메이저리거에요"],
+        [70, "서재응", -1, 0, null, 67, 69, 80, 160, 300, null, null],
+        [98, "나지완", -1, 0, null, 76, 81, 33, 160, 300, null, null],
+        [54, "채종범", -1, 0, null, 60, 48, 31, 160, 300, null, null],
+        [51, "로페즈", -1, 0, null, 73, 67, 80, 160, 300, null, null],
+        [129, "안치홍", -1, 0, null, 83, 67, 73, 160, 300, null, null],
+        [146, "양현종", -1, 0, null, 75, 78, 72, 160, 300, null, null],
+        [21, "김선빈", -1, 0, null, 86, 16, 76, 160, 300, null, null],
+        [44, "이범호", -1, 0, null, 67, 88, 48, 160, 300, null, null, "꽃보다 아름다운 남자"],
+        [78, "김상현", -1, 0, null, 53, 82, 50, 160, 300, null, null],
+        [116, "이대형", -1, 0, null, 74, 12, 94, 160, 300, null, null, "누구보다 빠르게 난 남들과는 다르게"],
+        [66, "김병현", -1, 0, null, 97, 92, 73, 160, 300, null, null],
+        [67, "박찬호", -1, 0, null, 102, 103, 96, 160, 300, null, null, "안녕하세요 제가 LA에 있을 시절부터 놀란 라이언같은 투수가 되고 싶었는데요. 그래서 런닝도 하고 웨이트도 하다보니 어느덧 강속구 투수가 되어서…"],
+        [79, "송은범", -1, 0, null, 60, 57, 63, 160, 300, null, null],
+        [133, "심수창", -1, 0, null, 40, 53, 39, 160, 300, null, null],
+        [132, "윤규진", -1, 0, null, 53, 60, 38, 160, 300, null, null],
+        [15, "정우람", -1, 0, null, 81, 76, 79, 160, 300, null, null],
+        [145, "김태균", -1, 0, null, 91, 91, 36, 160, 300, null, null],
+        [50, "송광민", -1, 0, null, 80, 72, 19, 160, 300, null, null],
+        [31, "정근우", -1, 0, null, 86, 74, 87, 160, 300, null, null],
+        [64, "최진행", -1, 0, null, 57, 76, 12, 160, 300, null, null, "약 좀 주세요"],
+        [114, "한용덕", -1, 0, null, 75, 76, 79, 160, 300, null, null],
+        [106, "구대성", -1, 0, null, 88, 86, 72, 160, 300, null, null],
+        [62, "유승안", -1, 0, null, 72, 73, 22, 160, 300, null, null],
+        [65, "정민철", -1, 0, null, 72, 79, 85, 160, 300, null, null],
+        [79, "장종훈", -1, 0, null, 81, 94, 83, 160, 300, null, null, "신고선수의 전설"],
+        [100, "송진우", -1, 0, null, 80, 83, 86, 160, 300, null, null],
+        [133, "이강돈", -1, 0, null, 77, 72, 76, 160, 300, null, null],
+        [114, "이상목", -1, 0, null, 67, 73, 79, 160, 300, null, null],
+        [35, "한희민", -1, 0, null, 80, 58, 74, 160, 300, null, null],
+        [58, "류현진", -1, 0, null, 97, 98, 92, 160, 300, null, null, "야구는 수비를 믿지 말고 내가 잘해야 이긴다"],
+        [6, "이정훈", -1, 0, null, 83, 60, 81, 160, 300, null, null],
+        [78, "이영우", -1, 0, null, 82, 79, 77, 160, 300, null, null],
+        [54, "동봉철", -1, 0, null, 63, 32, 77, 160, 300, null, null],
+        [33, "김현수", -1, 0, null, 88, 81, 48, 160, 300, null, null],
+        [78, "추신수", -1, 0, null, 99, 99, 96, 160, 300, null, null, "Go! Choo! Go! Choo!"],
+        [79, "최원호", -1, 0, null, 55, 53, 53, 160, 300, null, null],
+        [116, "신명철", -1, 0, null, 41, 53, 76, 160, 300, null, null],
+        [78, "백재호", -1, 0, null, 44, 63, 22, 160, 300, null, null],
+        [62, "노장진", -1, 0, null, 64, 82, 48, 160, 300, null, null],
+        [0, "조용준", -1, 0, null, 86, 61, 69, 160, 300, null, null],
+        [81, "이진영", -1, 0, null, 86, 82, 79, 160, 300, null, null, "어디로 던져도 난 머리에 맞는다"],
+        [124, "장원삼", -1, 0, null, 70, 80, 83, 160, 300, null, null],
+        [88, "고영민", -1, 0, null, 50, 45, 76, 160, 300, null, null],
+        [118, "옥스프링", -1, 0, null, 74, 68, 72, 160, 300, null, null],
+        [71, "사도스키", -1, 0, null, 68, 68, 76, 160, 300, null, null],
+        [114, "해커", -1, 0, null, 85, 88, 89, 160, 300, null, null, "x까! x빨놈아!"],
+        [66, "브룸바", -1, 0, null, 84, 77, 22, 160, 300, null, null],
+        [75, "밴헤켄", -1, 0, null, 80, 82, 86, 160, 300, null, null],
+        [44, "레일리", -1, 0, null, 67, 74, 77, 160, 300, null, null],
+        [103, "그레이싱어", -1, 0, null, 75, 74, 67, 160, 300, null, null],
+        [68, "글로버", -1, 0, null, 72, 84, 50, 160, 300, null, null],
+        [78, "소사", -1, 0, null, 69, 80, 72, 160, 300, null, null],
+        [101, "레스", -1, 0, null, 76, 74, 51, 160, 300, null, null],
+        [71, "켈리", -1, 0, null, 73, 77, 70, 160, 300, null, null],
+        [135, "피어밴드", -1, 0, null, 70, 73, 77, 160, 300, null, null]
+    ],	
+    "general_ex":[
+    ],
+    "cities":[
+
+    ],
+    "history":[
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>KBO 올스타가 삼모전과 함께합니다."
+    ],
+    "initialEvents":[
+
+    ],
+    "events":[
+
+    ]
+}
\ No newline at end of file

From b447065651213d7073f76c9eb5a6a8d8f8b0b97f Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 25 Apr 2018 18:12:08 +0900
Subject: [PATCH 145/184] =?UTF-8?q?scenario=2030=EB=B2=88=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/scenario/scenario_30.json | 548 +++++++++++++++++-----------------
 1 file changed, 274 insertions(+), 274 deletions(-)

diff --git a/hwe/scenario/scenario_30.json b/hwe/scenario/scenario_30.json
index 76e7aae7..fe916676 100644
--- a/hwe/scenario/scenario_30.json
+++ b/hwe/scenario/scenario_30.json
@@ -1,285 +1,285 @@
 {
     "title":"【가상모드10】 KBO 올스타전",
-    "life":0,
+    "life":1,
     "fiction":1,
     "nation":[
     ],
     "diplomacy":[
     ],
     "general":[
-        [100, "김일융", -1, 0, null, 88, 83, 79, 160, 300, null, null],
-        [107, "이승엽", -1, 0, null, 90, 108, 37, 160, 300, null, null, "안녕하세요 국민타자 이승엽입니다."],
-        [80, "마해영", -1, 0, null, 84, 84, 22, 160, 300, null, null],
-        [34, "채태인", -1, 0, null, 86, 54, 15, 160, 300, null, null, "신대륙은 어디에…"],
-        [143, "김성래", -1, 0, null, 75, 86, 19, 160, 300, null, null],
-        [148, "강기웅", -1, 0, null, 82, 61, 83, 160, 300, null, null],
-        [75, "나바로", -1, 0, null, 82, 85, 79, 160, 300, null, null],
-        [46, "김한수", -1, 0, null, 80, 82, 48, 160, 300, null, null],
-        [1, "조동찬", -1, 0, null, 55, 68, 75, 160, 300, null, null],
-        [115, "류중일", -1, 0, null, 68, 34, 78, 160, 300, null, null, "내 아들 상수야…"],
-        [62, "김상수", -1, 0, null, 68, 21, 80, 160, 300, null, null, "예 아부지…"],
-        [71, "박진만", -1, 0, null, 72, 78, 69, 160, 300, null, null],
-        [42, "양준혁", -1, 0, null, 97, 98, 91, 160, 300, null, null, "내보다 강미노가 머리 더 큰데?"],
-        [124, "박한이", -1, 0, null, 83, 77, 79, 160, 300, null, null, "킁킁"],
-        [56, "최형우", -1, 0, null, 87, 86, 20, 160, 300, null, null],
-        [119, "장효조", -1, 0, null, 95, 39, 68, 160, 300, null, null],
-        [56, "동봉철", -1, 0, null, 65, 41, 74, 160, 300, null, null],
-        [66, "강동우", -1, 0, null, 67, 53, 79, 160, 300, null, null],
-        [118, "신동주", -1, 0, null, 68, 71, 76, 160, 300, null, null],
-        [60, "이만수", -1, 0, null, 89, 97, 49, 160, 300, null, null],
-        [23, "진갑용", -1, 0, null, 74, 80, 15, 160, 300, null, null],
-        [37, "김시진", -1, 0, null, 84, 88, 75, 160, 300, null, null],
-        [38, "배영수", -1, 0, null, 79, 86, 87, 160, 300, null, null],
-        [21, "윤성환", -1, 0, null, 74, 86, 87, 160, 300, null, null],
-        [68, "안지만", -1, 0, null, 69, 79, 75, 160, 300, null, null],
-        [138, "김현욱", -1, 0, null, 82, 85, 84, 160, 300, null, null],
-        [147, "정현욱", -1, 0, null, 74, 83, 77, 160, 300, null, null],
-        [123, "권혁", -1, 0, null, 75, 86, 62, 160, 300, null, null],
-        [97, "임창용", -1, 0, null, 83, 86, 80, 160, 300, null, null],
-        [9, "오승환", -1, 0, null, 97, 92, 89, 160, 300, null, null],
-        [115, "권영호", -1, 0, null, 83, 53, 76, 160, 300, null, null],
-        [146, "이선희", -1, 0, null, 83, 49, 74, 160, 300, null, null],
-        [71, "공필성", -1, 0, null, 46, 47, 77, 160, 300, null, null],
-        [59, "양상문", -1, 0, null, 76, 54, 76, 160, 300, null, null],
-        [79, "윤형배", -1, 0, null, 77, 69, 73, 160, 300, null, null],
-        [142, "박정태", -1, 0, null, 84, 74, 39, 160, 300, null, null],
-        [10, "주형광", -1, 0, null, 79, 86, 84, 160, 300, null, null],
-        [27, "강영식", -1, 0, null, 63, 69, 60, 160, 300, null, null],
-        [124, "김사율", -1, 0, null, 74, 66, 67, 160, 300, null, null],
-        [30, "배장호", -1, 0, null, 62, 48, 60, 160, 300, null, null],
-        [129, "손민한", -1, 0, null, 85, 84, 94, 160, 300, null, null, "팝콘이 먹고싶다"],
-        [134, "송승준", -1, 0, null, 65, 84, 67, 160, 300, null, null],
-        [142, "이용훈", -1, 0, null, 48, 58, 63, 160, 300, null, null],
-        [92, "임경완", -1, 0, null, 68, 57, 39, 160, 300, null, null],
-        [137, "장원준", -1, 0, null, 75, 83, 74, 160, 300, null, null],
-        [10, "조정훈", -1, 0, null, 67, 59, 79, 160, 300, null, null],
-        [73, "최대성", -1, 0, null, 69, 63, 38, 160, 300, null, null],
-        [127, "허준혁", -1, 0, null, 58, 51, 48, 160, 300, null, null],
-        [56, "강민호", -1, 0, null, 75, 86, 48, 160, 300, null, null],
-        [46, "최기문", -1, 0, null, 65, 37, 64, 160, 300, null, null],
-        [105, "임수혁", -1, 0, null, 67, 44, 56, 160, 300, null, null],
-        [64, "김주찬", -1, 0, null, 75, 53, 88, 160, 300, null, null],
-        [91, "문규현", -1, 0, null, 46, 22, 49, 160, 300, null, null],
-        [114, "박기혁", -1, 0, null, 48, 25, 70, 160, 300, null, null],
-        [5, "이대호", -1, 0, null, 95, 98, 10, 160, 300, null, null, "마 니 일로 내리와 "],
-        [120, "전준우", -1, 0, null, 80, 72, 75, 160, 300, null, null, "홈런! 홈런!....아냐?"],
-        [93, "손아섭", -1, 0, null, 89, 75, 82, 160, 300, null, null],
-        [101, "홍성흔", -1, 0, null, 86, 77, 53, 160, 300, null, null],
-        [21, "조성환", -1, 0, null, 79, 42, 77, 160, 300, null, null],
-        [121, "가르시아", -1, 0, null, 70, 85, 12, 160, 300, null, null],
-        [149, "정보명", -1, 0, null, 69, 31, 39, 160, 300, null, null],
-        [144, "이재곤", -1, 0, null, 40, 41, 39, 160, 300, null, null],
-        [142, "염종석", -1, 0, null, 83, 90, 93, 160, 300, null, null],
-        [27, "황재균", -1, 0, null, 79, 77, 83, 160, 300, null, null],
-        [25, "윤학길", -1, 0, null, 81, 76, 82, 160, 300, null, null],
-        [55, "가득염", -1, 0, null, 60, 67, 61, 160, 300, null, null],
-        [68, "조경환", -1, 0, null, 57, 78, 20, 160, 300, null, null],
-        [7, "강상수", -1, 0, null, 65, 66, 58, 160, 300, null, null],
-        [39, "최준석", -1, 0, null, 79, 86, 10, 160, 300, null, null],
-        [79, "최동원", -1, 0, null, 98, 94, 96, 160, 300, null, null],
-        [132, "김용철", -1, 0, null, 77, 79, 67, 160, 300, null, null],
-        [66, "김용희", -1, 0, null, 67, 64, 21, 160, 300, null, null],
-        [46, "호세", -1, 0, null, 88, 86, 39, 160, 300, null, null, "헤이 영쑤! 돈 두 댓!"],
-        [51, "감사용", -1, 0, null, 37, 18, 65, 160, 300, null, null],
-        [121, "금광옥", -1, 0, null, 31, 30, 39, 160, 300, null, null],
-        [44, "김무관", -1, 0, null, 20, 7, 43, 160, 300, null, null],
-        [122, "양승관", -1, 0, null, 46, 44, 22, 160, 300, null, null],
-        [131, "박철순", -1, 0, null, 89, 82, 80, 160, 300, null, null],
-        [75, "하기룡", -1, 0, null, 82, 58, 64, 160, 300, null, null],
-        [41, "황규봉", -1, 0, null, 83, 48, 72, 160, 300, null, null],
-        [73, "계형철", -1, 0, null, 74, 75, 70, 160, 300, null, null],
-        [11, "김경문", -1, 0, null, 48, 9, 34, 160, 300, null, null],
-        [142, "조범현", -1, 0, null, 29, 25, 83, 160, 300, null, null],
-        [140, "백인천", -1, 0, null, 95, 77, 66, 160, 300, null, null],
-        [4, "김인식", -1, 0, null, 58, 15, 75, 160, 300, null, null],
-        [13, "김재박", -1, 0, null, 73, 29, 91, 160, 300, null, null],
-        [85, "박정현", -1, 0, null, 82, 78, 80, 160, 300, null, null],
-        [138, "전준호", -1, 0, null, 79, 42, 101, 160, 300, null, null, "전설의 대도"],
-        [84, "심정수", -1, 0, null, 80, 92, 41, 160, 300, null, null],
-        [87, "박재홍", -1, 0, null, 87, 95, 94, 160, 300, null, null],
-        [42, "박경완", -1, 0, null, 48, 89, 79, 160, 300, null, null],
-        [31, "박종호", -1, 0, null, 76, 76, 81, 160, 300, null, null],
-        [116, "이숭용", -1, 0, null, 81, 83, 67, 160, 300, null, null],
-        [60, "송지만", -1, 0, null, 78, 89, 86, 160, 300, null, null],
-        [93, "나이트", -1, 0, null, 75, 79, 82, 160, 300, null, null],
-        [35, "송신영", -1, 0, null, 67, 69, 69, 160, 300, null, null],
-        [139, "이택근", -1, 0, null, 86, 80, 83, 160, 300, null, null],
-        [149, "위재영", -1, 0, null, 80, 69, 67, 160, 300, null, null],
-        [43, "김성래", -1, 0, null, 77, 81, 23, 160, 300, null, null],
-        [100, "데이비스", -1, 0, null, 89, 83, 77, 160, 300, null, null],
-        [43, "임선동", -1, 0, null, 67, 72, 76, 160, 300, null, null],
-        [14, "우즈", -1, 0, null, 89, 90, 36, 160, 300, null, null],
-        [142, "성준", -1, 0, null, 78, 58, 67, 160, 300, null, null],
-        [127, "장명부", -1, 0, null, 84, 82, 76, 160, 300, null, null],
-        [4, "정명원", -1, 0, null, 89, 84, 76, 160, 300, null, null],
-        [112, "김응국", -1, 0, null, 82, 79, 86, 160, 300, null, null],
-        [96, "강정호", -1, 0, null, 81, 81, 48, 160, 300, null, null],
-        [147, "박병호", -1, 0, null, 80, 95, 56, 160, 300, null, null],
-        [86, "김민성", -1, 0, null, 79, 80, 38, 160, 300, null, null],
-        [71, "서건창", -1, 0, null, 94, 26, 91, 160, 300, null, null],
-        [45, "김하성", -1, 0, null, 80, 63, 69, 160, 300, null, null],
-        [22, "이정후", -1, 0, null, 86, 8, 15, 160, 300, null, null],
-        [111, "정민태", -1, 0, null, 77, 78, 82, 160, 300, null, null],
-        [45, "정경배", -1, 0, null, 64, 76, 67, 160, 300, null, null],
-        [62, "김기태", -1, 0, null, 86, 90, 76, 160, 300, null, null],
-        [20, "이승호", -1, 0, null, 71, 80, 53, 160, 300, null, null],
-        [90, "김광현", -1, 0, null, 84, 90, 86, 160, 300, null, null, "제가 현진이형보단 낫죠"],
-        [99, "박정배", -1, 0, null, 62, 63, 67, 160, 300, null, null],
-        [127, "채병용", -1, 0, null, 68, 77, 79, 160, 300, null, null],
-        [142, "윤희상", -1, 0, null, 56, 58, 67, 160, 300, null, null],
-        [135, "이재원", -1, 0, null, 83, 67, 10, 160, 300, null, null],
-        [134, "박정권", -1, 0, null, 78, 83, 53, 160, 300, null, null],
-        [35, "나주환", -1, 0, null, 68, 67, 72, 160, 300, null, null],
-        [44, "최정", -1, 0, null, 89, 91, 88, 160, 300, null, null],
-        [30, "조동화", -1, 0, null, 48, 11, 83, 160, 300, null, null],
-        [50, "김강민", -1, 0, null, 77, 77, 82, 160, 300, null, null],
-        [77, "박용택", -1, 0, null, 92, 90, 92, 160, 300, null, null],
-        [22, "이병규", -1, 0, null, 93, 90, 89, 160, 300, null, null],
-        [135, "조인성", -1, 0, null, 49, 86, 25, 160, 300, null, null],
-        [88, "김동수", -1, 0, null, 65, 86, 65, 160, 300, null, null],
-        [147, "유지현", -1, 0, null, 76, 57, 87, 160, 300, null, null],
-        [91, "김재현", -1, 0, null, 85, 86, 77, 160, 300, null, null],
-        [66, "이상훈", -1, 0, null, 95, 90, 87, 160, 300, null, null],
-        [106, "서용빈", -1, 0, null, 81, 22, 87, 160, 300, null, null],
-        [71, "봉중근", -1, 0, null, 77, 68, 44, 160, 300, null, null],
-        [40, "차우찬", -1, 0, null, 67, 82, 49, 160, 300, null, null],
-        [118, "오지환", -1, 0, null, 57, 68, 80, 160, 300, null, null, "경기를 지배하는 오지배입니다"],
-        [85, "금민철", -1, 0, null, 61, 50, 42, 160, 300, null, null],
-        [70, "김동주", -1, 0, null, 92, 92, 48, 160, 300, null, null],
-        [22, "김선우", -1, 0, null, 65, 67, 74, 160, 300, null, null],
-        [12, "김재호", -1, 0, null, 68, 21, 58, 160, 300, null, null],
-        [11, "노경은", -1, 0, null, 48, 59, 61, 160, 300, null, null],
-        [19, "니퍼트", -1, 0, null, 76, 88, 67, 160, 300, null, null],
-        [126, "류택현", -1, 0, null, 65, 79, 63, 160, 300, null, null],
-        [68, "민병헌", -1, 0, null, 84, 53, 81, 160, 300, null, null],
-        [140, "박명환", -1, 0, null, 72, 80, 41, 160, 300, null, null, "배추 좀 주세요"],
-        [9, "안경현", -1, 0, null, 67, 78, 34, 160, 300, null, null],
-        [120, "양의지", -1, 0, null, 83, 77, 39, 160, 300, null, null],
-        [65, "오재원", -1, 0, null, 67, 30, 87, 160, 300, null, null, "식빵!"],
-        [6, "유희관", -1, 0, null, 65, 76, 69, 160, 300, null, null, "싸인해드릴까요?"],
-        [3, "이용찬", -1, 0, null, 68, 72, 74, 160, 300, null, null],
-        [19, "이성열", -1, 0, null, 48, 77, 41, 160, 300, null, null],
-        [94, "이재영", -1, 0, null, 63, 64, 39, 160, 300, null, null],
-        [5, "이종욱", -1, 0, null, 83, 35, 91, 160, 300, null, null],
-        [88, "이현승", -1, 0, null, 63, 65, 67, 160, 300, null, null],
-        [39, "이혜천", -1, 0, null, 62, 50, 48, 160, 300, null, null],
-        [138, "전병두", -1, 0, null, 71, 78, 29, 160, 300, null, null],
-        [47, "정대현", -1, 0, null, 88, 58, 70, 160, 300, null, null],
-        [90, "정수빈", -1, 0, null, 72, 19, 83, 160, 300, null, null],
-        [24, "정수근", -1, 0, null, 76, 26, 89, 160, 300, null, null],
-        [54, "홍상삼", -1, 0, null, 59, 49, 51, 160, 300, null, null],
-        [41, "손시헌", -1, 0, null, 68, 57, 31, 160, 300, null, null],
-        [93, "박민우", -1, 0, null, 86, 8, 76, 160, 300, null, null],
-        [24, "모창민", -1, 0, null, 68, 57, 60, 160, 300, null, null],
-        [55, "지석훈", -1, 0, null, 39, 38, 12, 160, 300, null, null],
-        [35, "박석민", -1, 0, null, 79, 84, 23, 160, 300, null, null, "브로콜리 돼지 나가신다"],
-        [123, "이민호", -1, 0, null, 57, 78, 53, 160, 300, null, null],
-        [28, "김진성", -1, 0, null, 63, 67, 69, 160, 300, null, null],
-        [104, "권희동", -1, 0, null, 49, 41, 21, 160, 300, null, null],
-        [133, "임창민", -1, 0, null, 71, 67, 63, 160, 300, null, null],
-        [37, "원종현", -1, 0, null, 62, 67, 71, 160, 300, null, null],
-        [82, "이재학", -1, 0, null, 62, 53, 58, 160, 300, null, null],
-        [96, "최금강", -1, 0, null, 44, 48, 53, 160, 300, null, null],
-        [55, "김상엽", -1, 0, null, 68, 60, 39, 160, 300, null, null],
-        [107, "김수경", -1, 0, null, 67, 82, 58, 160, 300, null, null],
-        [19, "테임즈", -1, 0, null, 94, 96, 76, 160, 300, null, null, "황재균은 섹x머신이다"],
-        [49, "나성범", -1, 0, null, 90, 83, 70, 160, 300, null, null],
-        [133, "김성한", -1, 0, null, 80, 86, 79, 160, 300, null, null],
-        [128, "방수원", -1, 0, null, 74, 53, 76, 160, 300, null, null],
-        [49, "김봉연", -1, 0, null, 74, 79, 40, 160, 300, null, null],
-        [115, "김일권", -1, 0, null, 53, 29, 95, 160, 300, null, null],
-        [88, "김종모", -1, 0, null, 85, 70, 31, 160, 300, null, null],
-        [108, "선동열", -1, 0, null, 104, 96, 99, 160, 300, null, null, "무등산 폭격기"],
-        [5, "이종범", -1, 0, null, 91, 93, 103, 160, 300, null, null, "내겐 보이지 않는 무언가가 있다"],
-        [81, "문희수", -1, 0, null, 72, 61, 63, 160, 300, null, null],
-        [25, "유승안", -1, 0, null, 65, 73, 34, 160, 300, null, null],
-        [67, "이순철", -1, 0, null, 63, 80, 87, 160, 300, null, null, "LG는 내 덕에 강팀이 되었지"],
-        [29, "차동철", -1, 0, null, 73, 23, 67, 160, 300, null, null],
-        [41, "한대화", -1, 0, null, 79, 82, 71, 160, 300, null, null],
-        [45, "이강철", -1, 0, null, 83, 81, 62, 160, 300, null, null],
-        [55, "조계현", -1, 0, null, 86, 71, 73, 160, 300, null, null],
-        [87, "최향남", -1, 0, null, 63, 64, 34, 160, 300, null, null],
-        [45, "홍현우", -1, 0, null, 71, 84, 81, 160, 300, null, null],
-        [144, "이대진", -1, 0, null, 73, 74, 58, 160, 300, null, null],
-        [57, "장채근", -1, 0, null, 30, 72, 31, 160, 300, null, null],
-        [104, "김종국", -1, 0, null, 46, 62, 86, 160, 300, null, null],
-        [130, "곽채진", -1, 0, null, 61, 67, 59, 160, 300, null, null],
-        [43, "황두성", -1, 0, null, 73, 79, 51, 160, 300, null, null],
-        [4, "이호준", -1, 0, null, 82, 86, 51, 160, 300, null, null],
-        [117, "장성호", -1, 0, null, 84, 83, 74, 160, 300, null, null],
-        [12, "정성훈", -1, 0, null, 84, 80, 77, 160, 300, null, null],
-        [99, "최상덕", -1, 0, null, 61, 67, 73, 160, 300, null, null],
-        [86, "홍세완", -1, 0, null, 67, 72, 39, 160, 300, null, null],
-        [28, "리오스", -1, 0, null, 81, 76, 71, 160, 300, null, null],
-        [84, "차일목", -1, 0, null, 38, 31, 34, 160, 300, null, null],
-        [72, "진필중", -1, 0, null, 79, 83, 75, 160, 300, null, null],
-        [35, "유동훈", -1, 0, null, 74, 51, 64, 160, 300, null, null],
-        [29, "이재주", -1, 0, null, 48, 77, 6, 160, 300, null, null],
-        [59, "심재학", -1, 0, null, 66, 75, 26, 160, 300, null, null],
-        [101, "이용규", -1, 0, null, 86, 20, 86, 160, 300, null, null],
-        [65, "윤석민", -1, 0, null, 86, 79, 81, 160, 300, null, null, "죄송합니다 제가 공황장애가 와서.."],
-        [80, "조규제", -1, 0, null, 83, 76, 58, 160, 300, null, null],
-        [70, "한기주", -1, 0, null, 72, 57, 58, 160, 300, null, null, "속이 꽉찬 남자 99.9"],
-        [136, "이동현", -1, 0, null, 71, 63, 50, 160, 300, null, null],
-        [64, "김원섭", -1, 0, null, 67, 29, 77, 160, 300, null, null],
-        [87, "신동주", -1, 0, null, 68, 76, 79, 160, 300, null, null],
-        [4, "김진우", -1, 0, null, 70, 72, 59, 160, 300, null, null],
-        [6, "최희섭", -1, 0, null, 82, 79, 29, 160, 300, null, null, "형 저 메이저리거에요"],
-        [70, "서재응", -1, 0, null, 67, 69, 80, 160, 300, null, null],
-        [98, "나지완", -1, 0, null, 76, 81, 33, 160, 300, null, null],
-        [54, "채종범", -1, 0, null, 60, 48, 31, 160, 300, null, null],
-        [51, "로페즈", -1, 0, null, 73, 67, 80, 160, 300, null, null],
-        [129, "안치홍", -1, 0, null, 83, 67, 73, 160, 300, null, null],
-        [146, "양현종", -1, 0, null, 75, 78, 72, 160, 300, null, null],
-        [21, "김선빈", -1, 0, null, 86, 16, 76, 160, 300, null, null],
-        [44, "이범호", -1, 0, null, 67, 88, 48, 160, 300, null, null, "꽃보다 아름다운 남자"],
-        [78, "김상현", -1, 0, null, 53, 82, 50, 160, 300, null, null],
-        [116, "이대형", -1, 0, null, 74, 12, 94, 160, 300, null, null, "누구보다 빠르게 난 남들과는 다르게"],
-        [66, "김병현", -1, 0, null, 97, 92, 73, 160, 300, null, null],
-        [67, "박찬호", -1, 0, null, 102, 103, 96, 160, 300, null, null, "안녕하세요 제가 LA에 있을 시절부터 놀란 라이언같은 투수가 되고 싶었는데요. 그래서 런닝도 하고 웨이트도 하다보니 어느덧 강속구 투수가 되어서…"],
-        [79, "송은범", -1, 0, null, 60, 57, 63, 160, 300, null, null],
-        [133, "심수창", -1, 0, null, 40, 53, 39, 160, 300, null, null],
-        [132, "윤규진", -1, 0, null, 53, 60, 38, 160, 300, null, null],
-        [15, "정우람", -1, 0, null, 81, 76, 79, 160, 300, null, null],
-        [145, "김태균", -1, 0, null, 91, 91, 36, 160, 300, null, null],
-        [50, "송광민", -1, 0, null, 80, 72, 19, 160, 300, null, null],
-        [31, "정근우", -1, 0, null, 86, 74, 87, 160, 300, null, null],
-        [64, "최진행", -1, 0, null, 57, 76, 12, 160, 300, null, null, "약 좀 주세요"],
-        [114, "한용덕", -1, 0, null, 75, 76, 79, 160, 300, null, null],
-        [106, "구대성", -1, 0, null, 88, 86, 72, 160, 300, null, null],
-        [62, "유승안", -1, 0, null, 72, 73, 22, 160, 300, null, null],
-        [65, "정민철", -1, 0, null, 72, 79, 85, 160, 300, null, null],
-        [79, "장종훈", -1, 0, null, 81, 94, 83, 160, 300, null, null, "신고선수의 전설"],
-        [100, "송진우", -1, 0, null, 80, 83, 86, 160, 300, null, null],
-        [133, "이강돈", -1, 0, null, 77, 72, 76, 160, 300, null, null],
-        [114, "이상목", -1, 0, null, 67, 73, 79, 160, 300, null, null],
-        [35, "한희민", -1, 0, null, 80, 58, 74, 160, 300, null, null],
-        [58, "류현진", -1, 0, null, 97, 98, 92, 160, 300, null, null, "야구는 수비를 믿지 말고 내가 잘해야 이긴다"],
-        [6, "이정훈", -1, 0, null, 83, 60, 81, 160, 300, null, null],
-        [78, "이영우", -1, 0, null, 82, 79, 77, 160, 300, null, null],
-        [54, "동봉철", -1, 0, null, 63, 32, 77, 160, 300, null, null],
-        [33, "김현수", -1, 0, null, 88, 81, 48, 160, 300, null, null],
-        [78, "추신수", -1, 0, null, 99, 99, 96, 160, 300, null, null, "Go! Choo! Go! Choo!"],
-        [79, "최원호", -1, 0, null, 55, 53, 53, 160, 300, null, null],
-        [116, "신명철", -1, 0, null, 41, 53, 76, 160, 300, null, null],
-        [78, "백재호", -1, 0, null, 44, 63, 22, 160, 300, null, null],
-        [62, "노장진", -1, 0, null, 64, 82, 48, 160, 300, null, null],
-        [0, "조용준", -1, 0, null, 86, 61, 69, 160, 300, null, null],
-        [81, "이진영", -1, 0, null, 86, 82, 79, 160, 300, null, null, "어디로 던져도 난 머리에 맞는다"],
-        [124, "장원삼", -1, 0, null, 70, 80, 83, 160, 300, null, null],
-        [88, "고영민", -1, 0, null, 50, 45, 76, 160, 300, null, null],
-        [118, "옥스프링", -1, 0, null, 74, 68, 72, 160, 300, null, null],
-        [71, "사도스키", -1, 0, null, 68, 68, 76, 160, 300, null, null],
-        [114, "해커", -1, 0, null, 85, 88, 89, 160, 300, null, null, "x까! x빨놈아!"],
-        [66, "브룸바", -1, 0, null, 84, 77, 22, 160, 300, null, null],
-        [75, "밴헤켄", -1, 0, null, 80, 82, 86, 160, 300, null, null],
-        [44, "레일리", -1, 0, null, 67, 74, 77, 160, 300, null, null],
-        [103, "그레이싱어", -1, 0, null, 75, 74, 67, 160, 300, null, null],
-        [68, "글로버", -1, 0, null, 72, 84, 50, 160, 300, null, null],
-        [78, "소사", -1, 0, null, 69, 80, 72, 160, 300, null, null],
-        [101, "레스", -1, 0, null, 76, 74, 51, 160, 300, null, null],
-        [71, "켈리", -1, 0, null, 73, 77, 70, 160, 300, null, null],
-        [135, "피어밴드", -1, 0, null, 70, 73, 77, 160, 300, null, null]
+        [108, "김일융", -1, 0, null, 88, 83, 79, 0, 160, 300, "패권", null],
+[16, "이승엽", -1, 0, null, 90, 108, 37, 0, 160, 300, "재간", null, "안녕하세요 국민타자 이승엽입니다."],
+[2, "마해영", -1, 0, null, 84, 84, 22, 0, 160, 300, "왕좌", null],
+[84, "채태인", -1, 0, null, 86, 54, 15, 0, 160, 300, "유지", null, "신대륙은 어디에…"],
+[142, "김성래", -1, 0, null, 75, 86, 19, 0, 160, 300, "대의", null],
+[15, "강기웅", -1, 0, null, 82, 61, 83, 0, 160, 300, "의협", null],
+[46, "나바로", -1, 0, null, 82, 85, 79, 0, 160, 300, "할거", null],
+[141, "김한수", -1, 0, null, 80, 82, 48, 0, 160, 300, "유지", null],
+[135, "조동찬", -1, 0, null, 55, 68, 75, 0, 160, 300, "대의", null],
+[133, "류중일", -1, 0, null, 68, 34, 78, 0, 160, 300, "출세", null, "내 아들 상수야…"],
+[99, "김상수", -1, 0, null, 68, 21, 80, 0, 160, 300, "안전", null, "예 아부지…"],
+[71, "박진만", -1, 0, null, 72, 78, 69, 0, 160, 300, "대의", null],
+[14, "양준혁", -1, 0, null, 97, 98, 91, 0, 160, 300, "재간", null, "내보다 강미노가 머리 더 큰데?"],
+[110, "박한이", -1, 0, null, 83, 77, 79, 0, 160, 300, "왕좌", null, "킁킁"],
+[72, "최형우", -1, 0, null, 87, 86, 20, 0, 160, 300, "유지", null],
+[34, "장효조", -1, 0, null, 95, 39, 68, 0, 160, 300, "재간", null],
+[26, "동봉철", -1, 0, null, 65, 41, 74, 0, 160, 300, "대의", null],
+[94, "강동우", -1, 0, null, 67, 53, 79, 0, 160, 300, "재간", null],
+[51, "신동주", -1, 0, null, 68, 71, 76, 0, 160, 300, "대의", null],
+[117, "이만수", -1, 0, null, 89, 97, 49, 0, 160, 300, "대의", null],
+[133, "진갑용", -1, 0, null, 74, 80, 15, 0, 160, 300, "할거", null],
+[138, "김시진", -1, 0, null, 84, 88, 75, 0, 160, 300, "출세", null],
+[122, "배영수", -1, 0, null, 79, 86, 87, 0, 160, 300, "할거", null],
+[49, "윤성환", -1, 0, null, 74, 86, 87, 0, 160, 300, "패권", null],
+[96, "안지만", -1, 0, null, 69, 79, 75, 0, 160, 300, "의협", null],
+[31, "김현욱", -1, 0, null, 82, 85, 84, 0, 160, 300, "패권", null],
+[147, "정현욱", -1, 0, null, 74, 83, 77, 0, 160, 300, "안전", null],
+[112, "권혁", -1, 0, null, 75, 86, 62, 0, 160, 300, "출세", null],
+[59, "임창용", -1, 0, null, 83, 86, 80, 0, 160, 300, "재간", null],
+[59, "오승환", -1, 0, null, 97, 92, 89, 0, 160, 300, "할거", null],
+[11, "권영호", -1, 0, null, 83, 53, 76, 0, 160, 300, "출세", null],
+[42, "이선희", -1, 0, null, 83, 49, 74, 0, 160, 300, "패권", null],
+[105, "공필성", -1, 0, null, 46, 47, 77, 0, 160, 300, "정복", null],
+[100, "양상문", -1, 0, null, 76, 54, 76, 0, 160, 300, "재간", null],
+[28, "윤형배", -1, 0, null, 77, 69, 73, 0, 160, 300, "왕좌", null],
+[97, "박정태", -1, 0, null, 84, 74, 39, 0, 160, 300, "재간", null],
+[42, "주형광", -1, 0, null, 79, 86, 84, 0, 160, 300, "안전", null],
+[14, "강영식", -1, 0, null, 63, 69, 60, 0, 160, 300, "유지", null],
+[124, "김사율", -1, 0, null, 74, 66, 67, 0, 160, 300, "의협", null],
+[74, "배장호", -1, 0, null, 62, 48, 60, 0, 160, 300, "출세", null],
+[16, "손민한", -1, 0, null, 85, 84, 94, 0, 160, 300, "유지", null, "팝콘이 먹고싶다"],
+[84, "송승준", -1, 0, null, 65, 84, 67, 0, 160, 300, "정복", null],
+[82, "이용훈", -1, 0, null, 48, 58, 63, 0, 160, 300, "할거", null],
+[70, "임경완", -1, 0, null, 68, 57, 39, 0, 160, 300, "패권", null],
+[36, "장원준", -1, 0, null, 75, 83, 74, 0, 160, 300, "패권", null],
+[5, "조정훈", -1, 0, null, 67, 59, 79, 0, 160, 300, "할거", null],
+[55, "최대성", -1, 0, null, 69, 63, 38, 0, 160, 300, "대의", null],
+[103, "허준혁", -1, 0, null, 58, 51, 48, 0, 160, 300, "출세", null],
+[105, "강민호", -1, 0, null, 75, 86, 48, 0, 160, 300, "할거", null],
+[97, "최기문", -1, 0, null, 65, 37, 64, 0, 160, 300, "유지", null],
+[23, "임수혁", -1, 0, null, 67, 44, 56, 0, 160, 300, "출세", null],
+[3, "김주찬", -1, 0, null, 75, 53, 88, 0, 160, 300, "안전", null],
+[59, "문규현", -1, 0, null, 46, 22, 49, 0, 160, 300, "출세", null],
+[132, "박기혁", -1, 0, null, 48, 25, 70, 0, 160, 300, "정복", null],
+[86, "이대호", -1, 0, null, 95, 98, 10, 0, 160, 300, "할거", null, "마 니 일로 내리와 "],
+[2, "전준우", -1, 0, null, 80, 72, 75, 0, 160, 300, "패권", null, "홈런! 홈런!....아냐?"],
+[130, "손아섭", -1, 0, null, 89, 75, 82, 0, 160, 300, "의협", null],
+[53, "홍성흔", -1, 0, null, 86, 77, 53, 0, 160, 300, "패권", null],
+[19, "조성환", -1, 0, null, 79, 42, 77, 0, 160, 300, "의협", null],
+[137, "가르시아", -1, 0, null, 70, 85, 12, 0, 160, 300, "패권", null],
+[92, "정보명", -1, 0, null, 69, 31, 39, 0, 160, 300, "출세", null],
+[137, "이재곤", -1, 0, null, 40, 41, 39, 0, 160, 300, "왕좌", null],
+[45, "염종석", -1, 0, null, 83, 90, 93, 0, 160, 300, "출세", null],
+[99, "황재균", -1, 0, null, 79, 77, 83, 0, 160, 300, "정복", null],
+[120, "윤학길", -1, 0, null, 81, 76, 82, 0, 160, 300, "유지", null],
+[61, "가득염", -1, 0, null, 60, 67, 61, 0, 160, 300, "유지", null],
+[135, "조경환", -1, 0, null, 57, 78, 20, 0, 160, 300, "출세", null],
+[73, "강상수", -1, 0, null, 65, 66, 58, 0, 160, 300, "재간", null],
+[9, "최준석", -1, 0, null, 79, 86, 10, 0, 160, 300, "출세", null],
+[83, "최동원", -1, 0, null, 98, 94, 96, 0, 160, 300, "의협", null],
+[76, "김용철", -1, 0, null, 77, 79, 67, 0, 160, 300, "할거", null],
+[97, "김용희", -1, 0, null, 67, 64, 21, 0, 160, 300, "유지", null],
+[115, "호세", -1, 0, null, 88, 86, 39, 0, 160, 300, "대의", null, "헤이 영쑤! 돈 두 댓!"],
+[144, "감사용", -1, 0, null, 37, 18, 65, 0, 160, 300, "안전", null],
+[44, "금광옥", -1, 0, null, 31, 30, 39, 0, 160, 300, "대의", null],
+[75, "김무관", -1, 0, null, 20, 7, 43, 0, 160, 300, "의협", null],
+[32, "양승관", -1, 0, null, 46, 44, 22, 0, 160, 300, "패권", null],
+[23, "박철순", -1, 0, null, 89, 82, 80, 0, 160, 300, "재간", null],
+[14, "하기룡", -1, 0, null, 82, 58, 64, 0, 160, 300, "의협", null],
+[118, "황규봉", -1, 0, null, 83, 48, 72, 0, 160, 300, "의협", null],
+[132, "계형철", -1, 0, null, 74, 75, 70, 0, 160, 300, "왕좌", null],
+[123, "김경문", -1, 0, null, 48, 9, 34, 0, 160, 300, "왕좌", null],
+[59, "조범현", -1, 0, null, 29, 25, 83, 0, 160, 300, "안전", null],
+[56, "백인천", -1, 0, null, 95, 77, 66, 0, 160, 300, "의협", null],
+[12, "김인식", -1, 0, null, 58, 15, 75, 0, 160, 300, "유지", null],
+[33, "김재박", -1, 0, null, 73, 29, 91, 0, 160, 300, "패권", null],
+[89, "박정현", -1, 0, null, 82, 78, 80, 0, 160, 300, "유지", null],
+[46, "전준호", -1, 0, null, 79, 42, 101, 0, 160, 300, "재간", null, "전설의 대도"],
+[26, "심정수", -1, 0, null, 80, 92, 41, 0, 160, 300, "패권", null],
+[11, "박재홍", -1, 0, null, 87, 95, 94, 0, 160, 300, "출세", null],
+[3, "박경완", -1, 0, null, 48, 89, 79, 0, 160, 300, "안전", null],
+[60, "박종호", -1, 0, null, 76, 76, 81, 0, 160, 300, "대의", null],
+[127, "이숭용", -1, 0, null, 81, 83, 67, 0, 160, 300, "재간", null],
+[148, "송지만", -1, 0, null, 78, 89, 86, 0, 160, 300, "왕좌", null],
+[5, "나이트", -1, 0, null, 75, 79, 82, 0, 160, 300, "대의", null],
+[53, "송신영", -1, 0, null, 67, 69, 69, 0, 160, 300, "출세", null],
+[82, "이택근", -1, 0, null, 86, 80, 83, 0, 160, 300, "대의", null],
+[20, "위재영", -1, 0, null, 80, 69, 67, 0, 160, 300, "할거", null],
+[94, "김성래", -1, 0, null, 77, 81, 23, 0, 160, 300, "출세", null],
+[45, "데이비스", -1, 0, null, 89, 83, 77, 0, 160, 300, "정복", null],
+[132, "임선동", -1, 0, null, 67, 72, 76, 0, 160, 300, "패권", null],
+[111, "우즈", -1, 0, null, 89, 90, 36, 0, 160, 300, "정복", null],
+[94, "성준", -1, 0, null, 78, 58, 67, 0, 160, 300, "대의", null],
+[34, "장명부", -1, 0, null, 84, 82, 76, 0, 160, 300, "유지", null],
+[4, "정명원", -1, 0, null, 89, 84, 76, 0, 160, 300, "할거", null],
+[88, "김응국", -1, 0, null, 82, 79, 86, 0, 160, 300, "왕좌", null],
+[3, "강정호", -1, 0, null, 81, 81, 48, 0, 160, 300, "왕좌", null],
+[62, "박병호", -1, 0, null, 80, 95, 56, 0, 160, 300, "왕좌", null],
+[67, "김민성", -1, 0, null, 79, 80, 38, 0, 160, 300, "패권", null],
+[113, "서건창", -1, 0, null, 94, 26, 91, 0, 160, 300, "대의", null],
+[147, "김하성", -1, 0, null, 80, 63, 69, 0, 160, 300, "의협", null],
+[47, "이정후", -1, 0, null, 86, 8, 15, 0, 160, 300, "왕좌", null],
+[120, "정민태", -1, 0, null, 77, 78, 82, 0, 160, 300, "패권", null],
+[46, "정경배", -1, 0, null, 64, 76, 67, 0, 160, 300, "왕좌", null],
+[54, "김기태", -1, 0, null, 86, 90, 76, 0, 160, 300, "패권", null],
+[67, "이승호", -1, 0, null, 71, 80, 53, 0, 160, 300, "할거", null],
+[69, "김광현", -1, 0, null, 84, 90, 86, 0, 160, 300, "정복", null, "제가 현진이형보단 낫죠"],
+[0, "박정배", -1, 0, null, 62, 63, 67, 0, 160, 300, "정복", null],
+[94, "채병용", -1, 0, null, 68, 77, 79, 0, 160, 300, "의협", null],
+[101, "윤희상", -1, 0, null, 56, 58, 67, 0, 160, 300, "대의", null],
+[73, "이재원", -1, 0, null, 83, 67, 10, 0, 160, 300, "출세", null],
+[26, "박정권", -1, 0, null, 78, 83, 53, 0, 160, 300, "정복", null],
+[131, "나주환", -1, 0, null, 68, 67, 72, 0, 160, 300, "왕좌", null],
+[123, "최정", -1, 0, null, 89, 91, 88, 0, 160, 300, "안전", null],
+[137, "조동화", -1, 0, null, 48, 11, 83, 0, 160, 300, "재간", null],
+[28, "김강민", -1, 0, null, 77, 77, 82, 0, 160, 300, "할거", null],
+[105, "박용택", -1, 0, null, 92, 90, 92, 0, 160, 300, "재간", null],
+[66, "이병규", -1, 0, null, 93, 90, 89, 0, 160, 300, "안전", null],
+[14, "조인성", -1, 0, null, 49, 86, 25, 0, 160, 300, "왕좌", null],
+[145, "김동수", -1, 0, null, 65, 86, 65, 0, 160, 300, "유지", null],
+[28, "유지현", -1, 0, null, 76, 57, 87, 0, 160, 300, "패권", null],
+[88, "김재현", -1, 0, null, 85, 86, 77, 0, 160, 300, "왕좌", null],
+[148, "이상훈", -1, 0, null, 95, 90, 87, 0, 160, 300, "할거", null],
+[4, "서용빈", -1, 0, null, 81, 22, 87, 0, 160, 300, "의협", null],
+[24, "봉중근", -1, 0, null, 77, 68, 44, 0, 160, 300, "대의", null],
+[74, "차우찬", -1, 0, null, 67, 82, 49, 0, 160, 300, "패권", null],
+[22, "오지환", -1, 0, null, 57, 68, 80, 0, 160, 300, "출세", null, "경기를 지배하는 오지배입니다"],
+[131, "금민철", -1, 0, null, 61, 50, 42, 0, 160, 300, "할거", null],
+[15, "김동주", -1, 0, null, 92, 92, 48, 0, 160, 300, "할거", null],
+[37, "김선우", -1, 0, null, 65, 67, 74, 0, 160, 300, "패권", null],
+[16, "김재호", -1, 0, null, 68, 21, 58, 0, 160, 300, "왕좌", null],
+[70, "노경은", -1, 0, null, 48, 59, 61, 0, 160, 300, "안전", null],
+[110, "니퍼트", -1, 0, null, 76, 88, 67, 0, 160, 300, "안전", null],
+[19, "류택현", -1, 0, null, 65, 79, 63, 0, 160, 300, "왕좌", null],
+[93, "민병헌", -1, 0, null, 84, 53, 81, 0, 160, 300, "패권", null],
+[31, "박명환", -1, 0, null, 72, 80, 41, 0, 160, 300, "의협", null, "배추 좀 주세요"],
+[2, "안경현", -1, 0, null, 67, 78, 34, 0, 160, 300, "재간", null],
+[54, "양의지", -1, 0, null, 83, 77, 39, 0, 160, 300, "왕좌", null],
+[70, "오재원", -1, 0, null, 67, 30, 87, 0, 160, 300, "패권", null, "식빵!"],
+[102, "유희관", -1, 0, null, 65, 76, 69, 0, 160, 300, "할거", null, "싸인해드릴까요?"],
+[111, "이용찬", -1, 0, null, 68, 72, 74, 0, 160, 300, "패권", null],
+[62, "이성열", -1, 0, null, 48, 77, 41, 0, 160, 300, "출세", null],
+[48, "이재영", -1, 0, null, 63, 64, 39, 0, 160, 300, "왕좌", null],
+[23, "이종욱", -1, 0, null, 83, 35, 91, 0, 160, 300, "출세", null],
+[28, "이현승", -1, 0, null, 63, 65, 67, 0, 160, 300, "왕좌", null],
+[99, "이혜천", -1, 0, null, 62, 50, 48, 0, 160, 300, "패권", null],
+[112, "전병두", -1, 0, null, 71, 78, 29, 0, 160, 300, "정복", null],
+[102, "정대현", -1, 0, null, 88, 58, 70, 0, 160, 300, "안전", null],
+[32, "정수빈", -1, 0, null, 72, 19, 83, 0, 160, 300, "대의", null],
+[119, "정수근", -1, 0, null, 76, 26, 89, 0, 160, 300, "유지", null],
+[64, "홍상삼", -1, 0, null, 59, 49, 51, 0, 160, 300, "출세", null],
+[148, "손시헌", -1, 0, null, 68, 57, 31, 0, 160, 300, "정복", null],
+[95, "박민우", -1, 0, null, 86, 8, 76, 0, 160, 300, "안전", null],
+[37, "모창민", -1, 0, null, 68, 57, 60, 0, 160, 300, "패권", null],
+[38, "지석훈", -1, 0, null, 39, 38, 12, 0, 160, 300, "출세", null],
+[147, "박석민", -1, 0, null, 79, 84, 23, 0, 160, 300, "재간", null, "브로콜리 돼지 나가신다"],
+[120, "이민호", -1, 0, null, 57, 78, 53, 0, 160, 300, "의협", null],
+[53, "김진성", -1, 0, null, 63, 67, 69, 0, 160, 300, "정복", null],
+[41, "권희동", -1, 0, null, 49, 41, 21, 0, 160, 300, "정복", null],
+[119, "임창민", -1, 0, null, 71, 67, 63, 0, 160, 300, "출세", null],
+[23, "원종현", -1, 0, null, 62, 67, 71, 0, 160, 300, "대의", null],
+[27, "이재학", -1, 0, null, 62, 53, 58, 0, 160, 300, "패권", null],
+[81, "최금강", -1, 0, null, 44, 48, 53, 0, 160, 300, "재간", null],
+[113, "김상엽", -1, 0, null, 68, 60, 39, 0, 160, 300, "패권", null],
+[65, "김수경", -1, 0, null, 67, 82, 58, 0, 160, 300, "할거", null],
+[92, "테임즈", -1, 0, null, 94, 96, 76, 0, 160, 300, "정복", null, "황재균은 섹x머신이다"],
+[44, "나성범", -1, 0, null, 90, 83, 70, 0, 160, 300, "재간", null],
+[140, "김성한", -1, 0, null, 80, 86, 79, 0, 160, 300, "출세", null],
+[21, "방수원", -1, 0, null, 74, 53, 76, 0, 160, 300, "왕좌", null],
+[135, "김봉연", -1, 0, null, 74, 79, 40, 0, 160, 300, "안전", null],
+[64, "김일권", -1, 0, null, 53, 29, 95, 0, 160, 300, "유지", null],
+[144, "김종모", -1, 0, null, 85, 70, 31, 0, 160, 300, "할거", null],
+[59, "선동열", -1, 0, null, 104, 96, 99, 0, 160, 300, "의협", null, "무등산 폭격기"],
+[134, "이종범", -1, 0, null, 91, 93, 103, 0, 160, 300, "유지", null, "내겐 보이지 않는 무언가가 있다"],
+[83, "문희수", -1, 0, null, 72, 61, 63, 0, 160, 300, "안전", null],
+[7, "유승안", -1, 0, null, 65, 73, 34, 0, 160, 300, "재간", null],
+[71, "이순철", -1, 0, null, 63, 80, 87, 0, 160, 300, "정복", null, "LG는 내 덕에 강팀이 되었지"],
+[133, "차동철", -1, 0, null, 73, 23, 67, 0, 160, 300, "할거", null],
+[145, "한대화", -1, 0, null, 79, 82, 71, 0, 160, 300, "정복", null],
+[87, "이강철", -1, 0, null, 83, 81, 62, 0, 160, 300, "패권", null],
+[92, "조계현", -1, 0, null, 86, 71, 73, 0, 160, 300, "재간", null],
+[140, "최향남", -1, 0, null, 63, 64, 34, 0, 160, 300, "왕좌", null],
+[122, "홍현우", -1, 0, null, 71, 84, 81, 0, 160, 300, "출세", null],
+[44, "이대진", -1, 0, null, 73, 74, 58, 0, 160, 300, "의협", null],
+[26, "장채근", -1, 0, null, 30, 72, 31, 0, 160, 300, "출세", null],
+[47, "김종국", -1, 0, null, 46, 62, 86, 0, 160, 300, "출세", null],
+[149, "곽채진", -1, 0, null, 61, 67, 59, 0, 160, 300, "안전", null],
+[116, "황두성", -1, 0, null, 73, 79, 51, 0, 160, 300, "출세", null],
+[2, "이호준", -1, 0, null, 82, 86, 51, 0, 160, 300, "재간", null],
+[104, "장성호", -1, 0, null, 84, 83, 74, 0, 160, 300, "의협", null],
+[79, "정성훈", -1, 0, null, 84, 80, 77, 0, 160, 300, "재간", null],
+[125, "최상덕", -1, 0, null, 61, 67, 73, 0, 160, 300, "정복", null],
+[84, "홍세완", -1, 0, null, 67, 72, 39, 0, 160, 300, "유지", null],
+[103, "리오스", -1, 0, null, 81, 76, 71, 0, 160, 300, "출세", null],
+[48, "차일목", -1, 0, null, 38, 31, 34, 0, 160, 300, "유지", null],
+[129, "진필중", -1, 0, null, 79, 83, 75, 0, 160, 300, "의협", null],
+[133, "유동훈", -1, 0, null, 74, 51, 64, 0, 160, 300, "재간", null],
+[37, "이재주", -1, 0, null, 48, 77, 6, 0, 160, 300, "안전", null],
+[146, "심재학", -1, 0, null, 66, 75, 26, 0, 160, 300, "안전", null],
+[27, "이용규", -1, 0, null, 86, 20, 86, 0, 160, 300, "할거", null],
+[87, "윤석민", -1, 0, null, 86, 79, 81, 0, 160, 300, "유지", null, "죄송합니다 제가 공황장애가 와서.."],
+[125, "조규제", -1, 0, null, 83, 76, 58, 0, 160, 300, "정복", null],
+[144, "한기주", -1, 0, null, 72, 57, 58, 0, 160, 300, "재간", null, "속이 꽉찬 남자 99.9"],
+[48, "이동현", -1, 0, null, 71, 63, 50, 0, 160, 300, "대의", null],
+[114, "김원섭", -1, 0, null, 67, 29, 77, 0, 160, 300, "출세", null],
+[123, "신동주", -1, 0, null, 68, 76, 79, 0, 160, 300, "할거", null],
+[126, "김진우", -1, 0, null, 70, 72, 59, 0, 160, 300, "재간", null],
+[122, "최희섭", -1, 0, null, 82, 79, 29, 0, 160, 300, "왕좌", null, "형 저 메이저리거에요"],
+[142, "서재응", -1, 0, null, 67, 69, 80, 0, 160, 300, "재간", null],
+[49, "나지완", -1, 0, null, 76, 81, 33, 0, 160, 300, "할거", null],
+[30, "채종범", -1, 0, null, 60, 48, 31, 0, 160, 300, "왕좌", null],
+[149, "로페즈", -1, 0, null, 73, 67, 80, 0, 160, 300, "출세", null],
+[65, "안치홍", -1, 0, null, 83, 67, 73, 0, 160, 300, "재간", null],
+[117, "양현종", -1, 0, null, 75, 78, 72, 0, 160, 300, "정복", null],
+[45, "김선빈", -1, 0, null, 86, 16, 76, 0, 160, 300, "유지", null],
+[127, "이범호", -1, 0, null, 67, 88, 48, 0, 160, 300, "대의", null, "꽃보다 아름다운 남자"],
+[143, "김상현", -1, 0, null, 53, 82, 50, 0, 160, 300, "재간", null],
+[9, "이대형", -1, 0, null, 74, 12, 94, 0, 160, 300, "정복", null, "누구보다 빠르게 난 남들과는 다르게"],
+[32, "김병현", -1, 0, null, 97, 92, 73, 0, 160, 300, "할거", null],
+[87, "박찬호", -1, 0, null, 102, 103, 96, 0, 160, 300, "유지", null, "안녕하세요 제가 LA에 있을 시절부터 놀란 라이언같은 투수가 되고 싶었는데요. 그래서 런닝도 하고 웨이트도 하다보니 어느덧 강속구 투수가 되어서…"],
+[137, "송은범", -1, 0, null, 60, 57, 63, 0, 160, 300, "정복", null],
+[79, "심수창", -1, 0, null, 40, 53, 39, 0, 160, 300, "대의", null],
+[89, "윤규진", -1, 0, null, 53, 60, 38, 0, 160, 300, "의협", null],
+[32, "정우람", -1, 0, null, 81, 76, 79, 0, 160, 300, "의협", null],
+[127, "김태균", -1, 0, null, 91, 91, 36, 0, 160, 300, "안전", null],
+[67, "송광민", -1, 0, null, 80, 72, 19, 0, 160, 300, "할거", null],
+[145, "정근우", -1, 0, null, 86, 74, 87, 0, 160, 300, "의협", null],
+[93, "최진행", -1, 0, null, 57, 76, 12, 0, 160, 300, "대의", null, "약 좀 주세요"],
+[73, "한용덕", -1, 0, null, 75, 76, 79, 0, 160, 300, "출세", null],
+[91, "구대성", -1, 0, null, 88, 86, 72, 0, 160, 300, "대의", null],
+[126, "유승안", -1, 0, null, 72, 73, 22, 0, 160, 300, "왕좌", null],
+[145, "정민철", -1, 0, null, 72, 79, 85, 0, 160, 300, "출세", null],
+[22, "장종훈", -1, 0, null, 81, 94, 83, 0, 160, 300, "유지", null, "신고선수의 전설"],
+[46, "송진우", -1, 0, null, 80, 83, 86, 0, 160, 300, "출세", null],
+[31, "이강돈", -1, 0, null, 77, 72, 76, 0, 160, 300, "정복", null],
+[20, "이상목", -1, 0, null, 67, 73, 79, 0, 160, 300, "출세", null],
+[26, "한희민", -1, 0, null, 80, 58, 74, 0, 160, 300, "할거", null],
+[104, "류현진", -1, 0, null, 97, 98, 92, 0, 160, 300, "대의", null, "야구는 수비를 믿지 말고 내가 잘해야 이긴다"],
+[32, "이정훈", -1, 0, null, 83, 60, 81, 0, 160, 300, "패권", null],
+[103, "이영우", -1, 0, null, 82, 79, 77, 0, 160, 300, "대의", null],
+[119, "동봉철", -1, 0, null, 63, 32, 77, 0, 160, 300, "왕좌", null],
+[54, "김현수", -1, 0, null, 88, 81, 48, 0, 160, 300, "대의", null],
+[97, "추신수", -1, 0, null, 99, 99, 96, 0, 160, 300, "유지", null, "Go! Choo! Go! Choo!"],
+[27, "최원호", -1, 0, null, 55, 53, 53, 0, 160, 300, "대의", null],
+[23, "신명철", -1, 0, null, 41, 53, 76, 0, 160, 300, "출세", null],
+[50, "백재호", -1, 0, null, 44, 63, 22, 0, 160, 300, "안전", null],
+[6, "노장진", -1, 0, null, 64, 82, 48, 0, 160, 300, "대의", null],
+[92, "조용준", -1, 0, null, 86, 61, 69, 0, 160, 300, "재간", null],
+[53, "이진영", -1, 0, null, 86, 82, 79, 0, 160, 300, "정복", null, "어디로 던져도 난 머리에 맞는다"],
+[82, "장원삼", -1, 0, null, 70, 80, 83, 0, 160, 300, "정복", null],
+[59, "고영민", -1, 0, null, 50, 45, 76, 0, 160, 300, "왕좌", null],
+[124, "옥스프링", -1, 0, null, 74, 68, 72, 0, 160, 300, "패권", null],
+[48, "사도스키", -1, 0, null, 68, 68, 76, 0, 160, 300, "의협", null],
+[149, "해커", -1, 0, null, 85, 88, 89, 0, 160, 300, "유지", null, "x까! x빨놈아!"],
+[70, "브룸바", -1, 0, null, 84, 77, 22, 0, 160, 300, "패권", null],
+[11, "밴헤켄", -1, 0, null, 80, 82, 86, 0, 160, 300, "왕좌", null],
+[77, "레일리", -1, 0, null, 67, 74, 77, 0, 160, 300, "패권", null],
+[14, "그레이싱어", -1, 0, null, 75, 74, 67, 0, 160, 300, "왕좌", null],
+[135, "글로버", -1, 0, null, 72, 84, 50, 0, 160, 300, "유지", null],
+[149, "소사", -1, 0, null, 69, 80, 72, 0, 160, 300, "왕좌", null],
+[26, "레스", -1, 0, null, 76, 74, 51, 0, 160, 300, "출세", null],
+[113, "켈리", -1, 0, null, 73, 77, 70, 0, 160, 300, "대의", null],
+[145, "피어밴드", -1, 0, null, 70, 73, 77, 0, 160, 300, "의협", null]
     ],	
     "general_ex":[
     ],

From bfef0c28bc57b1eb96f7c9a737a2f5e8e12f27eb Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 21:04:41 +0900
Subject: [PATCH 146/184] =?UTF-8?q?=EB=A6=AC=EC=85=8B=20=EC=8B=9C=20?=
 =?UTF-8?q?=ED=8F=90=EC=87=84=EB=A5=BC=20=EC=99=B8=EB=B6=80=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=ED=95=98=EB=A9=B4=20=EC=98=88=EC=95=BD=20=EB=A6=AC?=
 =?UTF-8?q?=EC=85=8B=EC=9D=B4=20=EC=95=88=EB=90=98=EB=8D=98=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sammo/templates/block_htaccess.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/sammo/templates/block_htaccess.php b/src/sammo/templates/block_htaccess.php
index 174f1338..f544d747 100644
--- a/src/sammo/templates/block_htaccess.php
+++ b/src/sammo/templates/block_htaccess.php
@@ -9,6 +9,10 @@ Allow from env=env_allow_1
 Allow from <?=$allow_ip?>
 <?php endif; ?>
 
+<Files j_autoreset.php>
+    Allow from 127.0.0.1 ::1 localhost
+</Files>
+
 <Files j_install.php>
     Allow from all
 </Files>
@@ -20,4 +24,7 @@ Allow from <?=$allow_ip?>
 </Files>
 <Files ~ "\.(xml|css|jpe?g|png|gif|js|pdf)$">
     Allow from all
+</Files>
+<Files j_load_scenarios.php>
+    Allow from all
 </Files>
\ No newline at end of file

From 18bd5f4246bb23a1c59ffb9b7cdf26e18cfab5ce Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 21:25:04 +0900
Subject: [PATCH 147/184] =?UTF-8?q?NPC=20=EB=8C=80=EC=82=AC=20=EC=A0=9C?=
 =?UTF-8?q?=EB=8C=80=EB=A1=9C=20=EC=95=88=ED=95=98=EB=8A=94=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 2793e17f..de01ce8a 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -277,17 +277,8 @@ function processAI($no) {
 
     //운영자메시지 출력 하루 6번..?
     //특별 메세지 있는 경우 출력 하루 4번
-    switch($admin['turnterm']) {
-    case 0: $term = 1; break;
-    case 1: $term = 1; break;
-    case 2: $term = 2; break;
-    case 3: $term = 3; break;
-    case 4: $term = 6; break;
-    case 5: $term = 12; break;
-    case 6: $term = 30; break;
-    case 7: $term = 60; break;
-    }
-    if($general['npcmsg'] != "" && rand()%(24*$term) < 3) {
+    $term = $admin['turnterm'];
+    if($general['npcmsg'] && Util::randBool($term / (6*60))) {
         $src = new MessageTarget(
             $general['no'], 
             $general['name'],

From 0ce36e93bd794565cd221d2dfb6a515c6d484e15 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 25 Apr 2018 21:31:39 +0900
Subject: [PATCH 148/184] =?UTF-8?q?=EC=98=88=EC=95=BD=20=EC=98=A4=ED=94=88?=
 =?UTF-8?q?=20=ED=85=8C=EC=9D=B4=EB=B8=94=EC=9D=80=20=EB=A6=AC=EC=85=8B?=
 =?UTF-8?q?=EC=97=90=EB=8F=84=20=EC=9C=A0=EC=A7=80=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_autoreset.php  | 4 ----
 hwe/j_install_db.php | 2 ++
 hwe/sql/reset.sql    | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hwe/j_autoreset.php b/hwe/j_autoreset.php
index a1711c3c..36e6360f 100644
--- a/hwe/j_autoreset.php
+++ b/hwe/j_autoreset.php
@@ -31,10 +31,6 @@ $result = ResetHelper::buildScenario(
     $options['tournament_trig']
 );
 
-if($result['result']){
-    $db->delete('reserved_open', 'id=%i', $reserved['id']);   
-}
-
 $result['affected']=1;
 
 $prefix = DB::prefix();
diff --git a/hwe/j_install_db.php b/hwe/j_install_db.php
index e104c449..1aedad7f 100644
--- a/hwe/j_install_db.php
+++ b/hwe/j_install_db.php
@@ -93,6 +93,8 @@ if($result !== true){
     ]);
 }
 
+ResetHelper::clearDB();
+
 AppConf::getList()[$prefix]->closeServer();
 
 Json::die([
diff --git a/hwe/sql/reset.sql b/hwe/sql/reset.sql
index 07162e82..ef31cd89 100644
--- a/hwe/sql/reset.sql
+++ b/hwe/sql/reset.sql
@@ -44,4 +44,6 @@ DROP TABLE IF EXISTS event;
 DROP TABLE IF EXISTS world_history;
 
 # 전체 이벤트 테이블 삭제(연감 대체?)
-DROP TABLE IF EXISTS general_public_record;
\ No newline at end of file
+DROP TABLE IF EXISTS general_public_record;
+
+DROP TABLE IF EXISTS reserved_open;
\ No newline at end of file

From 4297ea9e40fce1b4f7696e37f81ce692a456cef9 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 27 Apr 2018 21:37:37 +0900
Subject: [PATCH 149/184] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20&=20?=
 =?UTF-8?q?=EA=B0=80=EC=9E=85=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oauth_kakao/kakao_login_join.png    | Bin 0 -> 6770 bytes
 oauth_kakao/kakao_login_join_ov.png | Bin 0 -> 6768 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 oauth_kakao/kakao_login_join.png
 create mode 100644 oauth_kakao/kakao_login_join_ov.png

diff --git a/oauth_kakao/kakao_login_join.png b/oauth_kakao/kakao_login_join.png
new file mode 100644
index 0000000000000000000000000000000000000000..a172590e58ca0accb873e5020de8d63f509958b1
GIT binary patch
literal 6770
zcmV-&8ja<NP)<h;3K|Lk000e1NJLTq008*_003eL1^@s6lJ0d700009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>R<o>I+y?e7jKeZ#YO-C
z51&ayK~#9!?45gXQ}>m}zgLoFUm@FAvW)^toJ{=)aVSpWPPUHe!;5LDcToc4G!BF`
zCD_f@bd#)GNFWBAHiZpMo4}?464>%6rYW7cGfZ1Zfr(uWC3Xs%AvnOKc?c{lOMXbQ
ztmoZ76dPYjmSxGdbg$0mKa8aN(@*z%&-tC-Ip@c4CIoU9fF}Vg1#ky|R1gG_$T$If
z4B*cI-e7X@;n@FV#)w=F;AH?$0g%wV5riP|0oV)R872pgu_BiPI1XSj%@IL}f>QvN
zGC6RKSnOYtzzITBRD9u?gW*gl25<p@l;(vXM1>c?LJ9mqHWD~Nhz}`%CmCN4x)=sU
zG#>;ZJ~$2^F`Nlb_ycbQL5L5Rgal3yqDD^p;RGRaNaO@TA}0ufL{1O{iJTw^5;;K-
z(}0YofQW|8jdO77_{}QhhQ<NtbOY0R&BKSYaQUN~JHFrgwiRV%L-b>i$caS5V36U`
zB^E<Nen&Dd&xxWUCs>vX`@YK`$$1Z!d+!^j$s~~ziG*ISz~0xhaP?y7Qi)Zyc2rmQ
zL#6Ug%Yy{~v|0~|oJbB=d$JT3xv+9&UsTs~I2dgEc`nZihvLwlS@_c*S?t<voDwl!
zz9PrrgIT=msx>|=UFN{*)s_i82NF3USSAwNRP+1>4LaIWB6_XaC_#Ol2Kx?n$7Ip<
zdIi?6%MSVZhxW|E*}tXXwcXc~Lg*A-CnC1w(TXil;Q7T~G;Zs|n=MA{e6t6uYVAQn
z+_z5^lLZeY@UdLID8+#Ts-*bsNaRFBD3!jb-uKqg%%FAm{sY%gS!qRKfeR%i!>Fq>
zWBblt-s@VAu&`L7Yjbe;U{=sIPqcrI)|1yzTJGj856E37L`hrcXA{0=_ii;$1PaCE
zMQ*W3gRJ=K)s~R2Eh`&BMU|7cl<4Y8o%9x&!@=-AqqN+Ox;irefMvaS{E0qvwCD1y
zeqn)2)W0`bav~(xukoM%dAB<!{TaPxz9p`x3cpPjxFu#XrA+#opBwn^`9=l*A)%P%
zOS<2ZL{5YxFgTa3j(uBea3KD-+occLDgRz1azb!izQXS#l3(nND$;$c*3J8OM|(=x
zb@toGlzi_YZ}Q$lplGj*`7Q>74Ey(_^IZAq*psI<c>-eUk>aCEa$LP4$Bk|&dW<p*
zIT#E(7yv*T%R#|%$kli-=N2#W3tT9g??O(lIB$^m&hZ0M|MEa|nPn`?L098I>yew*
zb8AyBUfA3dB(B}N)j>%zB_)%;u1e*FTH}M+=(k_(r&H0;;D2!a<mueezXQPIPxK|l
z{hgE|_xXVH@2BD2(=7CDEV{2nHx0MU^Pp^z17G{5110wkLn0Et=&j%KMZRExW5W0B
zXwJlr=9`i9kzDp=x&fZZJK9sAtDFa2jROS*F4$}myz>`DkiZ)nqtAn1y38>eG&CC}
zL3#FoKjI$ELxe=0;MlAZv>sF9?PE$9ugCt?yRXS`tR)@CTGFAJ>%oI7Y|yQ+L76Vx
z;ErCe;8{Dh#)o_EaYX%jg#|9Gs<j7gSNVm{hI~(Hxf@HC3`Tv;`|sypFO<MXBJLz|
zk>GMMXgQdU-yX<--8Mbu)_7fp*LTjw!TlL{boC$}dCUsATv*vu4hMt1uV)2W#aOe#
z>gvqUXgoYiKOUv!ZoIh77}GUNN``qZd!zzyZRL+|(IT5D*6gAe`THGd*xsxP+7g;B
z>^2GZzBU`jTa{SfXu-Xu!f^@z@Q2w!ZgX{Ye?;%iFZSZL+i&KZ=j8B%ZaUon7A>;j
zt+!_5Pk&^C1Xx<`M)h|GVlExESftq6lp9ju;mTnR23gQUNY^<a3Jr)><USwp#;<4N
z(Ebc?aWJUYugUQA4|1{Ui9tO1RDZ&+*Uz6%!|N}n2U)#HE!l%BY!lX#t5jap)tOOO
z=NHwG!#^pvYTZ+kLvAq0P+zABDR2PTzbAcM>)hGNUry+19HP;JC`CRz%wX##HQqg~
zi0e2w4mh|k1E2m=h8KQnMp{~8y6*;q3|ltxbG_9X-?-UnQ$aLUW=+jE(9}HsQsWmd
z<%}zEz#oL$+LRk|IS{ygw|KFYM4qU)-3&H7lY`E4X$do?cTX#@;TZ{DdewxK6fWTe
z9?JUtWaIRdV#d<lCER;YoX7}Dp>5pOhmSv&^MY_4?J0PEgN7$`y`CT4&oB0hD)KHW
zk#ii-yh)u<0v~k;&!wSxlN!z2dciP>E$~&f_GxRY6iauPaPJMY#JU;>Dl7fgxa&hX
z?*R}f^uS=_gDY&JGJK-ScsqJH183e*B<%RkyraO;!x;%NmXjybQKOq1G5{vD?Invv
z8Wb@6{`YS#HD26i<W--I75d@B{7yA$jW4F{JF?`{$fuvAV9&11gdgXgU77f5xdVB(
zyW=K^SALZpvT?-7_SH=C_Aw>i?~Kgzy3iTAU?s2+1^_R(#<Cp#>&GV4U*&r(9qlPW
zF8&Xn9uQq43DJoB)t9p1b~6b-PPd!Et1o5Y7yr{U<JZ>f75ML;sX_*)Dyp2=@LbP~
z-{4m-O2_T_7VE=otkAVu4|eS~hK;^gR5?dod~(+lj7t~gICnNpFylRUHVv09&irAr
z<7KY>;8`o0nr{f!f&~`B06<%tGU#twtq1!Kb_cocBMc5mf{Js<k|zkqj;0H8%$u5L
zcJ0fu9Jc(d7wgven<nHJd-2>0rnoju2uz}x$XyR*g;|zEX}O!{dXFTwELk!*`tWi%
z7__x1@z1NFJ%^6=6s&32prXo&hn5dS)FzrlJ`?V*i$VJtR&e8PKf}W9VvsV!sjnp^
z!=uF^V+9Z|B1xhdAylEs2!S16MufhjITICC{*u*58(5w?o{Ce)bFqDAuP6?05WKtI
zbx97pU3g!^ZkM3zQhZ#)h6WRKI&lS<N=k-<8bb0#n>y}NCBHayR^Od>Iz=%zg16+C
zyX1l%`+|i|Br}ml)&bzNPr~1>b#-PamA;_#+)z|hIkC3Z46W9K<;(kV;zS1a?@1qB
z4v49tgy2Pf!ziV(3z%?LHX2s0?8DNfgJ^5>Z_R!7i40dSN}<;Hu<$-N3X5F$`q!<z
zv|5(spwsz_SM+)X^!iyS5K(hS!He8xmC)D;9x9c0RJ4<&tZYbhhbRjEE@K$sj$KC0
zw+OQ26O)-K+%7EX8Nwa=+FCPKK6cYaMB4Q<TqPMnA`gl7Hn(8Mo_B|E$DWL*gOa-*
zCyEycH$YM}-$i#IL6$rcYpA)!17o+azREnUCvHV5#P}?_?>64Q-)u1o{um`ugm=GH
zWf$C-7k}GMiXzC8N6JIhHXJ#S0hdb{p?0~P!}9OWd}D&kSL9gph-OMZGtn%a!@;1v
zU5N`9($Ic7bu_s}SK~lgnO$_-V@V@&b+#8P9<k!cfeb;6xB5|QQXJ0{F4sI7Dyp1l
zYQ8b<|DQjfhAkVjLl&{L9%0dXghhU_7h7MvkyL?0(PU#hv33BOxrzV7&Cz)9y(b4i
zOf7o70_)b~hHc~s`0Ll}>ohPJk|#+)G~bj}aM=7)GwRpQfj2>oq)f)4X`2~oaViW^
zu)fiXtY{gp+%ujS3^J@=mmTrz%|;38>ohp>`)i`>0wZdX1Hj!2o%r!a3$`_@5^{Xc
zZs<etg7_7rXtkcO?(S5(;Dtr8t<^{J&L?8;9(B;)8X5;id#qb5Qna-xd50&MjS`$V
zkr7quD~UYLROxJRIvM<Odsae?>qiZJ`1glwNG4XUjP2CW*49kyxEQ`~pT!~#dguh!
zfsf>}D-=F7Z@771ynRfW6e1U8g~alQt$4o4oDe<EWik$%n$4)Lv4WU-y1MuRFD-YE
z8$l23-*)w)H0*ilWXThprT=C}-tBH|c|JSpqlsf>?mQ2+{Ja<QixXpuX*#yh;*H6~
z@3#7litt-x6;)22<?l61MZeP_>RQLU?snlfE#0VjY!EWp%vp7b1gNgDVt<P<VFXSj
zFQPAKW)&R%<LQ1J_+2+{nK!*#YzzbZ>yjbtZ|TO58v3A6_~;IsW&%%7J##Aj;TnPK
z_eiVf$Xyoz^KSLPK21#;R4Ol)e8-Mu%Wb$dPgqG74UMq{p5iT%z&>mp?J3af6(QH<
zCr|R*Lgg2GlOic8X+(axOOC<8sS$Z<Du;qQU08UJ6JLG6fx8zvAr)x+CXu7dR|0yV
zhuV@;sk}k!?DgxiC)`2<#CPUd(u@4PzlU!aIBS*<_0RSrca8@=H)I$ZVlXu1e<&yv
zKCmo@IT{Z%bG?|SbqiM1Lc$vGP*y5KFMrn7nsMs*T;AVyG-qN5#@~L+FZPP=%(J8y
zc}EzLf93vRtZ%enj)oc`2obH;gY7$eBhGqLYkb)H;*F%pc1s$O4-Yf=;6iYgRvOEp
z{+T{3TW%9{ueewUte=jCw$9I{Wo&^hm;-}sV<{^e!p=8)@XE{Tuvv1+SfG*=BLBbh
zsc;9Bq26=fFrM3Nnf8b~5j}xo&CUt`Ta}ay<F(z_snj$XMcy&yFvQeU4z>0DsIIXl
zt@RcH4oC2hqhKfAl4My9m6cXhR$9@}K=YV1BJX_9FY>#;?8L?<GqkrQr}d7c3N3IS
zxwPDkj5u_}{oIfea_vo!$U}0+m)xjaI)sNG9fTx_&ohXm3hmT!{u=$MdUISlzx0}9
zL2KzqX>H|4)kn6{NaP}BrjH0FVkbMtgNDX|(X-O#P9k;^xF0^h#X%w`h(x2Xz=gsB
z*Ni9Y1ZDt=A?=k!PE08lixj<P>5M%HrW!HUmy^gvj=>-c**PUre!WW_ao}xjtr?x2
zvx3~^>0-L}=Sk#*pcryUV(OUM(Vi0VYsa3AMkEgOs}KZPa)OAQ`FA<c(3n_bn#__T
z6tOnHj5iEt0!OzdAtt6GA74yse{$Ceg4W~&L6Eyn5CmCrf*?rb1VNC<34$Pz69hpb
zCkPTbK@cQzf*=GUa*l(Wrhy>D3CF=M@p$klO$9-S6ORW5iPeVFG!+CPPOLVxNzQiS
z5CAVt2SJDq@7YcqWB_EEFXI(e79OWLAqeqc>BDc-h4@bi0Q=$<*z6ca8%+yAhy%wk
z{<e4pHUqFrI1@bo_yGM6d<TzN`tZL1d^AM_Ay|BU{W!F26;}V_1M~y%Fq{csa=-vk
z0Z2Xi28tGc4UeWP@lBZwc??4>q6i|9;W!L=JowydL)%~5aOB}N=mOvbU;)4}oXP*f
zFNB@}U=~dqK?oW<fI-0DD<agnp0Y25o(e!Z&T9yQNFZYl{|=e+3xV^_l=}Yx05Ngt
UY5ZNJkpKVy07*qoM6N<$f<?yp$p8QV

literal 0
HcmV?d00001

diff --git a/oauth_kakao/kakao_login_join_ov.png b/oauth_kakao/kakao_login_join_ov.png
new file mode 100644
index 0000000000000000000000000000000000000000..aca78b73ff1d5902564057731993ae0e6570c325
GIT binary patch
literal 6768
zcmV-$8jt0PP)<h;3K|Lk000e1NJLTq008*_003eL1^@s6lJ0d700009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>R<o>I+y?e7jKeZ#YO-C
z51mOwK~#9!?45gj6W5i;e<R7VB)_ob$c{0v1!D|>;^gC9Z|Ei)45sVSU;>3EfrPpV
zWs@}x+t@XMB<9if1BGlu>843|xFoPZvZOfq@S&g35E>IVO3bTl7xRd_0pk~zWLuK;
z*6bgOA0x@KELqmf=zRaPJfpd~Gru|ao_o%@4BG^6W&n5^KnZ|v0Eh=c5PZf4pb5Yq
z0PJNZ<9`SLlNls(Ie`BF@C*P6^&3G55;uT70REks49j4V%K@AKFrWH}AVk4w042<1
z*!wK@uSnnoAu5W#9+`t-n{W?+O8}(QF9abfTmWWE;Bm5%zzITpNC7-8VOf+=Ul4>i
zVOf+gY!htoINk_?5Fd6437jBAjhxoQ2}0zM$O(c(P7nl%oFE7iIYAI4a)KZtfQ-6;
z2!-mOXW;ayfh^>T%5Ib{?2hO)551F$Yu5)>e7`;4h&hG5bTdfg1m9?Gk>Sc!C3<^3
z1IbAfZJ0LI2Bm@xc;2<^a?Xq8zI-cnCW)Nj6ZKjZ_SB@}Mx*~!iIuC&ShlzeX{oM=
zyjTDrJIhHTCt_o$JyLR~+OcA}A*AbBtPHljqTyI!e;hoJfRiVc_|2<rqawy@U&?Xl
zNGj*LYK<EuB^EsSn10xi1BsjvEW?RywAoOdi3V+4P{-;zBq(2(iT!W1hGo&~wJKCq
zrThK<g9j4unO1?<UTuj9p_6x=2-=c|DmHI{=j6HYa<u{b_O)U6?hdS6W%d!`{)1^@
zS#W;>AIyzLDc(Aq78Cc5L{0=nVuCxQ^WJ?g#b@4K^ZIQR&ov@<iXHj0tXNZ~!}jf+
zoa1VbDWNxnR_5T)kyM{+e)xx5sQvwI6cjo*(*qi=6QZQ<%*|nsd80<n5rIlIa*^u|
zQXeb+<YRij$IdD2MNzShGnHt(7C+)8GK-brd`Cf{18d53005=Jg;gsJXwYgnRzG)&
zUDWrREIHwqmKN^&f6_$Th`*y#&$Yxw#etW}yqCo8bjFSNnzwFq&w1!U?n@$+mlcVe
z5GCHux%9N~m$iC&qW`#EX;hB-?;?>Cg5%nk+&UsTd9IK=-4n(;IDa>2;{wjJkAILD
z_UOS|wAY&keoJ$U3^fOmI79hJtjW`yoQK@$l;Y}DIc|I@M|-;z9UU_CS{PU@3;;l(
zWT8^B&}f{<$Z#QNiXGFY*>P98I3JKN&T$=5|5zAWWSLUIqI9VRwZ{gm=hkf+ytKZ<
zM_g~zsC|ND@@I|wx@oB{s5NfrIz0C4Y+XDm)_PuCKYc;d|2Y7xT4{)h=Q}1v?sfwg
zFDdXzof7qbR-&~vv~IZjZYSp4Z^45PSdc&43W-R@MeqJMSLCy1ScW}k=Z+NY+%e!u
z?~7$$^qp>w$Q!hAD1Br+N|#zNb+R2Mvjl%Ut@06gMP=x5@FgXdey5?XL*f%>4|qK8
zp}a&$<UGe@lA!keL>zxV5p8YZ|Mb>Y8IHY|gk$d|Av4p7#fwZRU1UOHqHvu%^;#9j
z+Nm{e+&kM6^7rLVv18>bv(IvsNBBy==M)q=uwY(K$k!|^;9k$4!23MzByy2pw=+0$
zGztH8BpGINWXx?_n+&hNISy|hO2*@l_TbU)8zGkqE1Jq;Ww56v)yFD^8x^*uOovR3
zlVj<JqM*=$Uu<p*>zetqtehcxumZ0=!EN6Ib4;R`vx{Ej=PxL*eMg$ll2D{Dn<dz@
zZyZjXOhi?s9{1fVoFU<R?~n5tHZNP;71X&oc`i(xFc5EkS31|}R=Tho56m&)-Q(kM
z@}$y7fCYsPEL+kYcIv3!AjQ^g8ovS$ln&e6BJ+6(m7eJqg$6_`a<?1UyMG)G9!drq
z1%uksBE!0$Xs~ic51#&E7w_lm7cVRD`fEu(Rxemfw)kPwu=(U^sV=N3(_u}SM^wEQ
zPp3>6?--RB^5zy9%GYK36*vIY97r0{I-k41olcZ4wTMOwq7=E+%3$ly)%c`N71egI
zEb#WhWPJ6N3@>feLBZ2xh~^d<Hf`m`daE_=A*0hqgHW=}Hg9al=8Z#7HD1|u*N_4S
zJWjZ++cbWs1K!Jb^B*#j$oY!H!C?J{yKwHjf;VmYq)vtP8zk7V{SM;dSl$WTpY{9c
z^N~r#45zwFpmRU`DA^~3_T_2=n*LADal$od<FKJRlOyzcE!VrBljjnZ=Ur4HXIWs&
z&(ypUc>i$lyaHQ(rpA^{onRP#3w-4&bHvIjg;U)n(7E20xOAxn#dAH@xUo^rc>#C}
z-P_r?_+gW%44<eX-j2SLj5B{y@wR<u{-naucanM0mQx=m;jzcF{5rsdw!EY_NPQfJ
zKU_I5)%eBcHcs~0V4)v+hg+#et#OC7d`Ff%f_!x|4sY&F;e9*b+?#^?@3&ymL`T#F
zvFo*Tzl9_EmaoQ=;~ymA{Keo#UY9QUPgwCzgaN>Dt|=8Po`3F+&#0wA8|O2`|F>tl
zMOR2dG$Q}??o>D&4DZ|Na4`7w?o_<8qhrjkU9VN)m#?Jxbxsu(+pzxmjxm40Z!}7W
ztoau1%WSaFv$LG|&8uwzz3)ZEw*DbL4cB?bl`C?5{)Iv??fv`<1+H8f`^{vBid_5G
zXN}mrv0bnh%sUYV0P5-!eLl<1a$^4*tv*BdK6-j2KFK*`$$7%D-zN#O%`Z+L+qth&
z!D7=(omjipQ#2tb&xIE%??km|f_D(jaKm+fR#>TEQBdgM488jTTNcdg>3?}ytPJYv
z6Y;md`5!qnXyfpdHWNj~HaxPZJE$_zB=RvD{+|6*DY$l@{Zt8ugBkNBwftGu{^XFs
z0*DsD1kv>2FVUnA?}{&dLf^R~1x3Z4l+|DhSe`x=kJG0#*uK3}6q`2)ez@LvRUWZ;
z^hjbhOVD^VIzz*XwRcduP+ShC{8?6?f{<L%#t%7F$;tB{)t8rR6Gh($-jWXvju2wo
zXU()BmI>Cg4gfcA1%6!Dl<AO|;Pwg6^+!>$4Xev^$j)+N$)YZN_)#)y4kYzY2gFoR
zLhvGQZ<kWr1xz3-8wx9y8&Fc*gSvXp(%j8kGTdmCLalLQ_G|}or`qw)|77HZ)hZP%
zN*8*PSL(GY)PJ6UsguQ1+)?l%H<={Vc7j7%s;ghLBV|ruujn>W6#P@hFv4xSjEZj&
zWXXpoC0V#tSdx;2+xFFEI;?nfz(xdH^)yf>89^fVOLn$Hux*c4XzQr-dkpRlO2hRi
zanB6lI!LBXv(pnukR>118cuQ`GsB6tc47UL@mWqmTXM1Tz(W%`fA8DZCircXMB(23
z_5!ou+B|=rnG{8kB@dQI7MpPRXfo_}VYu4mau!RLjD2B(YhTLo)Ki(G`kj2UbQUXv
zvwu#+rT<ajY+ZbRa7*b@3+DWTS#--|F(Y!d+J&V{j5vHGSrF}A_B~@vY|j%Y);tu7
zif!1uv3<z@U%afqrmg9IlUQnxDN%b&iJUwaw!YjRQ;tK?L}Qe#>PBWJ|8HDIh7&({
zvKz$cQm<8E?OIL1LXLnZf4zKNCYoDfCrCjwzf`GYQT?J0<<Din#Zx0Gld;%b9lffp
zDy6$WBP&#fO81N=%`GxiRiy`gyskrn@^zUw{MK#JRe=$;$N^yHOdBen*JIl+(|Fmw
zpR6<Bo*B_gNXgD}1|05=_7FUGYIt+?zPR(@*i)nS`K+R{yT8V|-XKL?eIjS`1YL&&
zAAXb^Qs^s*JjyKmjtMp!gJ11R<yE_WTyDU_-!&nYSg}03T|;Y6q+n-b;JST!gVg7x
z<DCcI7t5|vxv^#Qz;ki@gT$B+xhOLvmONs_hV?pL)Hs*PSiHDFhh^V0f*5@ouW<!l
zQ0N%agYI3w?M9<C;C|_3$$3u6znC#;k^`Hzq=&pUakyk<IkD-bPE4Q9k0qu^ETKi4
zJDuEWs}DUGc!{j2*v7H^oqDP0S2{$U>o{Y&9S8Qe;<4}dKqebIt1gjvmdR@Nw(&;b
zMC>B^gl46Z#k0?J;jNlh+<kXsm)IBvm{-(`ntiSKak&91m7AWh2;;qb>X}ahZ?54z
ze-Ac$j)v<3VElMz#A?B%rMj?Sff<XwYr=#H!V0pes0`2X6m5}s*I{eW#-U!T@;fg-
z^)a_BR8F2NCW4Y;M&#G7%hA&_IwFscXEAlE9kah_!~KO8%$#Y1RG|JFK6{t1H*xFt
z`CF1pOLh6ov#YAohh0Jg#JA^J%!~YshQI{_6B67gf3^!6jT0RmGW1#)^!9pQ3M!Qw
zN(GCI3@0)(T^OI`5Ui+$gwgAzoS5K$`m?%BhtsFBIG^p@k%FBVdigCU&n3D&&thKW
z4d;dy`QH~<QB|o&Mg|o^5F*)GPHf-a8FbW}TI0snm)m0^+AU^8ZnZMFeAzcjOQB#<
z{;UCu9ySTOR$MrE=TC=1-I<#aX`6QmW^X6kVCEF|V)yP2?D|i2z$m#`Oi+mlk^kj#
zyw7Hc_vTyiLX|$^9(N*iyv3TH9{676&$8mRS6e96G!{kPFlas=AJ5`PtGlplsWE1)
zw-B&ceQ%CRIsB5OQo*8lt`Ws^ji^{l{TMSMKX<_+@|pM8u<->Qva@5;dIyt*=Dm(w
zQ0PE%6e{B0x*g|t?oE)${ql{!bD(%$FP1Osfh30aGYBRN?er<`9Q~Oe>7r8krL$A!
zGnWpQ+7n!_df!qSiCo0IxIqU(Sfr;rQBm35zgJq;2&}mGdieBx77{r@@QvIlcH~a6
zk9n|;cLbmq!d^+_#HgY-NYSa6j@gS~v=L)|If-24G`Gn7R!#|)-@d61+VQr!Ooww9
z5`2csks?y-^CWUYQ1n_PVO30R(8dLQ?BKo82>w8Kg&@e16GZS#&$FPSl3#5a$&|w%
z;TFG)HVoSYmL5$)OpHc6zL@6zG+ZYLnv)X*LBn-|Ajpyv1VJJv2!cdT5Cn;wAP5pU
zL6FD^f*_F-1R)TSvn(9c4Fn-hSQci9(}l07D+ofII9+I#7)|(?x`H6YiP3~Q$!8aF
z5P*xigCInQ>$8h^n*orbJC9vy<FJbQgdoI&z6%G`_u)AS0Q3AOP;IfIj=F^)#DT?%
zPv<{@Y5-;l+XUx@zoP3~%kYH03%>*4rY<4~!QwV_<KUvzc=Ezu(FMTCuuT9n84Q3l
z0P#n6W7_<0;qjzI%#}$oiD9Tj6hZJAmPN1Ag<D1w>OQK+;pOFM1YiT82f#9Hljp#%
zg`Nx`fx3+#1dSO$58$a4;cs70+1Emk2Ou5d7=j>pWX$1NA+vogaL%4m|33iJ8RmDf
SXuhie0000<MNUMnLSTX`h#9Z|

literal 0
HcmV?d00001


From 0cfb80b7bfd14b18768420964026a125b1493aa2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 27 Apr 2018 22:09:57 +0900
Subject: [PATCH 150/184] =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EB=B2=84=ED=8A=BC=EC=9D=84=20=EC=A7=81?=
 =?UTF-8?q?=EA=B4=80=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/login.css | 20 +++++++++++++++++++-
 index.php     |  5 ++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/css/login.css b/css/login.css
index b46e9bc1..345dcc1f 100644
--- a/css/login.css
+++ b/css/login.css
@@ -85,4 +85,22 @@ input::-webkit-input-placeholder {
 
     display: flex;
     align-items: center;
-}
\ No newline at end of file
+}
+
+#btn_kakao_login{
+    cursor: pointer;
+    height:46px;
+    width:116px;
+    background-color: transparent;
+    color:transparent;
+    border:0;
+    background-size: 100%; /* To fill the dimensions of container (button), or */
+    background-repeat: no-repeat;
+    background-position: bottom center;
+    margin-top:5px;
+    background-image:url('../oauth_kakao/kakao_login_join.png');
+}
+
+#btn_kakao_login:hover {
+    background-image:url('../oauth_kakao/kakao_login_join_ov.png');
+} 
\ No newline at end of file
diff --git a/index.php b/index.php
index 9a4c6d94..191b2614 100644
--- a/index.php
+++ b/index.php
@@ -50,7 +50,6 @@ function getOAuthToken(mode='login', scope_list = null){
     }
 
     window.open(url,"KakaoAccountLogin","width=600,height=450");
-
 }
 
 function sendTempPasswordToKakaoTalk(){
@@ -117,7 +116,7 @@ function postOAuthResult(result){
                         <label for="username" class="col-sm-4 col-form-label">계정명</label>
                         <div class="col-sm-8">
                             <input autocomplete="username" type="text" class="form-control"
-                                name="username" id="username"  placeholder="계정명"/>
+                                name="username" id="username" autofocus="autofocus" placeholder="계정명"/>
                         </div>
                     </div>
 
@@ -132,7 +131,7 @@ function postOAuthResult(result){
 
                     <input type="hidden" id="global_salt" name="global_salt" value="<?=RootDB::getGlobalSalt()?>">
                     <div class="form-group row">
-                        <div class="col-sm-4" style="position:relative;"><a href="javascript:getOAuthToken('login');"><img style="height:46px;margin-top:6px;" src="oauth_kakao/kakao_btn.png"></a></div>
+                        <div class="col-sm-4" style="position:relative;"><button type="button" onclick="getOAuthToken('login');" id="btn_kakao_login" title="카카오톡으로 가입&amp;로그인"></button></div>
                         <div class="col-sm-8">
                             <button type="submit" class="btn btn-primary btn-lg btn-block login-button">로그인</button>
                         </div>

From 2102a852cb52ecd7328248cbebcd51b1a89df4d8 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 27 Apr 2018 22:21:43 +0900
Subject: [PATCH 151/184] =?UTF-8?q?=EA=B0=80=EC=83=81,=20=EC=82=AC?=
 =?UTF-8?q?=EC=8B=A4=20=EA=B1=B0=EA=BE=B8=EB=A1=9C=20=ED=91=9C=EA=B8=B0?=
 =?UTF-8?q?=ED=95=9C=20=EC=A0=90=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_server_basic_info.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/j_server_basic_info.php b/hwe/j_server_basic_info.php
index fa7aefab..6877b4fe 100644
--- a/hwe/j_server_basic_info.php
+++ b/hwe/j_server_basic_info.php
@@ -35,7 +35,7 @@ if(file_exists(__dir__.'/.htaccess')){
         'reserved'=>[
             'scenarioName'=>$options['scenarioName'],
             'turnterm'=>$options['turnterm'],
-            'fictionMode'=>($options['fiction']?'사실':'가상'),
+            'fictionMode'=>($options['fiction']?'가상':'사실'),
             'npcMode'=>($options['npcmode']?'가능':'불가'),
             'openDatetime'=>$reserved['date']
         ],

From 0bb1ed6f18cb2e4a270cb150496292b54a834114 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 27 Apr 2018 22:28:16 +0900
Subject: [PATCH 152/184] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EB=A6=AC=EC=85=8B?=
 =?UTF-8?q?=20=EC=8B=9C=20=EC=84=9C=EB=B2=84=20=EC=9D=B4=EB=A6=84=EC=9D=84?=
 =?UTF-8?q?=20=EB=B0=9B=EC=95=84=EC=98=A4=EB=8F=84=EB=A1=9D=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/d_setting/UniqueConst.orig.php | 1 +
 hwe/sammo/ResetHelper.php          | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hwe/d_setting/UniqueConst.orig.php b/hwe/d_setting/UniqueConst.orig.php
index d4891c3a..29dd6dbe 100644
--- a/hwe/d_setting/UniqueConst.orig.php
+++ b/hwe/d_setting/UniqueConst.orig.php
@@ -3,6 +3,7 @@ namespace sammo;
 
 class UniqueConst{
     public static $serverID = '_tK_serverID_';
+    public static $serverName = '_tK_serverName_';
 
     private function __construct(){}
 
diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php
index ee89b953..8480fae0 100644
--- a/hwe/sammo/ResetHelper.php
+++ b/hwe/sammo/ResetHelper.php
@@ -61,7 +61,8 @@ class ResetHelper{
         $result = Util::generateFileUsingSimpleTemplate(
             $servRoot.'/d_setting/UniqueConst.orig.php',
             $servRoot.'/d_setting/UniqueConst.php',[
-                'serverID'=>DB::prefix().'_'.Util::randomStr(8)
+                'serverID'=>DB::prefix().'_'.Util::randomStr(8),
+                'serverName'=>AppConf::getList()[$prefix]->getKorName(),
             ], true
         );
 

From 20f74f6645e2ccec997098d0623e50f371c445c1 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 27 Apr 2018 22:36:29 +0900
Subject: [PATCH 153/184] =?UTF-8?q?=EA=B0=81=20=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=EC=97=90=20=EC=84=9C=EB=B2=84=20=EC=9D=B4=EB=A6=84=20=ED=91=9C?=
 =?UTF-8?q?=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/a_bestGeneral.php   | 2 +-
 hwe/a_emperior.php      | 2 +-
 hwe/a_emperior2.php     | 2 +-
 hwe/a_genList.php       | 2 +-
 hwe/a_hallOfFame.php    | 2 +-
 hwe/a_history.php       | 2 +-
 hwe/a_kingdomList.php   | 2 +-
 hwe/a_npcList.php       | 2 +-
 hwe/a_status.php        | 2 +-
 hwe/a_traffic.php       | 2 +-
 hwe/a_vote.php          | 2 +-
 hwe/b_auction.php       | 2 +-
 hwe/b_battleCenter.php  | 2 +-
 hwe/b_betting.php       | 2 +-
 hwe/b_chiefboard.php    | 2 +-
 hwe/b_chiefcenter.php   | 2 +-
 hwe/b_currentCity.php   | 2 +-
 hwe/b_dipcenter.php     | 2 +-
 hwe/b_diplomacy.php     | 2 +-
 hwe/b_genList.php       | 2 +-
 hwe/b_myBossInfo.php    | 2 +-
 hwe/b_myCityInfo.php    | 2 +-
 hwe/b_myGenInfo.php     | 2 +-
 hwe/b_myKingdomInfo.php | 2 +-
 hwe/b_myPage.php        | 2 +-
 hwe/b_nationboard.php   | 2 +-
 hwe/b_nationrule.php    | 2 +-
 hwe/b_tournament.php    | 2 +-
 hwe/b_troop.php         | 2 +-
 hwe/index.php           | 2 +-
 hwe/join.php            | 2 +-
 hwe/select_npc.php      | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/hwe/a_bestGeneral.php b/hwe/a_bestGeneral.php
index ddf18225..cc546630 100644
--- a/hwe/a_bestGeneral.php
+++ b/hwe/a_bestGeneral.php
@@ -36,7 +36,7 @@ if ($con >= 2) {
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>명장일람</title>
+<title><?=UniqueConst::$serverName?>: 명장일람</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 
diff --git a/hwe/a_emperior.php b/hwe/a_emperior.php
index c09d1205..470bf2b9 100644
--- a/hwe/a_emperior.php
+++ b/hwe/a_emperior.php
@@ -18,7 +18,7 @@ increaseRefresh("왕조일람", 2);
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>왕조일람</title>
+<title><?=UniqueConst::$serverName?>: 왕조일람</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 
diff --git a/hwe/a_emperior2.php b/hwe/a_emperior2.php
index eae1b186..f6f3449f 100644
--- a/hwe/a_emperior2.php
+++ b/hwe/a_emperior2.php
@@ -18,7 +18,7 @@ increaseRefresh("왕조일람", 2);
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>왕조일람</title>
+<title><?=UniqueConst::$serverName?>: 왕조일람</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 
diff --git a/hwe/a_genList.php b/hwe/a_genList.php
index d7765c16..ec3b2e0e 100644
--- a/hwe/a_genList.php
+++ b/hwe/a_genList.php
@@ -41,7 +41,7 @@ if ($type <= 0 || $type > 15) {
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>장수일람</title>
+<title><?=UniqueConst::$serverName?>: 장수일람</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 <script type="text/javascript" src="../e_lib/jquery-3.2.1.min.js"></script>
diff --git a/hwe/a_hallOfFame.php b/hwe/a_hallOfFame.php
index 040534e2..175e331e 100644
--- a/hwe/a_hallOfFame.php
+++ b/hwe/a_hallOfFame.php
@@ -14,7 +14,7 @@ increaseRefresh("명예의전당", 2);
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>명예의 전당</title>
+<title><?=UniqueConst::$serverName?>: 명예의 전당</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 
diff --git a/hwe/a_history.php b/hwe/a_history.php
index fd8354ad..5ee3bbf8 100644
--- a/hwe/a_history.php
+++ b/hwe/a_history.php
@@ -77,7 +77,7 @@ if ($month <= 0) {
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>연감</title>
+<title><?=UniqueConst::$serverName?>: 연감</title>
 <script src="../e_lib/jquery-3.2.1.min.js"></script>
 <script src="../d_shared/common_path.js"></script>
 <script src="js/common.js"></script>
diff --git a/hwe/a_kingdomList.php b/hwe/a_kingdomList.php
index 39c93b78..5c171deb 100644
--- a/hwe/a_kingdomList.php
+++ b/hwe/a_kingdomList.php
@@ -28,7 +28,7 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>세력일람</title>
+<title><?=UniqueConst::$serverName?>: 세력일람</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 
diff --git a/hwe/a_npcList.php b/hwe/a_npcList.php
index 09963a91..938b2608 100644
--- a/hwe/a_npcList.php
+++ b/hwe/a_npcList.php
@@ -26,7 +26,7 @@ $sel[$type] = "selected";
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>빙의일람</title>
+<title><?=UniqueConst::$serverName?>: 빙의일람</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 
diff --git a/hwe/a_status.php b/hwe/a_status.php
index b5951a47..b8fc1977 100644
--- a/hwe/a_status.php
+++ b/hwe/a_status.php
@@ -29,7 +29,7 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 <head>
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<title>세력도</title>
+<title><?=UniqueConst::$serverName?>: 세력도</title>
 <script src="../e_lib/jquery-3.2.1.min.js"></script>
 <script src="../d_shared/common_path.js"></script>
 <script src="js/common.js"></script>
diff --git a/hwe/a_traffic.php b/hwe/a_traffic.php
index 5cee826b..64fc67e0 100644
--- a/hwe/a_traffic.php
+++ b/hwe/a_traffic.php
@@ -47,7 +47,7 @@ if ($game['maxonline'] < $curonline) {
 <!DOCTYPE html>
 <html>
 <head>
-<title>트래픽정보</title>
+<title><?=UniqueConst::$serverName?>: 트래픽정보</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
diff --git a/hwe/a_vote.php b/hwe/a_vote.php
index 14d4ff64..ed4a8a0b 100644
--- a/hwe/a_vote.php
+++ b/hwe/a_vote.php
@@ -28,7 +28,7 @@ if ($vote[0] == "") {
 <!DOCTYPE html>
 <html>
 <head>
-<title>설문조사</title>
+<title><?=UniqueConst::$serverName?>: 설문조사</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
diff --git a/hwe/b_auction.php b/hwe/b_auction.php
index 9690c1ab..6cb20444 100644
--- a/hwe/b_auction.php
+++ b/hwe/b_auction.php
@@ -58,7 +58,7 @@ if ($msg2 == "") {
 <!DOCTYPE html>
 <html>
 <head>
-<title>거래장</title>
+<title><?=UniqueConst::$serverName?>: 거래장</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
diff --git a/hwe/b_battleCenter.php b/hwe/b_battleCenter.php
index 1ca833a1..b742aa60 100644
--- a/hwe/b_battleCenter.php
+++ b/hwe/b_battleCenter.php
@@ -75,7 +75,7 @@ $sel[$type] = "selected";
 <html>
 
 <head>
-<title>감찰부</title>
+<title><?=UniqueConst::$serverName?>: 감찰부</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
diff --git a/hwe/b_betting.php b/hwe/b_betting.php
index cb80cc32..409432a9 100644
--- a/hwe/b_betting.php
+++ b/hwe/b_betting.php
@@ -53,7 +53,7 @@ if($str3){
 } ?>
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>베팅장</title>
+<title><?=UniqueConst::$serverName?>: 베팅장</title>
 <style>
 body { color:white; background-color:black; border-width:1px; border-color:gray; }
 table { font-family:'맑은 고딕'; line-height:110%; }
diff --git a/hwe/b_chiefboard.php b/hwe/b_chiefboard.php
index d31d6007..288aeac7 100644
--- a/hwe/b_chiefboard.php
+++ b/hwe/b_chiefboard.php
@@ -25,7 +25,7 @@ if($me['level'] < 5) {
 <!DOCTYPE html>
 <html>
 <head>
-<title>기밀실</title>
+<title><?=UniqueConst::$serverName?>: 기밀실</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
diff --git a/hwe/b_chiefcenter.php b/hwe/b_chiefcenter.php
index 93a66880..ef63f9ff 100644
--- a/hwe/b_chiefcenter.php
+++ b/hwe/b_chiefcenter.php
@@ -83,7 +83,7 @@ for($i= $lv - 1; $i>=5; $i--){
 <html>
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>사령부</title>
+<title><?=UniqueConst::$serverName?>: 사령부</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 <script type="text/javascript">
diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index f31bcc07..eefc36ac 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -32,7 +32,7 @@ $templates = new \League\Plates\Engine('templates');
 <html>
 
 <head>
-<title>도시정보</title>
+<title><?=UniqueConst::$serverName?>: 도시정보</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <link href="../d_shared/common.css" rel="stylesheet">
 <link href="css/common.css" rel="stylesheet">
diff --git a/hwe/b_dipcenter.php b/hwe/b_dipcenter.php
index e94afcca..1ef4460b 100644
--- a/hwe/b_dipcenter.php
+++ b/hwe/b_dipcenter.php
@@ -48,7 +48,7 @@ if ($me['level'] >= 5) {
 <html>
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>내무부</title>
+<title><?=UniqueConst::$serverName?>: 내무부</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 
diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php
index b7abc682..b7aa1e2e 100644
--- a/hwe/b_diplomacy.php
+++ b/hwe/b_diplomacy.php
@@ -78,7 +78,7 @@ foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE confl
 <head>
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<title>중원정보</title>
+<title><?=UniqueConst::$serverName?>: 중원 정보</title>
 <script src="../e_lib/jquery-3.2.1.min.js"></script>
 <script src="../d_shared/common_path.js"></script>
 <script src="js/common.js"></script>
diff --git a/hwe/b_genList.php b/hwe/b_genList.php
index 209d6305..0d22880a 100644
--- a/hwe/b_genList.php
+++ b/hwe/b_genList.php
@@ -54,7 +54,7 @@ $sel[$type] = "selected";
 } ?>
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>암행부</title>
+<title><?=UniqueConst::$serverName?>: 암행부</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 
diff --git a/hwe/b_myBossInfo.php b/hwe/b_myBossInfo.php
index 3cbdf3e8..92963275 100644
--- a/hwe/b_myBossInfo.php
+++ b/hwe/b_myBossInfo.php
@@ -30,7 +30,7 @@ if($meLevel == 0) {
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>인사부</title>
+<title><?=UniqueConst::$serverName?>: 인사부</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 <script type="text/javascript">
diff --git a/hwe/b_myCityInfo.php b/hwe/b_myCityInfo.php
index e3bf93be..d398bf94 100644
--- a/hwe/b_myCityInfo.php
+++ b/hwe/b_myCityInfo.php
@@ -37,7 +37,7 @@ $sel = [$type => "selected"];
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>세력도시</title>
+<title><?=UniqueConst::$serverName?>: 세력도시</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 
diff --git a/hwe/b_myGenInfo.php b/hwe/b_myGenInfo.php
index 270fd0de..ba1d562a 100644
--- a/hwe/b_myGenInfo.php
+++ b/hwe/b_myGenInfo.php
@@ -37,7 +37,7 @@ $sel = [$type => "selected"];
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>세력장수</title>
+<title><?=UniqueConst::$serverName?>: 세력장수</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 
diff --git a/hwe/b_myKingdomInfo.php b/hwe/b_myKingdomInfo.php
index 8c79e98a..9a9abfe8 100644
--- a/hwe/b_myKingdomInfo.php
+++ b/hwe/b_myKingdomInfo.php
@@ -26,7 +26,7 @@ if($me['level'] == 0) {
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>세력정보</title>
+<title><?=UniqueConst::$serverName?>: 세력정보</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 
diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php
index 8eb82ff7..edb7999d 100644
--- a/hwe/b_myPage.php
+++ b/hwe/b_myPage.php
@@ -60,7 +60,7 @@ $me = MYDB_fetch_array($result);
 <html>
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>내정보</title>
+<title><?=UniqueConst::$serverName?>: 내정보</title>
 <link href="../d_shared/common.css" rel="stylesheet">
 <link rel=stylesheet href="css/common.css">
 <script type="text/javascript">
diff --git a/hwe/b_nationboard.php b/hwe/b_nationboard.php
index d9884269..a57cfe21 100644
--- a/hwe/b_nationboard.php
+++ b/hwe/b_nationboard.php
@@ -20,7 +20,7 @@ $me = MYDB_fetch_array($result);
 <!DOCTYPE html>
 <html>
 <head>
-<title>회의실</title>
+<title><?=UniqueConst::$serverName?>: 회의실</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
diff --git a/hwe/b_nationrule.php b/hwe/b_nationrule.php
index df85b7e9..b48ea683 100644
--- a/hwe/b_nationrule.php
+++ b/hwe/b_nationrule.php
@@ -15,7 +15,7 @@ increaseRefresh("국법", 1);
 <!DOCTYPE html>
 <html>
 <head>
-<title>국법</title>
+<title><?=UniqueConst::$serverName?>: 국법</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
diff --git a/hwe/b_tournament.php b/hwe/b_tournament.php
index aa90fe70..ab535798 100644
--- a/hwe/b_tournament.php
+++ b/hwe/b_tournament.php
@@ -43,7 +43,7 @@ case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "itl"; $tp2 = "
 } ?>
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>토너먼트</title>
+<title><?=UniqueConst::$serverName?>: 토너먼트</title>
 <style>
 body { color:white; background-color:black; border-width:1px; border-color:gray; }
 table { font-family:'맑은 고딕'; line-height:110%; }
diff --git a/hwe/b_troop.php b/hwe/b_troop.php
index ab2a0016..dd930a31 100644
--- a/hwe/b_troop.php
+++ b/hwe/b_troop.php
@@ -25,7 +25,7 @@ $troopcount = MYDB_num_rows($result);
 <html>
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>부대편성</title>
+<title><?=UniqueConst::$serverName?>: 부대편성</title>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>
 
diff --git a/hwe/index.php b/hwe/index.php
index ee0752c7..73b39366 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -58,7 +58,7 @@ $scenario = $admin['scenario_text'];
 <!DOCTYPE html>
 <html>
 <head>
-<title>메인</title>
+<title><?=UniqueConst::$serverName?>: 메인</title>
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <script src="../e_lib/jquery-3.2.1.min.js"></script>
diff --git a/hwe/join.php b/hwe/join.php
index 9f5a7dca..3e291dbf 100644
--- a/hwe/join.php
+++ b/hwe/join.php
@@ -29,7 +29,7 @@ $connect=$db->get();
 <!DOCTYPE html>
 <html>
 <head>
-<title>장수생성</title>
+<title><?=UniqueConst::$serverName?>: 장수생성</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <link href="../d_shared/common.css" rel="stylesheet">
 <link rel='stylesheet' href="css/common.css">
diff --git a/hwe/select_npc.php b/hwe/select_npc.php
index d2a145cb..868318b9 100644
--- a/hwe/select_npc.php
+++ b/hwe/select_npc.php
@@ -32,7 +32,7 @@ $connect=$db->get();
 <!DOCTYPE html>
 <html>
 <head>
-<title>NPC선택</title>
+<title><?=UniqueConst::$serverName?>: NPC선택</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
 <link rel='stylesheet' href='css/common.css' type='text/css'>

From a2d3ac9e708ae18b70bbe2114f16d889144f25f4 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 27 Apr 2018 22:51:39 +0900
Subject: [PATCH 154/184] =?UTF-8?q?=EC=8B=9C=EB=82=98=EB=A6=AC=EC=98=A4=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=8B=9C=20=EC=9E=A5=EC=88=98=EC=9D=98=20NPC?=
 =?UTF-8?q?=20=EB=A9=94=EC=8B=9C=EC=A7=80=EA=B0=80=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php       | 9 ++++++++-
 hwe/sammo/Scenario.php | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index de01ce8a..b9e35bc1 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -192,7 +192,14 @@ function processAI($no) {
 
     $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);
+    $nation = MYDB_fetch_array($result)??[
+        'nation'=>0,
+        'color'=>'#000000',
+        'name'=>'재야',
+        'level'=>0,
+        'gold'=>0,
+        'rice'=>0,
+    ];
 
     $coreCommand = array();
     if($general['level'] >= 5) {
diff --git a/hwe/sammo/Scenario.php b/hwe/sammo/Scenario.php
index deb28cdd..983090e5 100644
--- a/hwe/sammo/Scenario.php
+++ b/hwe/sammo/Scenario.php
@@ -64,7 +64,7 @@ class Scenario{
 
             list(
                 $affinity, $name, $pictureID, $nationID, $locatedCity, 
-                $leadership, $power, $intel, $birth, $death, $ego,
+                $leadership, $power, $intel, $level, $birth, $death, $ego,
                 $char, $text
             ) = $rawGeneral;
 
@@ -83,6 +83,7 @@ class Scenario{
                 $leadership, 
                 $power, 
                 $intel, 
+                $level, 
                 $birth, 
                 $death, 
                 $ego,
@@ -117,7 +118,7 @@ class Scenario{
                 $leadership, 
                 $power, 
                 $intel, 
-                $level,
+                $level, 
                 $birth, 
                 $death, 
                 $ego,

From 647c51fe0fe36d0e8c5df305af83ad94169ca318 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 27 Apr 2018 23:08:55 +0900
Subject: [PATCH 155/184] =?UTF-8?q?=EC=99=B8=EA=B5=90=20=EC=84=9C=EC=8B=A0?=
 =?UTF-8?q?,=20=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EC=88=98=EB=9D=BD=EC=8B=9C?=
 =?UTF-8?q?=20=EC=98=AC=EB=B0=94=EB=A5=B4=EC=A7=80=20=EC=95=8A=EC=9D=84=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20alert=20=EA=B1=B4=EA=B5=AD=20=EC=8B=9C=20?=
 =?UTF-8?q?=EC=9E=A5=EC=88=98=20=EC=9D=B4=EB=A6=84=EA=B3=BC=20=EA=B0=99?=
 =?UTF-8?q?=EC=95=84=EB=8F=84=20=EA=B1=B4=EA=B5=AD=20=EA=B0=80=EB=8A=A5?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process_personnel.php  | 2 +-
 hwe/j_msg_decide_opt.php        | 8 ++++----
 hwe/js/msg.js                   | 5 ++++-
 hwe/sammo/DiplomaticMessage.php | 4 ++--
 hwe/sammo/ScoutMessage.php      | 4 ++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/hwe/func_process_personnel.php b/hwe/func_process_personnel.php
index b809cfb8..93c483b7 100644
--- a/hwe/func_process_personnel.php
+++ b/hwe/func_process_personnel.php
@@ -568,7 +568,7 @@ function process_46(&$general) {
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $gencount = MYDB_num_rows($result);
 
-    $query = "select nation from nation where name='{$general['makenation']}'";
+    $query = "select nation from nation where nation!={$general['nation']} AND name='{$general['makenation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $nationcount = MYDB_num_rows($result);
 
diff --git a/hwe/j_msg_decide_opt.php b/hwe/j_msg_decide_opt.php
index 466159de..d0e438ef 100644
--- a/hwe/j_msg_decide_opt.php
+++ b/hwe/j_msg_decide_opt.php
@@ -44,16 +44,16 @@ if($msg === null){
         'reason'=>'올바르지 않은 메시지'
     ]);
 }
-
+$reason = 'success';
 if($msgResponse){
-    $result = $msg->agreeMessage($general['no']);
+    $result = $msg->agreeMessage($general['no'], $reason);
 }
 else{
-    $result = $msg->declineMessage($general['no']);
+    $result = $msg->declineMessage($general['no'], $reason);
 }
 
 
 Json::die([
     'result' => $result===DiplomaticMessage::ACCEPTED,
-    'reason' => 'result'
+    'reason' => $reason
 ]);
\ No newline at end of file
diff --git a/hwe/js/msg.js b/hwe/js/msg.js
index 0af6eeef..aa08edcf 100644
--- a/hwe/js/msg.js
+++ b/hwe/js/msg.js
@@ -42,7 +42,10 @@ function responseMessage(msgID, response){
     }).then(refreshMsg);
 }
 
-function refreshMsg(){
+function refreshMsg(result){
+    if(!result.result){
+        alert(result.reason);
+    }
     return redrawMsg(fetchMsg());
 }
 
diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php
index 101893bd..10c9e4d7 100644
--- a/hwe/sammo/DiplomaticMessage.php
+++ b/hwe/sammo/DiplomaticMessage.php
@@ -215,7 +215,7 @@ class DiplomaticMessage extends Message{
     /**
      * @return int 수행 결과 반환, ACCEPTED(등용장 소모), DECLINED(등용장 소모), INVALID 중 반환
      */
-    public function agreeMessage(int $receiverID):int{
+    public function agreeMessage(int $receiverID, string &$reason):int{
         //NOTE: 올바른 유저가 agreeMessage() 호출을 한건지는 외부에서 체크 필요(Session->userID 등)
 
         if(!$this->id){
@@ -318,7 +318,7 @@ class DiplomaticMessage extends Message{
         return self::DECLINED;
     }
 
-    public function declineMessage(int $receiverID):int{
+    public function declineMessage(int $receiverID, string &$reason):int{
         if(!$this->id){
             throw \RuntimeException('전송되지 않은 메시지에 거절 진행 중');
         }
diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php
index 4decb80f..a1e4bf09 100644
--- a/hwe/sammo/ScoutMessage.php
+++ b/hwe/sammo/ScoutMessage.php
@@ -55,7 +55,7 @@ class ScoutMessage extends Message{
     /**
      * @return int 수행 결과 반환, ACCEPTED(등용장 소모), DECLINED(등용장 소모), INVALID 중 반환
      */
-    public function agreeMessage(int $receiverID):int{
+    public function agreeMessage(int $receiverID, string &$reason):int{
         //NOTE: 올바른 유저가 agreeMessage() 호출을 한건지는 외부에서 체크 필요(Session->userID 등)
 
         if(!$this->id){
@@ -146,7 +146,7 @@ class ScoutMessage extends Message{
         return self::DECLINED;
     }
 
-    public function declineMessage(int $receiverID):int{
+    public function declineMessage(int $receiverID, string &$reason):int{
         if(!$this->id){
             throw \RuntimeException('전송되지 않은 메시지에 거절 진행 중');
         }

From 5ed31881e66f00de462c7af284812134efbfee94 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 27 Apr 2018 23:40:50 +0900
Subject: [PATCH 156/184] =?UTF-8?q?PrintElapsedTime=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/_simul.php          | 1 -
 hwe/a_bestGeneral.php   | 1 -
 hwe/a_emperior.php      | 1 -
 hwe/a_emperior2.php     | 1 -
 hwe/a_genList.php       | 1 -
 hwe/a_hallOfFame.php    | 1 -
 hwe/a_history.php       | 1 -
 hwe/a_kingdomList.php   | 1 -
 hwe/a_npcList.php       | 1 -
 hwe/a_status.php        | 1 -
 hwe/a_traffic.php       | 1 -
 hwe/a_vote.php          | 1 -
 hwe/b_auction.php       | 1 -
 hwe/b_battleCenter.php  | 1 -
 hwe/b_betting.php       | 1 -
 hwe/b_chiefboard.php    | 1 -
 hwe/b_chiefcenter.php   | 1 -
 hwe/b_currentCity.php   | 1 -
 hwe/b_dipcenter.php     | 1 -
 hwe/b_diplomacy.php     | 1 -
 hwe/b_genList.php       | 1 -
 hwe/b_myBossInfo.php    | 1 -
 hwe/b_myCityInfo.php    | 1 -
 hwe/b_myGenInfo.php     | 1 -
 hwe/b_myKingdomInfo.php | 1 -
 hwe/b_myPage.php        | 1 -
 hwe/b_nationboard.php   | 1 -
 hwe/b_nationrule.php    | 1 -
 hwe/b_tournament.php    | 1 -
 hwe/b_troop.php         | 1 -
 hwe/index.php           | 1 -
 hwe/lib.php             | 8 --------
 hwe/processing.php      | 6 +-----
 33 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/hwe/_simul.php b/hwe/_simul.php
index 66e07838..fe992f6f 100644
--- a/hwe/_simul.php
+++ b/hwe/_simul.php
@@ -1630,7 +1630,6 @@ if($isgen == "장수공격" || $isgen == "성벽공격") {
 </table>
 </form>
 </body>
-<?php PrintElapsedTime(); ?>
 </html>
 <?php
 
diff --git a/hwe/a_bestGeneral.php b/hwe/a_bestGeneral.php
index cc546630..ab83476a 100644
--- a/hwe/a_bestGeneral.php
+++ b/hwe/a_bestGeneral.php
@@ -344,7 +344,6 @@ for ($i=0; $i < 4; $i++) {
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/a_emperior.php b/hwe/a_emperior.php
index 470bf2b9..0e4ff6a3 100644
--- a/hwe/a_emperior.php
+++ b/hwe/a_emperior.php
@@ -201,7 +201,6 @@ if ($select == 0) {
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/a_emperior2.php b/hwe/a_emperior2.php
index f6f3449f..58edb395 100644
--- a/hwe/a_emperior2.php
+++ b/hwe/a_emperior2.php
@@ -202,7 +202,6 @@ if ($select == 0) {
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/a_genList.php b/hwe/a_genList.php
index ec3b2e0e..555af902 100644
--- a/hwe/a_genList.php
+++ b/hwe/a_genList.php
@@ -194,7 +194,6 @@ echo "
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 <script type="text/javascript">
 $(document).ready(function() {
     $("#viewType").val("<?=$type?>").attr("selected", "selected");
diff --git a/hwe/a_hallOfFame.php b/hwe/a_hallOfFame.php
index 175e331e..19a96474 100644
--- a/hwe/a_hallOfFame.php
+++ b/hwe/a_hallOfFame.php
@@ -118,7 +118,6 @@ for ($i=0; $i < 21; $i++) {
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/a_history.php b/hwe/a_history.php
index 5ee3bbf8..90fc8e17 100644
--- a/hwe/a_history.php
+++ b/hwe/a_history.php
@@ -159,6 +159,5 @@ reloadWorldMap({
     neutralView:true
 });
 </script>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
diff --git a/hwe/a_kingdomList.php b/hwe/a_kingdomList.php
index 5c171deb..bca592c2 100644
--- a/hwe/a_kingdomList.php
+++ b/hwe/a_kingdomList.php
@@ -248,7 +248,6 @@ echo"
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 
 </html>
diff --git a/hwe/a_npcList.php b/hwe/a_npcList.php
index 938b2608..94a914fb 100644
--- a/hwe/a_npcList.php
+++ b/hwe/a_npcList.php
@@ -124,7 +124,6 @@ echo "
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 
 </html>
diff --git a/hwe/a_status.php b/hwe/a_status.php
index b8fc1977..74ca2334 100644
--- a/hwe/a_status.php
+++ b/hwe/a_status.php
@@ -75,7 +75,6 @@ $(function(){
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 
 </html>
diff --git a/hwe/a_traffic.php b/hwe/a_traffic.php
index 64fc67e0..de600ece 100644
--- a/hwe/a_traffic.php
+++ b/hwe/a_traffic.php
@@ -264,7 +264,6 @@ for ($i=0; $i < $count; $i++) {
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/a_vote.php b/hwe/a_vote.php
index ed4a8a0b..4b6c08d3 100644
--- a/hwe/a_vote.php
+++ b/hwe/a_vote.php
@@ -333,7 +333,6 @@ if ($admin['voteopen'] >= 2 || $session->userGrade >= 5) {
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/b_auction.php b/hwe/b_auction.php
index 6cb20444..248f4d09 100644
--- a/hwe/b_auction.php
+++ b/hwe/b_auction.php
@@ -299,6 +299,5 @@ for ($i=0; $i < $count; $i++) {
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
diff --git a/hwe/b_battleCenter.php b/hwe/b_battleCenter.php
index b742aa60..fcc64e31 100644
--- a/hwe/b_battleCenter.php
+++ b/hwe/b_battleCenter.php
@@ -174,6 +174,5 @@ for ($i=0; $i < $gencount; $i++) {
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
diff --git a/hwe/b_betting.php b/hwe/b_betting.php
index 409432a9..5df841b7 100644
--- a/hwe/b_betting.php
+++ b/hwe/b_betting.php
@@ -433,6 +433,5 @@ for ($i=0; $i < 4; $i++) {
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
diff --git a/hwe/b_chiefboard.php b/hwe/b_chiefboard.php
index 288aeac7..0a01a51f 100644
--- a/hwe/b_chiefboard.php
+++ b/hwe/b_chiefboard.php
@@ -69,7 +69,6 @@ for($i=0; $i < 20; $i++) {
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/b_chiefcenter.php b/hwe/b_chiefcenter.php
index ef63f9ff..77a124ec 100644
--- a/hwe/b_chiefcenter.php
+++ b/hwe/b_chiefcenter.php
@@ -192,7 +192,6 @@ for($k=0; $k < 2; $k++) {
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index eefc36ac..930397e2 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -369,7 +369,6 @@ for($j=0; $j < $gencount; $j++) {
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/b_dipcenter.php b/hwe/b_dipcenter.php
index 1ef4460b..e5c52774 100644
--- a/hwe/b_dipcenter.php
+++ b/hwe/b_dipcenter.php
@@ -308,6 +308,5 @@ if ($nation['war'] == 0) {
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php
index b7aa1e2e..a3c0fb84 100644
--- a/hwe/b_diplomacy.php
+++ b/hwe/b_diplomacy.php
@@ -248,6 +248,5 @@ for($i=0; $i < $nationcount; $i++) {
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
diff --git a/hwe/b_genList.php b/hwe/b_genList.php
index 0d22880a..a38ba92d 100644
--- a/hwe/b_genList.php
+++ b/hwe/b_genList.php
@@ -210,6 +210,5 @@ echo "
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
diff --git a/hwe/b_myBossInfo.php b/hwe/b_myBossInfo.php
index 92963275..89ecd255 100644
--- a/hwe/b_myBossInfo.php
+++ b/hwe/b_myBossInfo.php
@@ -509,6 +509,5 @@ for($j=0; $j < $citycount; $j++) {
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
diff --git a/hwe/b_myCityInfo.php b/hwe/b_myCityInfo.php
index d398bf94..d62867d8 100644
--- a/hwe/b_myCityInfo.php
+++ b/hwe/b_myCityInfo.php
@@ -192,7 +192,6 @@ for ($j=0; $j < $citycount; $j++) {
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 
 </html>
diff --git a/hwe/b_myGenInfo.php b/hwe/b_myGenInfo.php
index ba1d562a..869c299d 100644
--- a/hwe/b_myGenInfo.php
+++ b/hwe/b_myGenInfo.php
@@ -195,7 +195,6 @@ for($j=0; $j < $gencount; $j++) {
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 
 </html>
diff --git a/hwe/b_myKingdomInfo.php b/hwe/b_myKingdomInfo.php
index 9a9abfe8..1aa0a031 100644
--- a/hwe/b_myKingdomInfo.php
+++ b/hwe/b_myKingdomInfo.php
@@ -160,7 +160,6 @@ echo"
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 
 </html>
diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php
index edb7999d..4e83baca 100644
--- a/hwe/b_myPage.php
+++ b/hwe/b_myPage.php
@@ -131,7 +131,6 @@ function go(type) {
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/b_nationboard.php b/hwe/b_nationboard.php
index a57cfe21..3154efaa 100644
--- a/hwe/b_nationboard.php
+++ b/hwe/b_nationboard.php
@@ -64,7 +64,6 @@ for($i=0; $i < 20; $i++) {
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/b_nationrule.php b/hwe/b_nationrule.php
index b48ea683..4431008b 100644
--- a/hwe/b_nationrule.php
+++ b/hwe/b_nationrule.php
@@ -52,7 +52,6 @@ if($me['level'] >= 5) {
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/b_tournament.php b/hwe/b_tournament.php
index ab535798..76241c7c 100644
--- a/hwe/b_tournament.php
+++ b/hwe/b_tournament.php
@@ -510,6 +510,5 @@ if ($admin['tournament'] == 2 || $admin['tournament'] == 3) {
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
diff --git a/hwe/b_troop.php b/hwe/b_troop.php
index dd930a31..173b6f45 100644
--- a/hwe/b_troop.php
+++ b/hwe/b_troop.php
@@ -160,7 +160,6 @@ echo "
     <tr><td><?=banner()?> </td></tr>
 </table>
 </form>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
diff --git a/hwe/index.php b/hwe/index.php
index 73b39366..3e1578a6 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -311,7 +311,6 @@ else if($session->userGrade == 4){
         <section class="national_message"></section>
  </div></div>
 <div style="clear:left;"><?=allButton()?><?=banner()?></div>
-<?php PrintElapsedTime(); ?>
 </div>
 <?php
 if ($con == 1) {
diff --git a/hwe/lib.php b/hwe/lib.php
index 06047ae1..5f82b4ad 100644
--- a/hwe/lib.php
+++ b/hwe/lib.php
@@ -26,7 +26,6 @@ include "MYDB.php";
 // 각종 변수
 define('STEP_LOG', true);
 define('PROCESS_LOG', true);
-$_startTime = microtime(true);
 
 ob_start();
 session_cache_limiter('nocache');//NOTE: 캐시가 가능하도록 설정해야 할 수도 있음. 주의!
@@ -55,13 +54,6 @@ function MessageBox($str)
     echo "<script>alert('$str');</script>";
 }
 
-function PrintElapsedTime()
-{
-    global $_startTime;
-    $_endTime = round(microtime(true) - $_startTime, 3);
-    echo "<table width=1000 align=center style=font-size:10px;><tr><td align=right>경과시간 : {$_endTime}초</td></tr></table>";
-}
-
 function LogText($prefix, $variable)
 {
     $text = sprintf('%s : %s'."\n", $prefix, var_export($variable, true));
diff --git a/hwe/processing.php b/hwe/processing.php
index a28bf6e5..0e49fdc4 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -166,11 +166,7 @@ function ender($type=0) {
     echo banner();
     echo "
     </td></tr>
-</table>";
-
-    PrintElapsedTime();
-
-    echo "
+</table>
 </body>
 </html>
 ";

From 62c6ba362d56e90c8baefc39c196c4102dede681 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 27 Apr 2018 23:51:57 +0900
Subject: [PATCH 157/184] =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=EB=B0=A9=EC=B9=A8=20&=20=EC=9D=B4=EC=9A=A9?=
 =?UTF-8?q?=EC=95=BD=EA=B4=80=20=EB=A7=81=ED=81=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/login.css | 12 +++++++++++-
 index.php     |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/css/login.css b/css/login.css
index 345dcc1f..dc20a94d 100644
--- a/css/login.css
+++ b/css/login.css
@@ -103,4 +103,14 @@ input::-webkit-input-placeholder {
 
 #btn_kakao_login:hover {
     background-image:url('../oauth_kakao/kakao_login_join_ov.png');
-} 
\ No newline at end of file
+} 
+
+#bottom_box{
+    position:fixed;
+    bottom:0;
+    width:100%;
+    left:0;
+}
+#bottom_box .container{
+    text-align:center;
+}
\ No newline at end of file
diff --git a/index.php b/index.php
index 191b2614..7ed831fe 100644
--- a/index.php
+++ b/index.php
@@ -151,5 +151,8 @@ function postOAuthResult(result){
         </div>
     </div>
     </div>
+    <div id="bottom_box">
+    <div class="container"><a href="oauth_kakao/terms.2.html">개인정보처리방침</a> &amp; <a href="oauth_kakao/terms.1.html">이용약관</a><br>© 2018  •  HideD
+    </div></div>
 </body>
 </html>

From 20cceec09083082999664919e82a3658d16d688c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 00:00:46 +0900
Subject: [PATCH 158/184] =?UTF-8?q?IE11=EC=97=90=EC=84=9C=20javascript=20?=
 =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20argument=20=EC=95=88=EB=90=98=EB=8A=94=20?=
 =?UTF-8?q?=EA=B2=83=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 7ed831fe..30eaadc3 100644
--- a/index.php
+++ b/index.php
@@ -36,7 +36,13 @@ if ($session->isLoggedIn()) {
 
 var oauthMode = null;
 
-function getOAuthToken(mode='login', scope_list = null){
+function getOAuthToken(mode, scope_list){
+    if(mode === undefined){
+        mode = 'login';
+    }
+    if(scope_list === undefined){
+        scope_list = null;
+    }
     oauthMode = mode;
     var url = 'https://kauth.kakao.com/oauth/authorize?'+
         'client_id=<?=KakaoKey::REST_KEY?>&'+

From c86ac7d20fe50ecb50c28cce24b308f212e6f35f Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 00:23:51 +0900
Subject: [PATCH 159/184] =?UTF-8?q?=EA=B0=80=EC=9E=85=20=EC=9D=BC=EC=9E=90?=
 =?UTF-8?q?=20=ED=91=9C=EA=B8=B0,=20=EA=B0=9C=EC=9D=B8=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=20=EC=A0=9C3=EC=9E=90=20=EC=A0=9C=EA=B3=B5=20=EB=8F=99?=
 =?UTF-8?q?=EC=9D=98=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80.=20?=
 =?UTF-8?q?=EC=B2=A0=ED=9A=8C=20=EB=B2=84=ED=8A=BC=EB=8F=84=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/user_info.css                   | 170 +---------------------------
 i_entrance/j_disallow_third_use.php |  17 +++
 i_entrance/j_get_user_info.php      |   6 +-
 i_entrance/user_info.html           |   7 ++
 js/user_info.js                     |  25 ++++
 5 files changed, 58 insertions(+), 167 deletions(-)
 create mode 100644 i_entrance/j_disallow_third_use.php

diff --git a/css/user_info.css b/css/user_info.css
index 436f22b8..92665087 100644
--- a/css/user_info.css
+++ b/css/user_info.css
@@ -81,168 +81,8 @@
     height:20px;
 }
 
-#EntranceManage_00 {
-    width: 500px; height: 409px;
-    z-index: 2;
-}
-
-#EntranceManage_0000 {
-    width: 498px; height: 50px;
-}
-
-#EntranceManage_0001 {
-    width: 100px; height: 30px;
-}
-
-#EntranceManage_0002 {
-    width: 498px; height: 25px;
-}
-
-#EntranceManage_0003 {
-    width: 98px; height: 84px;
-    line-height: 84px;
-}
-
-#EntranceManage_0004 {
-    width: 148px; height: 84px;
-    line-height: 84px;
-}
-
-#EntranceManage_0005 {
-    width: 98px; height: 84px;
-    line-height: 84px;
-}
-
-#EntranceManage_0006 {
-    width: 148px; height: 84px;
-    text-align: left;
-}
-
-#EntranceManage_000600 {
-    width: 80px; height: 17px;
-}
-
-#EntranceManage_000601 {
-    width: 80px; height: 17px;
-}
-
-#EntranceManage_000602 {
-    width: 80px; height: 17px;
-}
-
-#EntranceManage_000603 {
-    width: 144px; height: 20px;
-}
-
-#EntranceManage_0007 {
-    width: 98px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0008 {
-    width: 148px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0009 {
-    width: 98px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0010 {
-    width: 148px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0011 {
-    width: 98px; height: 20px;
-}
-
-#EntranceManage_0012 {
-    width: 148px; height: 20px;
-}
-
-#EntranceManage_0013 {
-    width: 248px; height: 20px;
-}
-
-#EntranceManage_0014 {
-    width: 98px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0015 {
-    width: 148px; height: 64px;
-}
-
-#EntranceManage_001500 {
-    width: 64px; height: 64px;
-}
-
-#EntranceManage_001501 {
-    width: 64px; height: 64px;
-}
-
-#EntranceManage_0016 {
-    width: 248px; height: 64px;
-}
-
-#EntranceManage_001600 {
-    width: 100px; height: 16px;
-    display: none;
-}
-
-#EntranceManage_001601 {
-    width: 70px; height: 20px;
-}
-
-#EntranceManage_001602 {
-    width: 85px; height: 20px;
-}
-
-#EntranceManage_001603 {
-    width: 85px; height: 20px;
-}
-
-#EntranceManage_0017 {
-    width: 98px; height: 100px;
-    line-height: 100px;
-}
-
-#EntranceManage_0018 {
-    width: 398px; height: 100px;
-    text-align: left;
-}
-
-#EntranceManage_0019 {
-    width: 149px; height: 20px;
-}
-
-#EntranceManage_0020 {
-    width: 500px; height: 20px;
-    border: none;
-}
-
-#EntranceManage_002000 {
-    width: 500px;
-}
-
-#EntranceManage_00200000 {
-    width: 498px; height: 20px;
-}
-
-.EntranceManage_Sequence {
-    width: 48px; height: 20px;
-}
-
-.EntranceManage_Date {
-    width: 148px; height: 20px;
-}
-
-.EntranceManage_Amount {
-    width: 148px; height: 20px;
-}
-
-.EntranceManage_Cumul {
-    width: 148px; height: 20px;
-}
+#third_use_disallow{
+    display:none;
+    margin-left:10px;
+    width:40px;
+}
\ No newline at end of file
diff --git a/i_entrance/j_disallow_third_use.php b/i_entrance/j_disallow_third_use.php
new file mode 100644
index 00000000..4d15f83b
--- /dev/null
+++ b/i_entrance/j_disallow_third_use.php
@@ -0,0 +1,17 @@
+<?php
+namespace sammo;
+
+require(__dir__.'/../vendor/autoload.php');
+
+$session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
+
+$db = RootDB::db();
+$db->update('member', [
+    'third_use'=>0
+], 'no=%i', $userID);
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success'
+]);
\ No newline at end of file
diff --git a/i_entrance/j_get_user_info.php b/i_entrance/j_get_user_info.php
index f42e1674..7b755ebd 100644
--- a/i_entrance/j_get_user_info.php
+++ b/i_entrance/j_get_user_info.php
@@ -9,7 +9,7 @@ $userID = Session::getUserID();
 // 외부 파라미터
 
 $db = RootDB::db();
-$member = $db->queryFirstRow('SELECT `id`, `name`, `grade`, `picture` FROM `member` WHERE `NO` = %i', $userID);
+$member = $db->queryFirstRow('SELECT `id`, `name`, `grade`, `picture`, reg_date, third_use FROM `member` WHERE `NO` = %i', $userID);
 
 if(!$member['picture']){
     $picture = ServConfig::getSharedIconPath().'/default.jpg';
@@ -49,5 +49,7 @@ Json::die([
     'name'=>$member['name'],
     'grade'=>$grade,
     'picture'=>$picture,
-    'global_salt'=>RootDB::getGlobalSalt()
+    'global_salt'=>RootDB::getGlobalSalt(),
+    'join_date'=>$member['reg_date'],
+    'third_use'=>($member['third_use']!=0)
 ]);
diff --git a/i_entrance/user_info.html b/i_entrance/user_info.html
index 46cd745c..9519f960 100644
--- a/i_entrance/user_info.html
+++ b/i_entrance/user_info.html
@@ -55,6 +55,13 @@
             </td>
             
         </tr>
+        <tr>
+            <th class="bg1">가입일시</th>
+            <td colspan="2">
+                <span id="slot_join_date"></span>
+            </td>
+            <td colspan="3">개인정보 3자 제공 동의 : <span id="slot_third_use"></span><button type="button" id="third_use_disallow">철회</button></td>
+        </tr>
         <tr>
             <th class="bg1"></th>
             <th class="bg1" colspan="2">회원 탈퇴</th>
diff --git a/js/user_info.js b/js/user_info.js
index a3119784..f825f1df 100644
--- a/js/user_info.js
+++ b/js/user_info.js
@@ -14,6 +14,11 @@ function fillUserInfo(result){
     $('#slot_grade').html(result.grade);
     $('#slot_icon').attr('src', result.picture);
     $('#global_salt').val(result.global_salt);
+    $('#slot_join_date').html(result.join_date);
+    $('#slot_third_use').html(result.third_use?'○':'×');
+    if(result.third_use){
+        $('#third_use_disallow').show();
+    }
 }
 
 function changeIconPreview(){
@@ -66,6 +71,20 @@ function deleteIcon(){
     });
 }
 
+function disallowThirdUse(){
+    $.ajax({
+        type:'post',
+        url:'j_disallow_third_use.php',
+        dataType:'json'
+    }).then(function(result){
+        alert('철회했습니다.');
+        location.reload();
+    },function(){
+        alert('알 수 없는 이유로 철회를 실패했습니다.');
+        location.reload();
+    });
+}
+
 function changeIcon(e){
     e.preventDefault();
     var $icon = $('#image_upload');
@@ -219,6 +238,12 @@ $(function(){
         return false;
     });
 
+    $('#third_use_disallow').click(function(){
+        if(confirm('개인정보 3자 제공 동의를 철회할까요?')){
+            disallowThirdUse();
+        }
+    });
+
     $('#change_pw_form').submit(changePassword);
 
     $('#change_icon_form').submit(changeIcon);

From 161836a2335cf941a2a45059a5b75396cc010efa Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 01:08:54 +0900
Subject: [PATCH 160/184] =?UTF-8?q?=EC=83=81=EC=84=B1=20=EA=B0=80=EC=83=81?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20=EC=83=81=EC=84=B1=EC=9D=B4=20?=
 =?UTF-8?q?=EB=A6=AC=EC=85=8B=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?=
 =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Scenario/NPC.php    | 7 ++++++-
 hwe/scenario/scenario_30.json | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/hwe/sammo/Scenario/NPC.php b/hwe/sammo/Scenario/NPC.php
index 0ef471e5..84bc208b 100644
--- a/hwe/sammo/Scenario/NPC.php
+++ b/hwe/sammo/Scenario/NPC.php
@@ -70,6 +70,11 @@ class NPC{
             $nationID = 0;
         };
 
+        $affinity = $this->affinity;
+        if(Util::array_get($env['fiction'],false) || $affinity === 0){
+            $affinity = mt_rand(1, 150);
+        }
+
         $year = $env['year'];
         $month = $env['month'];
         $age = $year - $this->birth;
@@ -137,7 +142,7 @@ class NPC{
             'npcid'=>$npcID,
             'npc'=>2,
             'npc_org'=>2,
-            'affinity'=>$this->affinity,
+            'affinity'=>$affinity,
             'name'=>$name,
             'picture'=>$picture,
             'nation'=>$nationID,
diff --git a/hwe/scenario/scenario_30.json b/hwe/scenario/scenario_30.json
index fe916676..28ce7e70 100644
--- a/hwe/scenario/scenario_30.json
+++ b/hwe/scenario/scenario_30.json
@@ -124,7 +124,7 @@
 [54, "김기태", -1, 0, null, 86, 90, 76, 0, 160, 300, "패권", null],
 [67, "이승호", -1, 0, null, 71, 80, 53, 0, 160, 300, "할거", null],
 [69, "김광현", -1, 0, null, 84, 90, 86, 0, 160, 300, "정복", null, "제가 현진이형보단 낫죠"],
-[0, "박정배", -1, 0, null, 62, 63, 67, 0, 160, 300, "정복", null],
+[150, "박정배", -1, 0, null, 62, 63, 67, 0, 160, 300, "정복", null],
 [94, "채병용", -1, 0, null, 68, 77, 79, 0, 160, 300, "의협", null],
 [101, "윤희상", -1, 0, null, 56, 58, 67, 0, 160, 300, "대의", null],
 [73, "이재원", -1, 0, null, 83, 67, 10, 0, 160, 300, "출세", null],

From 084c7a2626ca3b58d537dce2c7ac858a0a605a81 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 01:16:00 +0900
Subject: [PATCH 161/184] =?UTF-8?q?=EC=84=A0=ED=8F=AC=EC=8B=9C=20=EC=96=91?=
 =?UTF-8?q?=EA=B5=AD=20=EB=AA=A8=EB=91=90=20=EB=9C=A8=EB=8F=84=EB=A1=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_process_chief.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php
index 87ff34c1..7eb84dda 100644
--- a/hwe/func_process_chief.php
+++ b/hwe/func_process_chief.php
@@ -799,7 +799,7 @@ function process_62(&$general) {
             new \DateTime('9999-12-31'),
             []
         );
-        $msg->send(true);
+        $msg->send();
     }
 
     pushWorldHistory($history, $admin['year'], $admin['month']);

From 1cfab534727fb03ce9610db304a95dcdab9037f7 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 01:26:32 +0900
Subject: [PATCH 162/184] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=97=B4=20=EC=9E=90?=
 =?UTF-8?q?=EB=A5=B4=EA=B8=B0=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sammo/StringUtil.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/sammo/StringUtil.php b/src/sammo/StringUtil.php
index 7b0ce9c2..30d4e9a8 100644
--- a/src/sammo/StringUtil.php
+++ b/src/sammo/StringUtil.php
@@ -27,6 +27,9 @@ class StringUtil
         $currentPos = 0;
         $currentWidth = 0;
 
+        $rawStart = 0;
+        $rawWidth = 0;
+
         $strings = static::splitString($str);
         foreach($strings as $idx=>$char){
             $charWidth = mb_strwidth($char, 'UTF-8');
@@ -34,10 +37,11 @@ class StringUtil
                 break;
             }
             $currentPos += $charWidth;
+            $rawStart += strlen($char);
         }
 
         if($currentPos + $width >= $length){
-            return substr($str, $currentPos);
+            return substr($str, $rawStart);
         }
 
         for($idx = $currentPos; $idx < count($strings); $idx++){
@@ -48,9 +52,10 @@ class StringUtil
                 break;
             }
             $currentWidth += $charWidth;
+            $rawWidth += strlen($char);
         }
 
-        return substr($str, $currentPos, $currentWidth);
+        return substr($str, $rawStart, $rawWidth);
     }
 
     public static function cutStringForWidth(string $str, int $width, string $endFill='..')

From 0488ebf071ec7f08e3d6610172592e7e23a36332 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 02:25:08 +0900
Subject: [PATCH 163/184] =?UTF-8?q?=EB=AC=B4=EC=A7=80=EC=9E=A5=20=EC=9C=A0?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=ED=8F=AC=EC=83=81=20=EA=B8=B0=EC=A4=80=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index b9e35bc1..500bc5d9 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -636,10 +636,12 @@ function processAI($no) {
                         );
 
                         list($userGenID, $userGenValue) = $db->queryFirstList(
-                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND npc < 2 AND killturn > 5 ORDER BY %b ASC LIMIT 1',
+                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND npc < 2 AND killturn > 5  AND (leader >= 40 OR %b < %i) ORDER BY %b ASC LIMIT 1',
                             $type,
                             $general['nation'],
                             $general['no'],
+                            $type,
+                            $type==='gold'?21000:3000,
                             $type
                         );
 

From 7cbe383a8a9202cd9a1ccfc96abdaf99c96c66c2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 02:36:59 +0900
Subject: [PATCH 164/184] =?UTF-8?q?=ED=86=A0=EB=84=88=EB=A8=BC=ED=8A=B8=20?=
 =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=97=B4=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_betting.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/b_betting.php b/hwe/b_betting.php
index 5df841b7..5f6b37cf 100644
--- a/hwe/b_betting.php
+++ b/hwe/b_betting.php
@@ -38,11 +38,11 @@ case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "itl"; $tp2 = "
 $str1 = getTournament($admin['tournament']);
 $str2 = getTournamentTime();
 if($str2){
-    $str2 = ', '+$str2;
+    $str2 = ', '.$str2;
 }
 $str3 = getTournamentTerm();
 if($str3){
-    $str3 = ', '+$str3;
+    $str3 = ', '.$str3;
 }
 
 ?>

From 76bfcd4fa834d15d262c3d058fd3e2555a5cb250 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 02:37:47 +0900
Subject: [PATCH 165/184] =?UTF-8?q?=EB=B2=A0=ED=8C=85=20=EB=B2=84=EA=B7=B8?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_tournament.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/b_tournament.php b/hwe/b_tournament.php
index 76241c7c..11cd5f66 100644
--- a/hwe/b_tournament.php
+++ b/hwe/b_tournament.php
@@ -177,11 +177,11 @@ if ($session->userGrade >= 5) {
 $str1 = getTournament($admin['tournament']);
 $str2 = getTournamentTime();
 if($str2){
-    $str2 = ', '+$str2;
+    $str2 = ', '.$str2;
 }
 $str3 = getTournamentTerm();
 if($str3){
-    $str3 = ', '+$str3;
+    $str3 = ', '.$str3;
 }
 ?>
     <tr><td colspan=8>운영자 메세지 : <font color=orange size=5><?=$admin['tnmt_msg']?></font></td></tr>

From d3d4cce8b57ad8a86fffa90e956a4ee96de1f7e0 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 18:09:55 +0900
Subject: [PATCH 166/184] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=84=A4=EB=AA=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 i_entrance/entrance.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/i_entrance/entrance.php b/i_entrance/entrance.php
index 50066f5d..8a0d86ba 100644
--- a/i_entrance/entrance.php
+++ b/i_entrance/entrance.php
@@ -77,10 +77,10 @@ if ($userGrade >= 5) {
 계정은 한번 등록으로 계속 사용합니다. 각 서버 리셋시 캐릭터만 새로 생성하면 됩니다.<br>
 <br>
 <span class="Entrance_Che">체섭</span> : 메인서버입니다. 천하통일에 도전하여 왕조일람과 명예의전당에 올라봅시다! (주로 1턴=60분)<br>
-<span class="Entrance_Kwe">퀘섭</span> : 역사의 한 순간에 뛰어들어, 실제 장수가 되어 가상의 역사를 만들어 봅시다! (주로 1턴=30분)<br>
-<span class="Entrance_Pwe">풰섭</span> : 역사의 한 순간에 뛰어들어, 실제 장수들과 어울려 사실적 역사를 체험해 봅시다! (주로 1턴=20분)<br>
-<span class="Entrance_Twe">퉤섭</span> : 주로 패치사항 미리보기 테스트 서버입니다. 600여명의 NPC들과 경쟁해 보세요! (주로 1턴=10분)<br>
-<span class="Entrance_Hwe">훼섭</span> : 1일천하 서버. 또는 운영자 테스트용 서버입니다. (주로 1턴=1분)<br>
+<span class="Entrance_Kwe">퀘섭</span> : 실제 장수가 되어 가상의 역사를 만들어 봅시다!<br>
+<span class="Entrance_Pwe">풰섭</span> : 실제 장수들과 어울려 사실적 역사를 체험해 봅시다!<br>
+<span class="Entrance_Twe">퉤섭</span> : 주로 패치사항 미리보기 테스트 서버입니다.<br>
+<span class="Entrance_Hwe">훼섭</span> : 1일천하 서버. 또는 운영자 테스트용 서버입니다.<br>
 </td>
         </tr>
     </tfoot>

From 80b70a8765655b63fe53e55818bf956172c24cd6 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 18:48:58 +0900
Subject: [PATCH 167/184] =?UTF-8?q?=EA=B5=AD=EA=B0=80=20=EB=AA=85=20?=
 =?UTF-8?q?=EB=84=88=EB=B9=84=EB=A5=BC=20=EC=82=B4=EC=A7=9D=20=EB=8D=94=20?=
 =?UTF-8?q?=EB=8A=98=EB=A6=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_diplomacy.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php
index a3c0fb84..3cdd9d92 100644
--- a/hwe/b_diplomacy.php
+++ b/hwe/b_diplomacy.php
@@ -236,10 +236,10 @@ for($i=0; $i < $nationcount; $i++) {
         <td width=698 height=420>
             <?=getMapHtml()?>
         </td>
-        <td width=98 valign=top><?=$nationStr?></td>
+        <td width=101 valign=top><?=$nationStr?></td>
         <td width=78 valign=top><?=$powerStr?></td>
         <td width=58 valign=top><?=$genStr?></td>
-        <td width=58 valign=top><?=$cityStr?></td>
+        <td width=55 valign=top><?=$cityStr?></td>
     </tr>
 </table>
 <br>

From 18ebbbc5552c6aa812a85a1fdf00788f8e6fc276 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 19:10:03 +0900
Subject: [PATCH 168/184] =?UTF-8?q?oauth=5Fkakao=20autoload=20=EB=B9=BC?=
 =?UTF-8?q?=EB=A8=B9=EC=9D=80=EA=B1=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 oauth_kakao/index.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/oauth_kakao/index.php b/oauth_kakao/index.php
index 09ca64ef..0f5226fe 100644
--- a/oauth_kakao/index.php
+++ b/oauth_kakao/index.php
@@ -1,6 +1,8 @@
 <?php
 namespace sammo;
 
+require(__dir__.'/../vendor/autoload.php');
+
 use \kakao\KakaoKey as KakaoKey;
 
 ?>

From 088260bbc65d2fdcc603d8c9561e2f89b5dca4c4 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 19:13:18 +0900
Subject: [PATCH 169/184] =?UTF-8?q?npc=20=EC=9E=AC=EC=95=BC=EC=9D=BC?=
 =?UTF-8?q?=EB=95=8C=20e=5Fnotice=20=EC=97=90=EB=9F=AC=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 500bc5d9..935464a8 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -199,6 +199,7 @@ function processAI($no) {
         'level'=>0,
         'gold'=>0,
         'rice'=>0,
+        'tech'=>0,
     ];
 
     $coreCommand = array();

From 2d1a3f5da9187751e5f0d720504fc080ced5553a Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 20:10:33 +0900
Subject: [PATCH 170/184] =?UTF-8?q?=EB=A7=8E=EC=9D=80=20=EB=B2=84=EA=B7=B8?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=BB=A4=EB=A7=A8=EB=93=9C=20=EC=8B=A4?=
 =?UTF-8?q?=ED=96=89=20=EC=A4=91=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20?=
 =?UTF-8?q?=EB=90=9C=20=EA=B2=BD=EC=9A=B0=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EA=B5=AD=EA=B8=B0=20=EB=B3=80=EA=B2=BD=EC=97=90=20?=
 =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=9E=88=EB=8D=98=20=EC=A0=90=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EC=88=98=EB=9D=BD?=
 =?UTF-8?q?=EC=8B=9C=20=EC=86=A1=EC=8B=A0=EC=9E=90=20=EB=AA=85=EC=84=B1=20?=
 =?UTF-8?q?=EC=95=88=20=EB=8A=98=EC=96=B4=EB=82=98=EB=8A=94=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/commandlist.php            |  4 ++++
 hwe/func_command.php           |  2 +-
 hwe/js/msg.js                  |  4 +---
 hwe/processing.php             | 11 +++--------
 hwe/sammo/Engine/Personnel.php |  8 +++++---
 hwe/sammo/ScoutMessage.php     |  6 +++---
 oauth_kakao/j_change_pw.php    |  4 ++--
 oauth_kakao/oauth.php          |  4 ++--
 8 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/hwe/commandlist.php b/hwe/commandlist.php
index 6b8779bd..701e139a 100644
--- a/hwe/commandlist.php
+++ b/hwe/commandlist.php
@@ -80,6 +80,10 @@ function myCommandList() {
     $query = "select no,turntime,term,turn0,turn1,turn2,turn3,turn4,turn5,turn6,turn7,turn8,turn9,turn10,turn11,turn12,turn13,turn14,turn15,turn16,turn17,turn18,turn19,turn20,turn21,turn22,turn23 from general where owner='{$userID}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $me = MYDB_fetch_array($result);
+    if(!$me){
+        echo "로그인 되어있지 않습니다.";
+        return;
+    }
     $turn = getTurn($me, 2);
 
     echo "<table width=300 height=700 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
diff --git a/hwe/func_command.php b/hwe/func_command.php
index 579bab88..7a9a1741 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -1,7 +1,7 @@
 <?php
 namespace sammo;
 
-function getTurn($general, $type, $font=1) {
+function getTurn(array $general, $type, $font=1) {
     //TODO: 왜 'Type' 인가. 그냥 count로 하자.
     $str = [];
     $db = DB::db();
diff --git a/hwe/js/msg.js b/hwe/js/msg.js
index aa08edcf..39dfd38f 100644
--- a/hwe/js/msg.js
+++ b/hwe/js/msg.js
@@ -43,7 +43,7 @@ function responseMessage(msgID, response){
 }
 
 function refreshMsg(result){
-    if(!result.result){
+    if(result && !result.result){
         alert(result.reason);
     }
     return redrawMsg(fetchMsg());
@@ -62,8 +62,6 @@ function fetchMsg(){
 }
 
 function redrawMsg(deferred){
-    
-    console.log(deferred);
 
     function registerSequence(obj){
         if(!obj.result){
diff --git a/hwe/processing.php b/hwe/processing.php
index 0e49fdc4..c2ed4bc1 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -2769,13 +2769,8 @@ function command_81($turn, $command) {
         if($nation['level'] <= 0){
             continue;
         }
-
-        if(isset($nationcolor[$nation['color']])){
-            $nationcolor[$nation['color']] = 1;
-        }
-        else{
-            $nationcolor[$nation['color']]++;
-        }
+        
+        $colorUsed[$nation['color']]+=1;
     }
 
     $colorUsedCnt = 0;
@@ -2798,7 +2793,7 @@ function command_81($turn, $command) {
 <form name=form1 action=c_double.php method=post>
 색깔 : <select name=double size=1>";
     foreach(GetNationColors() as $idx=>$color) {
-        if($colorUsed[$color] > 0){
+        if($colorUsed[$color]>0){
             continue;
         }
         echo "<option value={$idx} style=background-color:{$color};color:".newColor($color).";>국가명</option>";
diff --git a/hwe/sammo/Engine/Personnel.php b/hwe/sammo/Engine/Personnel.php
index 925b9ec1..d6b2965f 100644
--- a/hwe/sammo/Engine/Personnel.php
+++ b/hwe/sammo/Engine/Personnel.php
@@ -11,6 +11,7 @@ use \sammo\ScoutMessage;
 class Personnel{
 
     protected $nation = null;//TODO: 상속체로 변경.
+    protected $senderID = null;
     public $valid = false;
 
     public $startYear = 0;
@@ -18,7 +19,7 @@ class Personnel{
     public $month = 0;
     public $killturn = 0;
 
-    public function __construct(int $nationID){
+    public function __construct(int $nationID, int $senderID){
         $db = DB::db();
         $nation = $db->queryFirstRow(
             'SELECT nation, `name`, `level`, capital, scout FROM nation WHERE nation=%i',
@@ -29,6 +30,7 @@ class Personnel{
             return;
         }
 
+        $this->senderID = $senderID;
         $this->nation = $nation;
         $this->valid = true;
 
@@ -179,12 +181,12 @@ class Personnel{
             $setValues['dedication'] = $db->sqleval('experience + %i', 100);//XXX: 상수
         }
 
-        if($me['npc'] < 2){
+        if($general['npc'] < 2){
             $setValues['killturn'] = $this->killturn;
         }
 
         $db->update('general', $setValues, 'no=%i', $generalID);
-        $db->update('general', $setSenderValues, 'no=%i', $this->src->generalID);
+        $db->update('general', $setSenderValues, 'no=%i', $this->senderID);
         $db->update('nation', $setOriginalNationValues, 'nation=%i', $general['nation']);
         $db->update('nation', $setScoutNationValues, 'nation=%i', $this->nation['nation']);
         if($setOriginalCityValues){
diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php
index a1e4bf09..f7fc1e1e 100644
--- a/hwe/sammo/ScoutMessage.php
+++ b/hwe/sammo/ScoutMessage.php
@@ -72,7 +72,7 @@ class ScoutMessage extends Message{
             return $result;
         }
 
-        $helper = new Engine\Personnel($this->src->nationID);
+        $helper = new Engine\Personnel($this->src->nationID, $this->src->senderID);
 
         list($result, $reason) = $helper->scoutGeneral($receiverID);
 
@@ -113,7 +113,7 @@ class ScoutMessage extends Message{
             self::MSGTYPE_PRIVATE, 
             $this->src, 
             $this->dest, 
-            "{$scoutNation['name']}(으)로 등용 제의 수락",
+            "{$this->src->nationName}(으)로 등용 제의 수락",
             new \DateTime(),
             new \DateTime('9999-12-31'),
             Json::encode([
@@ -134,7 +134,7 @@ class ScoutMessage extends Message{
             self::MSGTYPE_PRIVATE, 
             $this->src, 
             $this->dest, 
-            "{$scoutNation['name']}(으)로 등용 제의 거부",
+            "{$this->src->nationName}(으)로 등용 제의 거부",
             new \DateTime(),
             new \DateTime('9999-12-31'),
             Json::encode([
diff --git a/oauth_kakao/j_change_pw.php b/oauth_kakao/j_change_pw.php
index 8d7c5155..aa950fd8 100644
--- a/oauth_kakao/j_change_pw.php
+++ b/oauth_kakao/j_change_pw.php
@@ -74,8 +74,8 @@ $sendResult = $restAPI->talk_to_me_default([
   "object_type"=> "text",
   "text"=> "임시 비밀번호는 $newPassword 입니다. 로그인 후 바로 다른 비밀번호로 변경해주세요.",
   "link"=> [
-    "web_url"=> RootDB::getServerBasepath(),
-    "mobile_web_url" => RootDB::getServerBasepath()
+    "web_url"=> ServConfig::getServerBasepath(),
+    "mobile_web_url" => ServConfig::getServerBasepath()
   ],
   "button_title"=> "로그인 페이지 열기"
 ]);
diff --git a/oauth_kakao/oauth.php b/oauth_kakao/oauth.php
index cd358d33..5ddccb65 100644
--- a/oauth_kakao/oauth.php
+++ b/oauth_kakao/oauth.php
@@ -27,7 +27,7 @@ $result = $restAPI->create_access_token($auth_code);
 
 
 if (Util::array_get($result['expires_in'], -1) <= 0) {
-    die('알 수 없는 에러:'.$result['msg']);
+    die('알 수 없는 에러:'.Util::array_get($result['msg'], ''));
 }
 
 $session = Session::getInstance();
@@ -48,7 +48,7 @@ $oauth_mode = 'login';
 
 $me['code'] = Util::array_get($me['code'], 0);
 if($me['code']< 0){
-    switch($me['msg']){
+    switch(Util::array_get($me['msg'])){
     case 'NotRegisteredUserException':
         $oauth_mode = 'join';
         break;

From 9c3c1045acd343e32360f403844da116baad26d2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 20:29:33 +0900
Subject: [PATCH 171/184] =?UTF-8?q?=EC=A4=84=EA=B0=84=EA=B2=A9=20=EB=AC=B8?=
 =?UTF-8?q?=EC=A0=9C=20=ED=95=B4=EA=B2=B0(inline=EC=97=90=20line-height=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9=ED=95=B4=EC=A0=9C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/config.css         | 20 ++++----------------
 hwe/b_betting.php      |  8 ++++----
 hwe/b_tournament.php   |  6 +++---
 hwe/css/common.css     |  6 +++---
 i_other/help.php       |  4 ++--
 i_other/screenshot.php |  4 ++--
 6 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/css/config.css b/css/config.css
index e80690c4..a4cf8686 100644
--- a/css/config.css
+++ b/css/config.css
@@ -8,7 +8,7 @@ table   {
     font-size: 13px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕'; line-height: 110%;
+    font-family: '맑은 고딕';
 }
 th, td      {
     border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
@@ -16,7 +16,7 @@ th, td      {
     font-size: 13px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕'; line-height: 110%;
+    font-family: '맑은 고딕';
 }
 
 a.just_link {
@@ -53,19 +53,10 @@ div     {
     font-size: 13px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕'; line-height: 110%;
+    font-family: '맑은 고딕';;
 }
 
-font    { font-family: '맑은 고딕'; line-height: 110%; }
-/*
-input   {
-    width: 100px; height: 18px;
-    background-color: black; color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
-    line-height: 110%;
-}
-*/
+font    { font-family: '맑은 고딕';}
 
 .obj_fill{
     display:block;
@@ -77,14 +68,12 @@ button.with_skin {
     background-color: black; color: white;
     font-family: '맑은 고딕';
     font-size: 13px;
-    line-height: 110%;
 }
 
 input.with_skin   {
     background-color: black; color: white;
     font-family: '맑은 고딕';
     font-size: 13px;
-    line-height: 110%;
 }
 
 select  {
@@ -92,7 +81,6 @@ select  {
     background-color: black; color: white;
     font-family: '맑은 고딕';
     font-size: 13px;
-    line-height: 110%;
 }
 button  {
     width: 100px; height: 20px;
diff --git a/hwe/b_betting.php b/hwe/b_betting.php
index 5f6b37cf..0d224bd2 100644
--- a/hwe/b_betting.php
+++ b/hwe/b_betting.php
@@ -56,10 +56,10 @@ if($str3){
 <title><?=UniqueConst::$serverName?>: 베팅장</title>
 <style>
 body { color:white; background-color:black; border-width:1px; border-color:gray; }
-table { font-family:'맑은 고딕'; line-height:110%; }
-font { font-family:'맑은 고딕'; line-height:110%; }
-input { font-family:'맑은 고딕'; line-height:110%; height:20px }
-select { font-family:'굴림'; line-height:100%; }
+table { font-family:'맑은 고딕';}
+font { font-family:'맑은 고딕';}
+input { font-family:'맑은 고딕';height:20px }
+select { font-family:'굴림'; }
 #bg0 { background-image:url(<?=ServConfig::$gameImagePath?>/back_walnut.jpg); }
 #bg1 { background-image:url(<?=ServConfig::$gameImagePath?>/back_green.jpg); }
 #bg2 { background-image:url(<?=ServConfig::$gameImagePath?>/back_blue.jpg); }
diff --git a/hwe/b_tournament.php b/hwe/b_tournament.php
index 11cd5f66..aeee825b 100644
--- a/hwe/b_tournament.php
+++ b/hwe/b_tournament.php
@@ -46,9 +46,9 @@ case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "itl"; $tp2 = "
 <title><?=UniqueConst::$serverName?>: 토너먼트</title>
 <style>
 body { color:white; background-color:black; border-width:1px; border-color:gray; }
-table { font-family:'맑은 고딕'; line-height:110%; }
-font { font-family:'맑은 고딕'; line-height:110%; }
-input { font-family:'맑은 고딕'; line-height:110%; height:20px }
+table { font-family:'맑은 고딕'; }
+font { font-family:'맑은 고딕'; }
+input { font-family:'맑은 고딕'; height:20px }
 select { font-family:'굴림'; line-height:100%; }
 #bg0 { background-image:url(<?=ServConfig::$gameImagePath?>/back_walnut.jpg); }
 #bg1 { background-image:url(<?=ServConfig::$gameImagePath?>/back_green.jpg); }
diff --git a/hwe/css/common.css b/hwe/css/common.css
index 2ce59561..488dad05 100644
--- a/hwe/css/common.css
+++ b/hwe/css/common.css
@@ -5,9 +5,9 @@ html, body{
     color:white;
 }
 
-table { font-family:'맑은 고딕'; line-height:110%; }
-font { font-family:'맑은 고딕'; line-height:110%; }
-input { font-family:'맑은 고딕'; line-height:110%; height:20px }
+table { font-family:'맑은 고딕'; }
+font { font-family:'맑은 고딕'; }
+input { font-family:'맑은 고딕'; height:20px }
 select { font-family:'굴림'; line-height:100%; }
 
 /* */
diff --git a/i_other/help.php b/i_other/help.php
index 02d337e4..68ca000e 100644
--- a/i_other/help.php
+++ b/i_other/help.php
@@ -17,8 +17,8 @@ $category = Util::getReq('category', 'int', 0);
 <style type="text/css">
 
 body { color:white; background-color:black; border-width:1px; border-color:gray; }
-table { font-family:'맑은 고딕'; line-height:110%; }
-font { font-family:'맑은 고딕'; line-height:110%; }
+table { font-family:'맑은 고딕'; }
+font { font-family:'맑은 고딕'; }
 #bg0 { background-image:url(<?=ServConfig::$gameImagePath?>/back_walnut.jpg); }
 #bg1 { background-image:url(<?=ServConfig::$gameImagePath?>/back_blue.jpg); }
 #bg2 { background-image:url(<?=ServConfig::$gameImagePath?>/back_green.jpg); }
diff --git a/i_other/screenshot.php b/i_other/screenshot.php
index cd33c28d..29a2b41b 100644
--- a/i_other/screenshot.php
+++ b/i_other/screenshot.php
@@ -15,8 +15,8 @@ if($sel == 0) $sel = 1;
 
 <style type="text/css">
 body { color:white; background-color:black; border-width:1px; border-color:gray; }
-table { font-family:'맑은 고딕'; line-height:110%; }
-font { font-family:'맑은 고딕'; line-height:110%; }
+table { font-family:'맑은 고딕'; }
+font { font-family:'맑은 고딕'; }
 #bg0 { background-image:url(<?=ServConfig::$gameImagePath?>/back_walnut.jpg); }
 #bg1 { background-image:url(<?=ServConfig::$gameImagePath?>/back_blue.jpg); }
 #bg2 { background-image:url(<?=ServConfig::$gameImagePath?>/back_green.jpg); }

From 5262d424b4e204b08ce8acd9b0f4fd00e83c369d Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 20:38:19 +0900
Subject: [PATCH 172/184] =?UTF-8?q?=EB=B0=A9=EB=9E=91=EC=9D=98=20=EC=A0=9C?=
 =?UTF-8?q?=ED=95=9C=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hwe/func.php b/hwe/func.php
index f1326a77..20969d22 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -644,7 +644,13 @@ function commandTable() {
     if($me['level'] == 12) {
         addCommand("선양", 54);
         if($citycount != 0) {
-            addCommand("방랑", 47);
+            if ($admin['year'] + 3 < $admin['startyear']) {
+                addCommand("방랑", 47, 0);
+            }
+            else{
+                addCommand("방랑", 47);
+            }
+            
             addCommand("해산", 56, 0);
         } else {
             addCommand("방랑", 47, 0);

From 170a32a1bdba609314a52d4274f8bdf79bcdcf3e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 20:49:38 +0900
Subject: [PATCH 173/184] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EB=A9=94?=
 =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EC=86=A1=EC=8B=A0=EC=9D=B4=20=EC=9D=B4?=
 =?UTF-8?q?=EC=83=81=ED=95=9C=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0.?=
 =?UTF-8?q?=20=EC=9D=B8=EC=82=AC=EB=B6=80=20'=EA=B3=B5=EC=84=9D'=20?=
 =?UTF-8?q?=EC=A7=80=EC=A0=95=20=EA=B0=80=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/c_myBossInfo.php       | 19 +++++++++++--------
 hwe/sammo/ScoutMessage.php | 10 +++++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/hwe/c_myBossInfo.php b/hwe/c_myBossInfo.php
index f56dba4f..f8c352bf 100644
--- a/hwe/c_myBossInfo.php
+++ b/hwe/c_myBossInfo.php
@@ -41,17 +41,20 @@ if($meLevel < 5){
 
 
 if($btn == "임명") {
-    $query = "select no,nation,level,leader,power,intel from general where no='$genlist'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
+    if($genlist !== 0){
+        $query = "select no,nation,level,leader,power,intel from general where no='$genlist'";
+        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $general = MYDB_fetch_array($result);
 
-    if(!$general){
-        header('location:b_myBossInfo.php');
-        exit();
+        if(!$general){
+            header('location:b_myBossInfo.php');
+            exit();
+        }
     }
+        
 
     //임명할사람이 군주이면 불가, 내가 수뇌부이어야함, 공석아닌때는 국가가 같아야함
-    if($general['level'] == 12 || $meLevel < 5 || ($general['nation'] != $me['nation'] && $genlist != 0)) {
+    if($meLevel < 5 || ($general['nation'] != $me['nation'] && $genlist != 0) || ($general['level'] == 12 && $genlist != 0)) {
         
         header('location:b_myBossInfo.php');
         exit();
@@ -74,7 +77,7 @@ if($btn == "임명") {
 }
 
 //나와 대상 장수는 국가가 같아야 함
-if($me['nation'] != $general['nation']){
+if($genlist != 0 && $me['nation'] != $general['nation']){
     header('location:b_myBossInfo.php');
     exit();
 }
diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php
index f7fc1e1e..56298cbd 100644
--- a/hwe/sammo/ScoutMessage.php
+++ b/hwe/sammo/ScoutMessage.php
@@ -72,7 +72,7 @@ class ScoutMessage extends Message{
             return $result;
         }
 
-        $helper = new Engine\Personnel($this->src->nationID, $this->src->senderID);
+        $helper = new Engine\Personnel($this->src->nationID, $this->src->generalID);
 
         list($result, $reason) = $helper->scoutGeneral($receiverID);
 
@@ -116,9 +116,9 @@ class ScoutMessage extends Message{
             "{$this->src->nationName}(으)로 등용 제의 수락",
             new \DateTime(),
             new \DateTime('9999-12-31'),
-            Json::encode([
+            [
                 'delete'=>$this->id
-            ])
+            ]
         );
         $newMsg->send(true);
 
@@ -137,9 +137,9 @@ class ScoutMessage extends Message{
             "{$this->src->nationName}(으)로 등용 제의 거부",
             new \DateTime(),
             new \DateTime('9999-12-31'),
-            Json::encode([
+            [
                 'delete'=>$this->id
-            ])
+            ]
         );
         $newMsg->send(true);
 

From 805053e921e284359d0bc60619d9583c36b84304 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 21:04:55 +0900
Subject: [PATCH 174/184] =?UTF-8?q?NPC=20=ED=8F=AC=EC=83=81=20=EC=9E=98=20?=
 =?UTF-8?q?=EC=95=88=EC=A3=BC=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=9A=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EC=8B=9C=EB=8F=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_npc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/func_npc.php b/hwe/func_npc.php
index 935464a8..1ca72088 100644
--- a/hwe/func_npc.php
+++ b/hwe/func_npc.php
@@ -642,7 +642,7 @@ function processAI($no) {
                             $general['nation'],
                             $general['no'],
                             $type,
-                            $type==='gold'?21000:3000,
+                            ($type=='gold')?21000:3000,
                             $type
                         );
 

From 8a5483d5084ac9b74c2aa57fa059fe6a61beda46 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 21:52:14 +0900
Subject: [PATCH 175/184] =?UTF-8?q?=EC=97=B0=EA=B0=90=20=EB=B2=8C=EC=A0=90?=
 =?UTF-8?q?=20=EA=B0=90=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/a_history.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwe/a_history.php b/hwe/a_history.php
index 90fc8e17..375257f8 100644
--- a/hwe/a_history.php
+++ b/hwe/a_history.php
@@ -15,7 +15,7 @@ $userID = Session::getUserID();
 $db = DB::db();
 $connect=$db->get();
 
-increaseRefresh("연감", 5);
+increaseRefresh("연감", 2);
 
 $query = "select startyear,year,month,conlimit from game limit 1";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");

From dd7846e995838a90fb8f9cdd87da9ba13e22735b Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 22:01:58 +0900
Subject: [PATCH 176/184] =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=A0=80=EC=9E=A5?=
 =?UTF-8?q?=EC=9A=A9=20key=5Fvalue=20storage=20=EC=B6=94=EA=B0=80.=20=20RO?=
 =?UTF-8?q?W=5FFORMAT=3DDYNAMIC=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 f_install/sql/common_schema.sql | 10 ++++++++++
 hwe/sql/schema.sql              | 18 +++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/f_install/sql/common_schema.sql b/f_install/sql/common_schema.sql
index 75844246..52b5a75b 100644
--- a/f_install/sql/common_schema.sql
+++ b/f_install/sql/common_schema.sql
@@ -2,6 +2,7 @@
 DROP TABLE IF EXISTS `system`;
 DROP TABLE IF EXISTS `member`;
 DROP TABLE IF EXISTS `member_log`;
+DROP TABLE IF EXISTS `config`;
 
 -- 시스템 테이블
 -- TODO:장기적으로는 key-value(json) storage 형태로 바꾸는게 나을 듯.
@@ -54,4 +55,13 @@ CREATE TABLE `member_log` (
 	INDEX `action` (`member_no`, `action_type`, `date`),
 	INDEX `member` (`member_no`, `date`)
 )
+ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `config` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`key` VARCHAR(50) NOT NULL,
+	`value` VARCHAR(100) NULL DEFAULT NULL,
+	PRIMARY KEY (`id`),
+	UNIQUE INDEX `key` (`key`)
+)
 ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
\ No newline at end of file
diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index 0ecc986a..7ecd0e54 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -272,7 +272,7 @@ create table nation (
   l8turn11 char(14) default '00000000000099', l7turn11 char(14) default '00000000000099', l6turn11 char(14) default '00000000000099', l5turn11 char(14) default '00000000000099',
 
   PRIMARY KEY (nation)
-) ENGINE=MyISAM ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
 ###########################################################################
 ## 도시 테이블
@@ -315,7 +315,7 @@ create table city (
 
   PRIMARY KEY (city),
   KEY (nation)
-) ENGINE=MyISAM ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
 ###########################################################################
 ## 부대 테이블
@@ -328,7 +328,7 @@ create table troop (
   no int(6) not null,
 
   PRIMARY KEY (troop)
-) ENGINE=INNODB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4;
 
 ##########################################################################
 ##  락 테이블
@@ -339,7 +339,7 @@ create table plock (
   plock       int(1) default 0,
 
   PRIMARY KEY (no)
-  ) ENGINE=INNODB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
+  ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4;
 
 ##########################################################################
 ## 게임 테이블
@@ -404,7 +404,7 @@ CREATE TABLE `game` (
 	`bet14` INT(8) NULL DEFAULT '0',
 	`bet15` INT(8) NULL DEFAULT '0',
 	PRIMARY KEY (`no`)
-) ENGINE=MyISAM ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
 ###########################################################################
 ## 메시지 테이블
@@ -439,7 +439,7 @@ create table if not exists hall (
 
   PRIMARY KEY (no),
   UNIQUE INDEX `type` (`type`, `rank`)
-  ) ENGINE=INNODB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
+  ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4;
 
 ###########################################################################
 ## 왕조 테이블
@@ -520,7 +520,7 @@ create table diplomacy (
 
   PRIMARY KEY (`no`),
   UNIQUE INDEX `me` (`me`, `you`)
-  ) ENGINE=INNODB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
+  ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4;
 
 ###########################################################################
 ## 토너먼트 테이블
@@ -545,7 +545,7 @@ create table tournament (
   gl   int(2) default 0,
   prmt int(1) default 0,
   PRIMARY KEY (seq)
-  ) ENGINE=INNODB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
+  ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4;
 
 ###########################################################################
 ## 거래 테이블
@@ -565,7 +565,7 @@ create table auction (
   expire datetime,
 
   PRIMARY KEY (no)
-  ) ENGINE=INNODB ROW_FORMAT=DYNAMIC DEFAULT CHARSET=utf8mb4;
+  ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4;
 
 ###########################################################################
 ## 통계 테이블

From 657c35f8768b5b6615429da84a4f3d3a044b59af Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 23:36:35 +0900
Subject: [PATCH 177/184] =?UTF-8?q?git=20tree=20=EC=A7=80=EC=A0=95?=
 =?UTF-8?q?=EC=9D=B4=20=EC=95=88=EB=90=98=EB=8A=94=20=EC=97=85=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20=EC=9C=A0=EC=A0=80=EB=8A=94=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A1=B4=EC=97=90=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?=
 =?UTF-8?q?=EB=90=9C=20=EA=B0=92=EC=9D=84=20=EC=9D=B4=EC=9A=A9=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 j_updateServer.php | 42 ++++++++++++++++++++++++++++--------------
 js/admin_server.js |  2 +-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/j_updateServer.php b/j_updateServer.php
index 76115a2e..5d483b09 100644
--- a/j_updateServer.php
+++ b/j_updateServer.php
@@ -19,7 +19,7 @@ function getVersion($target=null){
 }
 
 $session = Session::requireLogin(null)->setReadOnly();
-if($session->userGrade < 6){
+if($session->userGrade < 5){
     Json::die([
         'result'=>false,
         'reason'=>'권한이 충분하지 않습니다'
@@ -28,12 +28,13 @@ if($session->userGrade < 6){
 
 $request = $_POST + $_GET;
 
+$rootDB = RootDB::db();
 $tmpFile = 'd_log/arc.zip';
 
 $v = new Validator($request);
+
 $v->rule('required', [
-    'server',
-    'target'
+    'server'
 ])->rule('regex', 'target', '/^[0-9a-zA-Z^{}\\/\-_,.@]+$/');
 
 if(!$v->validate()){
@@ -43,8 +44,26 @@ if(!$v->validate()){
     ]);
 }
 
+$target = Util::getReq('target');
+
 $server = basename($request['server']);
-$target = $request['target'];
+if($session->userGrade <= 5 || !$target){
+    $target = Json::decode($rootDB->queryFirstField('SELECT `key`=%s FROM `config`', "git_path_$server"));
+    if($target){
+        $target = $target[0];
+    }
+}
+else{
+    $target = $request['target'];
+}
+
+if(!$target){
+    Json::die([
+        'result'=>false,
+        'reason'=>'git -ish target이 제대로 지정되지 않았습니다.'
+    ]);
+}
+
 
 $baseServerName = Util::array_last_key(AppConf::getList());
 
@@ -99,8 +118,6 @@ if($server == $baseServerName){
         ], true
     );
 
-    //AppConf::getList()[$server]->closeServer();
-
     Json::die([
         'server'=>$server,
         'result'=>true,
@@ -109,13 +126,6 @@ if($server == $baseServerName){
 
 }
 
-exec("git fetch 2>&1", $output);
-if($output){
-    Json::die([
-        'result'=>false,
-        'reason'=>'git fetch 작업 : '.join(', ', $output)
-    ]);
-}
 $command = sprintf('git archive --format=zip -o %s %s', escapeshellarg($tmpFile), escapeshellarg($targetDir));
 exec("$command 2>&1", $output);
 if($output){
@@ -143,7 +153,7 @@ if(!$zip->extractTo($server)){
 $zip->close();
 @unlink($tmpFile);
 
-$version = getVersion();
+$version = getVersion($target);
 $result = Util::generateFileUsingSimpleTemplate(
     __DIR__.'/'.$server.'/d_setting/VersionGit.orig.php',
     __DIR__.'/'.$server.'/d_setting/VersionGit.php',[
@@ -151,6 +161,10 @@ $result = Util::generateFileUsingSimpleTemplate(
     ], true
 );
 
+$rootDB->insertUpdate('config', [
+    "key" => "git_path_$server",
+    "value" =>Json::encode([$target, $version])
+]);
 
 //AppConf::getList()[$server]->closeServer();
 
diff --git a/js/admin_server.js b/js/admin_server.js
index 459aa279..e8ab64cc 100644
--- a/js/admin_server.js
+++ b/js/admin_server.js
@@ -20,7 +20,7 @@ function serverUpdate(caller){
     var server = $tr.data('server_name');
     var isRoot = $tr.data('is_root');
 
-    var target = 'master';
+    var target = 'origin/master';
 
     if(typeof isRoot !== 'boolean'){
         isRoot = (isRoot != 'false');

From e97e702c2ec66ccffa05f147ebb892959455bcfd Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 23:55:22 +0900
Subject: [PATCH 178/184] =?UTF-8?q?=EA=B0=80=EC=83=81=20=EB=AA=A8=EB=93=9C?=
 =?UTF-8?q?=20=EB=8C=80=EC=9D=91.=20=EB=9E=9C=EB=8D=A4=20=ED=8A=B9?=
 =?UTF-8?q?=EC=84=B1=20=EC=84=B8=ED=8C=85=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Scenario/NPC.php | 58 +++++++++++++++++++++++++++++---------
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/hwe/sammo/Scenario/NPC.php b/hwe/sammo/Scenario/NPC.php
index 84bc208b..1a587779 100644
--- a/hwe/sammo/Scenario/NPC.php
+++ b/hwe/sammo/Scenario/NPC.php
@@ -53,16 +53,37 @@ class NPC{
         $this->ego = $ego;
         $this->text = $text;
 
-        $char = \sammo\SpecCall($char);
-        if($char < 40){
-            $this->charDomestic = $char;
+        $general = [
+            'leader'=>$leadership,
+            'power'=>$power,
+            'intel'=>$intel
+        ];
+
+        if($char === '랜덤전특'){
+            $this->charWar = \sammo\Engine\SpecialityConst::pickSpecialWar($general);
+        }
+        else if($char === '랜덤내특'){
+            $this->charDomestic = \sammo\Engine\SpecialityConst::pickSpecialDomestic($general);
+        }
+        else if($char === '랜덤'){
+            if(Util::randBool(2/3)){
+                $this->charWar = \sammo\Engine\SpecialityConst::pickSpecialWar($general);
+            }
+            else{
+                $this->charDomestic = \sammo\Engine\SpecialityConst::pickSpecialDomestic($general);
+            }
         }
         else{
-            $this->charWar = $char;
-        }
+            $char = \sammo\SpecCall($char);
+            if($char < 40){
+                $this->charDomestic = $char;
+            }
+            else{
+                $this->charWar = $char;
+            }
+        }  
     }
 
-
     public function build($env=[]){
         //scenario에 life==1인 경우 수명 제한이 없어지는 모양.
         $nationID = $this->nationID;
@@ -70,10 +91,7 @@ class NPC{
             $nationID = 0;
         };
 
-        $affinity = $this->affinity;
-        if(Util::array_get($env['fiction'],false) || $affinity === 0){
-            $affinity = mt_rand(1, 150);
-        }
+        $isFictionMode = (Util::array_get($env['fiction'], 0)!=0);
 
         $year = $env['year'];
         $month = $env['month'];
@@ -93,13 +111,27 @@ class NPC{
             \sammo\pushWorldHistory(["<C>●</>1월:<Y>$name</>(이)가 성인이 되어 <S>등장</>했습니다."], $year, $month);
         }
 
-        if($this->ego == null){
+        if($this->ego == null || $isFictionMode){
             $ego = mt_rand(0, 9);//TODO: 나중에 성격을 따로 분리할 경우 클래스를 참조.
         }
         else{
             $ego = \sammo\CharCall($this->ego);
         }
         
+        $affinity = $this->affinity;
+
+        $charWar = $this->charWar;
+        $charDomestic = $this->charDomestic;
+
+        if($affinity === 0 || $isFictionMode){
+            $affinity = mt_rand(1, 150);
+        }
+
+        if($isFictionMode){
+            $charWar = 0;
+            $charDomestic = 0;
+        }
+
         $name = 'ⓝ'.$this->name;
 
         $pictureID = $this->pictureID;
@@ -167,9 +199,9 @@ class NPC{
             'age'=>$age,
             'belong'=>1,
             'personal'=>$ego,
-            'special'=>$this->charDomestic,
+            'special'=>$charDomestic,
             'specage'=>$specage,
-            'special2'=>$this->charWar,
+            'special2'=>$charWar,
             'specage2'=>$specage2,
             'npcmsg'=>$this->text,
             'makelimit'=>0,

From 63e888c9b1d2381a9981901b905c855041d91d8a Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 29 Apr 2018 00:28:06 +0900
Subject: [PATCH 179/184] =?UTF-8?q?=ED=8A=B9=EC=84=B1=EC=97=90=20'?=
 =?UTF-8?q?=EB=9E=9C=EB=8D=A4',=20'=EB=9E=9C=EB=8D=A4=EC=A0=84=ED=8A=B9',?=
 =?UTF-8?q?=20'=EB=9E=9C=EC=A0=90=EB=82=B4=ED=8A=B9'=20=EA=B0=80=EB=8A=A5.?=
 =?UTF-8?q?=200=EC=9C=BC=EB=A1=9C=20=EC=A7=80=EC=A0=95=20=EA=B0=80?=
 =?UTF-8?q?=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Scenario/NPC.php    |   8 +-
 hwe/sammo/SpecialityConst.php | 139 +++++++++++++++++++++++-----------
 2 files changed, 97 insertions(+), 50 deletions(-)

diff --git a/hwe/sammo/Scenario/NPC.php b/hwe/sammo/Scenario/NPC.php
index 1a587779..2508bd9a 100644
--- a/hwe/sammo/Scenario/NPC.php
+++ b/hwe/sammo/Scenario/NPC.php
@@ -60,17 +60,17 @@ class NPC{
         ];
 
         if($char === '랜덤전특'){
-            $this->charWar = \sammo\Engine\SpecialityConst::pickSpecialWar($general);
+            $this->charWar = \sammo\SpecialityConst::pickSpecialWar($general);
         }
         else if($char === '랜덤내특'){
-            $this->charDomestic = \sammo\Engine\SpecialityConst::pickSpecialDomestic($general);
+            $this->charDomestic = \sammo\SpecialityConst::pickSpecialDomestic($general);
         }
         else if($char === '랜덤'){
             if(Util::randBool(2/3)){
-                $this->charWar = \sammo\Engine\SpecialityConst::pickSpecialWar($general);
+                $this->charWar = \sammo\SpecialityConst::pickSpecialWar($general);
             }
             else{
-                $this->charDomestic = \sammo\Engine\SpecialityConst::pickSpecialDomestic($general);
+                $this->charDomestic = \sammo\SpecialityConst::pickSpecialDomestic($general);
             }
         }
         else{
diff --git a/hwe/sammo/SpecialityConst.php b/hwe/sammo/SpecialityConst.php
index 8d1913b7..6fea7a21 100644
--- a/hwe/sammo/SpecialityConst.php
+++ b/hwe/sammo/SpecialityConst.php
@@ -26,45 +26,58 @@ class SpecialityConst{
 
     //음수 : 절대값 %, 양수 : 상대적 비중
     const DOMESTIC = [
-        1 => ['경작', 1, self::STAT_INTEL],
-        2 => ['상재', 1, self::STAT_INTEL],
-        3 => ['발명', 1, self::STAT_INTEL],
+        1 => ['경작', 1, [self::STAT_INTEL]],
+        2 => ['상재', 1, [self::STAT_INTEL]],
+        3 => ['발명', 1, [self::STAT_INTEL]],
 
-        10 => ['축성', 1, self::STAT_POWER],
-        11 => ['수비', 1, self::STAT_POWER],
-        12 => ['통찰', 1, self::STAT_POWER],
+        10 => ['축성', 1, [self::STAT_POWER]],
+        11 => ['수비', 1, [self::STAT_POWER]],
+        12 => ['통찰', 1, [self::STAT_POWER]],
 
-        20 => ['인덕', 1, self::STAT_LEADERSHIP],
+        20 => ['인덕', 1, [self::STAT_LEADERSHIP]],
 
-        30 => ['거상', -2.5, self::DISABLED],
-        31 => ['귀모', -2.5, self::STAT_LEADERSHIP | self::STAT_POWER | self::STAT_INTEL],
+        30 => ['거상', -2.5, [self::DISABLED]],
+        31 => ['귀모', -2.5, [self::STAT_LEADERSHIP, self::STAT_POWER, self::STAT_INTEL]],
     ];
 
     const WAR = [
-        40 => ['귀병', 1, self::STAT_INTEL | self::ARMY_WIZARD | self::REQ_DEXTERITY],
+        40 => ['귀병', 1, [self::STAT_INTEL | self::ARMY_WIZARD | self::REQ_DEXTERITY]],
 
-        41 => ['신산', 1, self::STAT_INTEL | self::ARMY_WIZARD],
-        42 => ['환술', -5, self::STAT_INTEL | self::ARMY_WIZARD],
-        43 => ['집중', 1, self::STAT_INTEL | self::ARMY_WIZARD],
-        44 => ['신중', 1, self::STAT_INTEL | self::ARMY_WIZARD],
-        45 => ['반계', 1, self::STAT_INTEL | self::ARMY_WIZARD],
+        41 => ['신산', 1, [self::STAT_INTEL]],
+        42 => ['환술', -5, [self::STAT_INTEL]],
+        43 => ['집중', 1, [self::STAT_INTEL]],
+        44 => ['신중', 1, [self::STAT_INTEL]],
+        45 => ['반계', 1, [self::STAT_INTEL]],
 
-        50 => ['보병', 1, self::STAT_LEADERSHIP | self::STAT_POWER | self::REQ_DEXTERITY | self::ARMY_FOOTMAN],
-        51 => ['궁병', 1, self::STAT_LEADERSHIP | self::STAT_POWER | self::REQ_DEXTERITY | self::ARMY_ARCHER],
-        52 => ['기병', 1, self::STAT_LEADERSHIP | self::STAT_POWER | self::REQ_DEXTERITY | self::ARMY_CAVALRY],
-        53 => ['공성', 1, self::STAT_LEADERSHIP | self::STAT_POWER | self::REQ_DEXTERITY | self::ARMY_SIEGE],
+        50 => ['보병', 1, [
+            self::STAT_LEADERSHIP | self::REQ_DEXTERITY | self::ARMY_FOOTMAN,
+            self::STAT_POWER | self::REQ_DEXTERITY | self::ARMY_FOOTMAN
+        ]],
+        51 => ['궁병', 1, [
+            self::STAT_LEADERSHIP | self::REQ_DEXTERITY | self::ARMY_ARCHER,
+            self::STAT_POWER | self::REQ_DEXTERITY | self::ARMY_ARCHER
+            ]],
+        52 => ['기병', 1, [
+            self::STAT_LEADERSHIP | self::REQ_DEXTERITY | self::ARMY_CAVALRY,
+            self::STAT_POWER | self::REQ_DEXTERITY | self::ARMY_CAVALRY
+        ]],
+        53 => ['공성', 1, [
+            self::STAT_LEADERSHIP | self::REQ_DEXTERITY | self::ARMY_SIEGE,
+            self::STAT_POWER | self::REQ_DEXTERITY | self::ARMY_SIEGE,
+            self::STAT_INTEL | self::REQ_DEXTERITY | self::ARMY_SIEGE
+        ]],
 
-        60 => ['돌격', 1, self::STAT_LEADERSHIP | self::STAT_POWER],
-        61 => ['무쌍', 1, self::STAT_LEADERSHIP | self::STAT_POWER],
-        62 => ['견고', 1, self::STAT_LEADERSHIP | self::STAT_POWER],
-        63 => ['위압', 1, self::STAT_LEADERSHIP | self::STAT_POWER],
+        60 => ['돌격', 1, [self::STAT_LEADERSHIP, self::STAT_POWER]],
+        61 => ['무쌍', 1, [self::STAT_LEADERSHIP, self::STAT_POWER]],
+        62 => ['견고', 1, [self::STAT_LEADERSHIP, self::STAT_POWER]],
+        63 => ['위압', 1, [self::STAT_LEADERSHIP, self::STAT_POWER]],
 
-        70 => ['저격', 1, self::STAT_LEADERSHIP | self::STAT_POWER | self::STAT_INTEL],
-        71 => ['필살', 1, self::STAT_LEADERSHIP | self::STAT_POWER | self::STAT_INTEL],
-        72 => ['징병', 1, self::STAT_LEADERSHIP | self::STAT_POWER | self::STAT_INTEL],
-        73 => ['의술', -2, self::STAT_LEADERSHIP | self::STAT_POWER | self::STAT_INTEL],
-        74 => ['격노', 1, self::STAT_LEADERSHIP | self::STAT_POWER | self::STAT_INTEL],
-        75 => ['척사', 1, self::STAT_LEADERSHIP | self::STAT_POWER | self::STAT_INTEL],
+        70 => ['저격', 1, [self::STAT_LEADERSHIP, self::STAT_POWER, self::STAT_INTEL]],
+        71 => ['필살', 1, [self::STAT_LEADERSHIP, self::STAT_POWER, self::STAT_INTEL]],
+        72 => ['징병', 1, [self::STAT_LEADERSHIP, self::STAT_POWER, self::STAT_INTEL]],
+        73 => ['의술', -2, [self::STAT_LEADERSHIP, self::STAT_POWER, self::STAT_INTEL]],
+        74 => ['격노', 1, [self::STAT_LEADERSHIP, self::STAT_POWER, self::STAT_INTEL]],
+        75 => ['척사', 1, [self::STAT_LEADERSHIP, self::STAT_POWER, self::STAT_INTEL]],
     ];
 
     public static function getInvDomestic(string $name){
@@ -101,15 +114,19 @@ class SpecialityConst{
 
     private static function calcCondGeneric(array $general) : int {
         $myCond = 0;
+
+        $leader = $general['leader']??50;
+        $power = $general['power']??50;
+        $intel = $general['intel']??50;
         
         if ($leader * 0.95 > $power && $leader * 0.95 > $intel) {
-            $myCond |= STAT_LEADERSHIP;
+            $myCond |= self::STAT_LEADERSHIP;
         }
         else if($power >= $intel){
-            $myCond |= STAT_POWER;
+            $myCond |= self::STAT_POWER;
         }
         else {
-            $myCond |= STAT_INTEL;
+            $myCond |= self::STAT_INTEL;
         }
 
         return $myCond;
@@ -117,11 +134,11 @@ class SpecialityConst{
 
     private static function calcCondDexterity(array $general) : int {
         $dex = [
-            static::ARMY_FOOTMAN => $general['dex0'],
-            static::ARMY_ARCHER => $general['dex10'],
-            static::ARMY_CAVALRY => $general['dex20'],
-            static::ARMY_WIZARD => $general['dex30'],
-            static::ARMY_SIEGE => $general['dex40'],
+            static::ARMY_FOOTMAN => $general['dex0']??0,
+            static::ARMY_ARCHER => $general['dex10']??0,
+            static::ARMY_CAVALRY => $general['dex20']??0,
+            static::ARMY_WIZARD => $general['dex30']??0,
+            static::ARMY_SIEGE => $general['dex40']??0,
         ];
 
         $dexSum = array_sum($dex);
@@ -135,7 +152,7 @@ class SpecialityConst{
             return 0;
         }
 
-        if($dexSum){
+        if(!$dexSum){
             return array_rand($dex);
         }
 
@@ -148,10 +165,18 @@ class SpecialityConst{
 
         $myCond = static::calcCondGeneric($general);
 
-        foreach(self::DOMESTIC as $id=>list($name, $weight, $cond)){
-            if(!($cond & $myCond)){
+        foreach(self::DOMESTIC as $id=>list($name, $weight, $conds)){
+            $valid = false;
+            foreach($conds as $cond){
+                if($cond === ($cond & $myCond)){
+                    $valid = true;
+                    break;
+                }
+            }
+            if(!$valid){
                 continue;
             }
+            
 
             if($weight < 0){
                 $pAbs[$id] = -$weight;
@@ -162,14 +187,21 @@ class SpecialityConst{
         }
         
         if($pAbs){
-            $pAbs[0] = max(0, 100 - array_sum($pAbs));
+            if($pRel){
+                $pAbs[0] = max(0, 100 - array_sum($pAbs));
+            }
             $id = Util::choiceRandomUsingWeight($pAbs);
             if($id){
                 return $id;
             }
         }
 
-        return Util::choiceRandomUsingWeight($pRel);
+        $id = Util::choiceRandomUsingWeight($pRel);
+        if($id){
+            return $id;
+        }
+
+        return static::pickStatickWar($general);
     }
 
     public static function pickSpecialWar(array $general) : int{
@@ -180,8 +212,15 @@ class SpecialityConst{
         $myCond = static::calcCondGeneric($general);
         $myCond |= static::calcCondDexterity($general);
 
-        foreach(self::WAR as $id=>list($name, $weight, $cond)){
-            if(!($cond & $myCond)){
+        foreach(self::WAR as $id=>list($name, $weight, $conds)){
+            $valid = false;
+            foreach($conds as $cond){
+                if($cond === ($cond & $myCond)){
+                    $valid = true;
+                    break;
+                }
+            }
+            if(!$valid){
                 continue;
             }
 
@@ -201,13 +240,21 @@ class SpecialityConst{
         }
 
         if($pAbs){
-            $pAbs[0] = max(0, 100 - array_sum($pAbs));
+            if($pRel){
+                $pAbs[0] = max(0, 100 - array_sum($pAbs));
+            }
+            
             $id = Util::choiceRandomUsingWeight($pAbs);
             if($id){
                 return $id;
             }
         }
 
-        return Util::choiceRandomUsingWeight($pRel);
+        $id = Util::choiceRandomUsingWeight($pRel);
+        if($id){
+            return $id;
+        }
+
+        return static::pickStatickWar($general);
     }
 }
\ No newline at end of file

From 5f3fbdb0892fe7cf4bc01790c6840e6114dba1ca Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 29 Apr 2018 00:45:12 +0900
Subject: [PATCH 180/184] =?UTF-8?q?KBO=20=EC=98=AC=EC=8A=A4=ED=83=80?=
 =?UTF-8?q?=EC=A0=84=20=EB=A6=AC=EB=89=B4=EC=96=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/scenario/scenario_30.json | 625 +++++++++++++++++++---------------
 1 file changed, 352 insertions(+), 273 deletions(-)

diff --git a/hwe/scenario/scenario_30.json b/hwe/scenario/scenario_30.json
index 28ce7e70..00d587b3 100644
--- a/hwe/scenario/scenario_30.json
+++ b/hwe/scenario/scenario_30.json
@@ -7,279 +7,357 @@
     "diplomacy":[
     ],
     "general":[
-        [108, "김일융", -1, 0, null, 88, 83, 79, 0, 160, 300, "패권", null],
-[16, "이승엽", -1, 0, null, 90, 108, 37, 0, 160, 300, "재간", null, "안녕하세요 국민타자 이승엽입니다."],
-[2, "마해영", -1, 0, null, 84, 84, 22, 0, 160, 300, "왕좌", null],
-[84, "채태인", -1, 0, null, 86, 54, 15, 0, 160, 300, "유지", null, "신대륙은 어디에…"],
-[142, "김성래", -1, 0, null, 75, 86, 19, 0, 160, 300, "대의", null],
-[15, "강기웅", -1, 0, null, 82, 61, 83, 0, 160, 300, "의협", null],
-[46, "나바로", -1, 0, null, 82, 85, 79, 0, 160, 300, "할거", null],
-[141, "김한수", -1, 0, null, 80, 82, 48, 0, 160, 300, "유지", null],
-[135, "조동찬", -1, 0, null, 55, 68, 75, 0, 160, 300, "대의", null],
-[133, "류중일", -1, 0, null, 68, 34, 78, 0, 160, 300, "출세", null, "내 아들 상수야…"],
-[99, "김상수", -1, 0, null, 68, 21, 80, 0, 160, 300, "안전", null, "예 아부지…"],
-[71, "박진만", -1, 0, null, 72, 78, 69, 0, 160, 300, "대의", null],
-[14, "양준혁", -1, 0, null, 97, 98, 91, 0, 160, 300, "재간", null, "내보다 강미노가 머리 더 큰데?"],
-[110, "박한이", -1, 0, null, 83, 77, 79, 0, 160, 300, "왕좌", null, "킁킁"],
-[72, "최형우", -1, 0, null, 87, 86, 20, 0, 160, 300, "유지", null],
-[34, "장효조", -1, 0, null, 95, 39, 68, 0, 160, 300, "재간", null],
-[26, "동봉철", -1, 0, null, 65, 41, 74, 0, 160, 300, "대의", null],
-[94, "강동우", -1, 0, null, 67, 53, 79, 0, 160, 300, "재간", null],
-[51, "신동주", -1, 0, null, 68, 71, 76, 0, 160, 300, "대의", null],
-[117, "이만수", -1, 0, null, 89, 97, 49, 0, 160, 300, "대의", null],
-[133, "진갑용", -1, 0, null, 74, 80, 15, 0, 160, 300, "할거", null],
-[138, "김시진", -1, 0, null, 84, 88, 75, 0, 160, 300, "출세", null],
-[122, "배영수", -1, 0, null, 79, 86, 87, 0, 160, 300, "할거", null],
-[49, "윤성환", -1, 0, null, 74, 86, 87, 0, 160, 300, "패권", null],
-[96, "안지만", -1, 0, null, 69, 79, 75, 0, 160, 300, "의협", null],
-[31, "김현욱", -1, 0, null, 82, 85, 84, 0, 160, 300, "패권", null],
-[147, "정현욱", -1, 0, null, 74, 83, 77, 0, 160, 300, "안전", null],
-[112, "권혁", -1, 0, null, 75, 86, 62, 0, 160, 300, "출세", null],
-[59, "임창용", -1, 0, null, 83, 86, 80, 0, 160, 300, "재간", null],
-[59, "오승환", -1, 0, null, 97, 92, 89, 0, 160, 300, "할거", null],
-[11, "권영호", -1, 0, null, 83, 53, 76, 0, 160, 300, "출세", null],
-[42, "이선희", -1, 0, null, 83, 49, 74, 0, 160, 300, "패권", null],
-[105, "공필성", -1, 0, null, 46, 47, 77, 0, 160, 300, "정복", null],
-[100, "양상문", -1, 0, null, 76, 54, 76, 0, 160, 300, "재간", null],
-[28, "윤형배", -1, 0, null, 77, 69, 73, 0, 160, 300, "왕좌", null],
-[97, "박정태", -1, 0, null, 84, 74, 39, 0, 160, 300, "재간", null],
-[42, "주형광", -1, 0, null, 79, 86, 84, 0, 160, 300, "안전", null],
-[14, "강영식", -1, 0, null, 63, 69, 60, 0, 160, 300, "유지", null],
-[124, "김사율", -1, 0, null, 74, 66, 67, 0, 160, 300, "의협", null],
-[74, "배장호", -1, 0, null, 62, 48, 60, 0, 160, 300, "출세", null],
-[16, "손민한", -1, 0, null, 85, 84, 94, 0, 160, 300, "유지", null, "팝콘이 먹고싶다"],
-[84, "송승준", -1, 0, null, 65, 84, 67, 0, 160, 300, "정복", null],
-[82, "이용훈", -1, 0, null, 48, 58, 63, 0, 160, 300, "할거", null],
-[70, "임경완", -1, 0, null, 68, 57, 39, 0, 160, 300, "패권", null],
-[36, "장원준", -1, 0, null, 75, 83, 74, 0, 160, 300, "패권", null],
-[5, "조정훈", -1, 0, null, 67, 59, 79, 0, 160, 300, "할거", null],
-[55, "최대성", -1, 0, null, 69, 63, 38, 0, 160, 300, "대의", null],
-[103, "허준혁", -1, 0, null, 58, 51, 48, 0, 160, 300, "출세", null],
-[105, "강민호", -1, 0, null, 75, 86, 48, 0, 160, 300, "할거", null],
-[97, "최기문", -1, 0, null, 65, 37, 64, 0, 160, 300, "유지", null],
-[23, "임수혁", -1, 0, null, 67, 44, 56, 0, 160, 300, "출세", null],
-[3, "김주찬", -1, 0, null, 75, 53, 88, 0, 160, 300, "안전", null],
-[59, "문규현", -1, 0, null, 46, 22, 49, 0, 160, 300, "출세", null],
-[132, "박기혁", -1, 0, null, 48, 25, 70, 0, 160, 300, "정복", null],
-[86, "이대호", -1, 0, null, 95, 98, 10, 0, 160, 300, "할거", null, "마 니 일로 내리와 "],
-[2, "전준우", -1, 0, null, 80, 72, 75, 0, 160, 300, "패권", null, "홈런! 홈런!....아냐?"],
-[130, "손아섭", -1, 0, null, 89, 75, 82, 0, 160, 300, "의협", null],
-[53, "홍성흔", -1, 0, null, 86, 77, 53, 0, 160, 300, "패권", null],
-[19, "조성환", -1, 0, null, 79, 42, 77, 0, 160, 300, "의협", null],
-[137, "가르시아", -1, 0, null, 70, 85, 12, 0, 160, 300, "패권", null],
-[92, "정보명", -1, 0, null, 69, 31, 39, 0, 160, 300, "출세", null],
-[137, "이재곤", -1, 0, null, 40, 41, 39, 0, 160, 300, "왕좌", null],
-[45, "염종석", -1, 0, null, 83, 90, 93, 0, 160, 300, "출세", null],
-[99, "황재균", -1, 0, null, 79, 77, 83, 0, 160, 300, "정복", null],
-[120, "윤학길", -1, 0, null, 81, 76, 82, 0, 160, 300, "유지", null],
-[61, "가득염", -1, 0, null, 60, 67, 61, 0, 160, 300, "유지", null],
-[135, "조경환", -1, 0, null, 57, 78, 20, 0, 160, 300, "출세", null],
-[73, "강상수", -1, 0, null, 65, 66, 58, 0, 160, 300, "재간", null],
-[9, "최준석", -1, 0, null, 79, 86, 10, 0, 160, 300, "출세", null],
-[83, "최동원", -1, 0, null, 98, 94, 96, 0, 160, 300, "의협", null],
-[76, "김용철", -1, 0, null, 77, 79, 67, 0, 160, 300, "할거", null],
-[97, "김용희", -1, 0, null, 67, 64, 21, 0, 160, 300, "유지", null],
-[115, "호세", -1, 0, null, 88, 86, 39, 0, 160, 300, "대의", null, "헤이 영쑤! 돈 두 댓!"],
-[144, "감사용", -1, 0, null, 37, 18, 65, 0, 160, 300, "안전", null],
-[44, "금광옥", -1, 0, null, 31, 30, 39, 0, 160, 300, "대의", null],
-[75, "김무관", -1, 0, null, 20, 7, 43, 0, 160, 300, "의협", null],
-[32, "양승관", -1, 0, null, 46, 44, 22, 0, 160, 300, "패권", null],
-[23, "박철순", -1, 0, null, 89, 82, 80, 0, 160, 300, "재간", null],
-[14, "하기룡", -1, 0, null, 82, 58, 64, 0, 160, 300, "의협", null],
-[118, "황규봉", -1, 0, null, 83, 48, 72, 0, 160, 300, "의협", null],
-[132, "계형철", -1, 0, null, 74, 75, 70, 0, 160, 300, "왕좌", null],
-[123, "김경문", -1, 0, null, 48, 9, 34, 0, 160, 300, "왕좌", null],
-[59, "조범현", -1, 0, null, 29, 25, 83, 0, 160, 300, "안전", null],
-[56, "백인천", -1, 0, null, 95, 77, 66, 0, 160, 300, "의협", null],
-[12, "김인식", -1, 0, null, 58, 15, 75, 0, 160, 300, "유지", null],
-[33, "김재박", -1, 0, null, 73, 29, 91, 0, 160, 300, "패권", null],
-[89, "박정현", -1, 0, null, 82, 78, 80, 0, 160, 300, "유지", null],
-[46, "전준호", -1, 0, null, 79, 42, 101, 0, 160, 300, "재간", null, "전설의 대도"],
-[26, "심정수", -1, 0, null, 80, 92, 41, 0, 160, 300, "패권", null],
-[11, "박재홍", -1, 0, null, 87, 95, 94, 0, 160, 300, "출세", null],
-[3, "박경완", -1, 0, null, 48, 89, 79, 0, 160, 300, "안전", null],
-[60, "박종호", -1, 0, null, 76, 76, 81, 0, 160, 300, "대의", null],
-[127, "이숭용", -1, 0, null, 81, 83, 67, 0, 160, 300, "재간", null],
-[148, "송지만", -1, 0, null, 78, 89, 86, 0, 160, 300, "왕좌", null],
-[5, "나이트", -1, 0, null, 75, 79, 82, 0, 160, 300, "대의", null],
-[53, "송신영", -1, 0, null, 67, 69, 69, 0, 160, 300, "출세", null],
-[82, "이택근", -1, 0, null, 86, 80, 83, 0, 160, 300, "대의", null],
-[20, "위재영", -1, 0, null, 80, 69, 67, 0, 160, 300, "할거", null],
-[94, "김성래", -1, 0, null, 77, 81, 23, 0, 160, 300, "출세", null],
-[45, "데이비스", -1, 0, null, 89, 83, 77, 0, 160, 300, "정복", null],
-[132, "임선동", -1, 0, null, 67, 72, 76, 0, 160, 300, "패권", null],
-[111, "우즈", -1, 0, null, 89, 90, 36, 0, 160, 300, "정복", null],
-[94, "성준", -1, 0, null, 78, 58, 67, 0, 160, 300, "대의", null],
-[34, "장명부", -1, 0, null, 84, 82, 76, 0, 160, 300, "유지", null],
-[4, "정명원", -1, 0, null, 89, 84, 76, 0, 160, 300, "할거", null],
-[88, "김응국", -1, 0, null, 82, 79, 86, 0, 160, 300, "왕좌", null],
-[3, "강정호", -1, 0, null, 81, 81, 48, 0, 160, 300, "왕좌", null],
-[62, "박병호", -1, 0, null, 80, 95, 56, 0, 160, 300, "왕좌", null],
-[67, "김민성", -1, 0, null, 79, 80, 38, 0, 160, 300, "패권", null],
-[113, "서건창", -1, 0, null, 94, 26, 91, 0, 160, 300, "대의", null],
-[147, "김하성", -1, 0, null, 80, 63, 69, 0, 160, 300, "의협", null],
-[47, "이정후", -1, 0, null, 86, 8, 15, 0, 160, 300, "왕좌", null],
-[120, "정민태", -1, 0, null, 77, 78, 82, 0, 160, 300, "패권", null],
-[46, "정경배", -1, 0, null, 64, 76, 67, 0, 160, 300, "왕좌", null],
-[54, "김기태", -1, 0, null, 86, 90, 76, 0, 160, 300, "패권", null],
-[67, "이승호", -1, 0, null, 71, 80, 53, 0, 160, 300, "할거", null],
-[69, "김광현", -1, 0, null, 84, 90, 86, 0, 160, 300, "정복", null, "제가 현진이형보단 낫죠"],
-[150, "박정배", -1, 0, null, 62, 63, 67, 0, 160, 300, "정복", null],
-[94, "채병용", -1, 0, null, 68, 77, 79, 0, 160, 300, "의협", null],
-[101, "윤희상", -1, 0, null, 56, 58, 67, 0, 160, 300, "대의", null],
-[73, "이재원", -1, 0, null, 83, 67, 10, 0, 160, 300, "출세", null],
-[26, "박정권", -1, 0, null, 78, 83, 53, 0, 160, 300, "정복", null],
-[131, "나주환", -1, 0, null, 68, 67, 72, 0, 160, 300, "왕좌", null],
-[123, "최정", -1, 0, null, 89, 91, 88, 0, 160, 300, "안전", null],
-[137, "조동화", -1, 0, null, 48, 11, 83, 0, 160, 300, "재간", null],
-[28, "김강민", -1, 0, null, 77, 77, 82, 0, 160, 300, "할거", null],
-[105, "박용택", -1, 0, null, 92, 90, 92, 0, 160, 300, "재간", null],
-[66, "이병규", -1, 0, null, 93, 90, 89, 0, 160, 300, "안전", null],
-[14, "조인성", -1, 0, null, 49, 86, 25, 0, 160, 300, "왕좌", null],
-[145, "김동수", -1, 0, null, 65, 86, 65, 0, 160, 300, "유지", null],
-[28, "유지현", -1, 0, null, 76, 57, 87, 0, 160, 300, "패권", null],
-[88, "김재현", -1, 0, null, 85, 86, 77, 0, 160, 300, "왕좌", null],
-[148, "이상훈", -1, 0, null, 95, 90, 87, 0, 160, 300, "할거", null],
-[4, "서용빈", -1, 0, null, 81, 22, 87, 0, 160, 300, "의협", null],
-[24, "봉중근", -1, 0, null, 77, 68, 44, 0, 160, 300, "대의", null],
-[74, "차우찬", -1, 0, null, 67, 82, 49, 0, 160, 300, "패권", null],
-[22, "오지환", -1, 0, null, 57, 68, 80, 0, 160, 300, "출세", null, "경기를 지배하는 오지배입니다"],
-[131, "금민철", -1, 0, null, 61, 50, 42, 0, 160, 300, "할거", null],
-[15, "김동주", -1, 0, null, 92, 92, 48, 0, 160, 300, "할거", null],
-[37, "김선우", -1, 0, null, 65, 67, 74, 0, 160, 300, "패권", null],
-[16, "김재호", -1, 0, null, 68, 21, 58, 0, 160, 300, "왕좌", null],
-[70, "노경은", -1, 0, null, 48, 59, 61, 0, 160, 300, "안전", null],
-[110, "니퍼트", -1, 0, null, 76, 88, 67, 0, 160, 300, "안전", null],
-[19, "류택현", -1, 0, null, 65, 79, 63, 0, 160, 300, "왕좌", null],
-[93, "민병헌", -1, 0, null, 84, 53, 81, 0, 160, 300, "패권", null],
-[31, "박명환", -1, 0, null, 72, 80, 41, 0, 160, 300, "의협", null, "배추 좀 주세요"],
-[2, "안경현", -1, 0, null, 67, 78, 34, 0, 160, 300, "재간", null],
-[54, "양의지", -1, 0, null, 83, 77, 39, 0, 160, 300, "왕좌", null],
-[70, "오재원", -1, 0, null, 67, 30, 87, 0, 160, 300, "패권", null, "식빵!"],
-[102, "유희관", -1, 0, null, 65, 76, 69, 0, 160, 300, "할거", null, "싸인해드릴까요?"],
-[111, "이용찬", -1, 0, null, 68, 72, 74, 0, 160, 300, "패권", null],
-[62, "이성열", -1, 0, null, 48, 77, 41, 0, 160, 300, "출세", null],
-[48, "이재영", -1, 0, null, 63, 64, 39, 0, 160, 300, "왕좌", null],
-[23, "이종욱", -1, 0, null, 83, 35, 91, 0, 160, 300, "출세", null],
-[28, "이현승", -1, 0, null, 63, 65, 67, 0, 160, 300, "왕좌", null],
-[99, "이혜천", -1, 0, null, 62, 50, 48, 0, 160, 300, "패권", null],
-[112, "전병두", -1, 0, null, 71, 78, 29, 0, 160, 300, "정복", null],
-[102, "정대현", -1, 0, null, 88, 58, 70, 0, 160, 300, "안전", null],
-[32, "정수빈", -1, 0, null, 72, 19, 83, 0, 160, 300, "대의", null],
-[119, "정수근", -1, 0, null, 76, 26, 89, 0, 160, 300, "유지", null],
-[64, "홍상삼", -1, 0, null, 59, 49, 51, 0, 160, 300, "출세", null],
-[148, "손시헌", -1, 0, null, 68, 57, 31, 0, 160, 300, "정복", null],
-[95, "박민우", -1, 0, null, 86, 8, 76, 0, 160, 300, "안전", null],
-[37, "모창민", -1, 0, null, 68, 57, 60, 0, 160, 300, "패권", null],
-[38, "지석훈", -1, 0, null, 39, 38, 12, 0, 160, 300, "출세", null],
-[147, "박석민", -1, 0, null, 79, 84, 23, 0, 160, 300, "재간", null, "브로콜리 돼지 나가신다"],
-[120, "이민호", -1, 0, null, 57, 78, 53, 0, 160, 300, "의협", null],
-[53, "김진성", -1, 0, null, 63, 67, 69, 0, 160, 300, "정복", null],
-[41, "권희동", -1, 0, null, 49, 41, 21, 0, 160, 300, "정복", null],
-[119, "임창민", -1, 0, null, 71, 67, 63, 0, 160, 300, "출세", null],
-[23, "원종현", -1, 0, null, 62, 67, 71, 0, 160, 300, "대의", null],
-[27, "이재학", -1, 0, null, 62, 53, 58, 0, 160, 300, "패권", null],
-[81, "최금강", -1, 0, null, 44, 48, 53, 0, 160, 300, "재간", null],
-[113, "김상엽", -1, 0, null, 68, 60, 39, 0, 160, 300, "패권", null],
-[65, "김수경", -1, 0, null, 67, 82, 58, 0, 160, 300, "할거", null],
-[92, "테임즈", -1, 0, null, 94, 96, 76, 0, 160, 300, "정복", null, "황재균은 섹x머신이다"],
-[44, "나성범", -1, 0, null, 90, 83, 70, 0, 160, 300, "재간", null],
-[140, "김성한", -1, 0, null, 80, 86, 79, 0, 160, 300, "출세", null],
-[21, "방수원", -1, 0, null, 74, 53, 76, 0, 160, 300, "왕좌", null],
-[135, "김봉연", -1, 0, null, 74, 79, 40, 0, 160, 300, "안전", null],
-[64, "김일권", -1, 0, null, 53, 29, 95, 0, 160, 300, "유지", null],
-[144, "김종모", -1, 0, null, 85, 70, 31, 0, 160, 300, "할거", null],
-[59, "선동열", -1, 0, null, 104, 96, 99, 0, 160, 300, "의협", null, "무등산 폭격기"],
-[134, "이종범", -1, 0, null, 91, 93, 103, 0, 160, 300, "유지", null, "내겐 보이지 않는 무언가가 있다"],
-[83, "문희수", -1, 0, null, 72, 61, 63, 0, 160, 300, "안전", null],
-[7, "유승안", -1, 0, null, 65, 73, 34, 0, 160, 300, "재간", null],
-[71, "이순철", -1, 0, null, 63, 80, 87, 0, 160, 300, "정복", null, "LG는 내 덕에 강팀이 되었지"],
-[133, "차동철", -1, 0, null, 73, 23, 67, 0, 160, 300, "할거", null],
-[145, "한대화", -1, 0, null, 79, 82, 71, 0, 160, 300, "정복", null],
-[87, "이강철", -1, 0, null, 83, 81, 62, 0, 160, 300, "패권", null],
-[92, "조계현", -1, 0, null, 86, 71, 73, 0, 160, 300, "재간", null],
-[140, "최향남", -1, 0, null, 63, 64, 34, 0, 160, 300, "왕좌", null],
-[122, "홍현우", -1, 0, null, 71, 84, 81, 0, 160, 300, "출세", null],
-[44, "이대진", -1, 0, null, 73, 74, 58, 0, 160, 300, "의협", null],
-[26, "장채근", -1, 0, null, 30, 72, 31, 0, 160, 300, "출세", null],
-[47, "김종국", -1, 0, null, 46, 62, 86, 0, 160, 300, "출세", null],
-[149, "곽채진", -1, 0, null, 61, 67, 59, 0, 160, 300, "안전", null],
-[116, "황두성", -1, 0, null, 73, 79, 51, 0, 160, 300, "출세", null],
-[2, "이호준", -1, 0, null, 82, 86, 51, 0, 160, 300, "재간", null],
-[104, "장성호", -1, 0, null, 84, 83, 74, 0, 160, 300, "의협", null],
-[79, "정성훈", -1, 0, null, 84, 80, 77, 0, 160, 300, "재간", null],
-[125, "최상덕", -1, 0, null, 61, 67, 73, 0, 160, 300, "정복", null],
-[84, "홍세완", -1, 0, null, 67, 72, 39, 0, 160, 300, "유지", null],
-[103, "리오스", -1, 0, null, 81, 76, 71, 0, 160, 300, "출세", null],
-[48, "차일목", -1, 0, null, 38, 31, 34, 0, 160, 300, "유지", null],
-[129, "진필중", -1, 0, null, 79, 83, 75, 0, 160, 300, "의협", null],
-[133, "유동훈", -1, 0, null, 74, 51, 64, 0, 160, 300, "재간", null],
-[37, "이재주", -1, 0, null, 48, 77, 6, 0, 160, 300, "안전", null],
-[146, "심재학", -1, 0, null, 66, 75, 26, 0, 160, 300, "안전", null],
-[27, "이용규", -1, 0, null, 86, 20, 86, 0, 160, 300, "할거", null],
-[87, "윤석민", -1, 0, null, 86, 79, 81, 0, 160, 300, "유지", null, "죄송합니다 제가 공황장애가 와서.."],
-[125, "조규제", -1, 0, null, 83, 76, 58, 0, 160, 300, "정복", null],
-[144, "한기주", -1, 0, null, 72, 57, 58, 0, 160, 300, "재간", null, "속이 꽉찬 남자 99.9"],
-[48, "이동현", -1, 0, null, 71, 63, 50, 0, 160, 300, "대의", null],
-[114, "김원섭", -1, 0, null, 67, 29, 77, 0, 160, 300, "출세", null],
-[123, "신동주", -1, 0, null, 68, 76, 79, 0, 160, 300, "할거", null],
-[126, "김진우", -1, 0, null, 70, 72, 59, 0, 160, 300, "재간", null],
-[122, "최희섭", -1, 0, null, 82, 79, 29, 0, 160, 300, "왕좌", null, "형 저 메이저리거에요"],
-[142, "서재응", -1, 0, null, 67, 69, 80, 0, 160, 300, "재간", null],
-[49, "나지완", -1, 0, null, 76, 81, 33, 0, 160, 300, "할거", null],
-[30, "채종범", -1, 0, null, 60, 48, 31, 0, 160, 300, "왕좌", null],
-[149, "로페즈", -1, 0, null, 73, 67, 80, 0, 160, 300, "출세", null],
-[65, "안치홍", -1, 0, null, 83, 67, 73, 0, 160, 300, "재간", null],
-[117, "양현종", -1, 0, null, 75, 78, 72, 0, 160, 300, "정복", null],
-[45, "김선빈", -1, 0, null, 86, 16, 76, 0, 160, 300, "유지", null],
-[127, "이범호", -1, 0, null, 67, 88, 48, 0, 160, 300, "대의", null, "꽃보다 아름다운 남자"],
-[143, "김상현", -1, 0, null, 53, 82, 50, 0, 160, 300, "재간", null],
-[9, "이대형", -1, 0, null, 74, 12, 94, 0, 160, 300, "정복", null, "누구보다 빠르게 난 남들과는 다르게"],
-[32, "김병현", -1, 0, null, 97, 92, 73, 0, 160, 300, "할거", null],
-[87, "박찬호", -1, 0, null, 102, 103, 96, 0, 160, 300, "유지", null, "안녕하세요 제가 LA에 있을 시절부터 놀란 라이언같은 투수가 되고 싶었는데요. 그래서 런닝도 하고 웨이트도 하다보니 어느덧 강속구 투수가 되어서…"],
-[137, "송은범", -1, 0, null, 60, 57, 63, 0, 160, 300, "정복", null],
-[79, "심수창", -1, 0, null, 40, 53, 39, 0, 160, 300, "대의", null],
-[89, "윤규진", -1, 0, null, 53, 60, 38, 0, 160, 300, "의협", null],
-[32, "정우람", -1, 0, null, 81, 76, 79, 0, 160, 300, "의협", null],
-[127, "김태균", -1, 0, null, 91, 91, 36, 0, 160, 300, "안전", null],
-[67, "송광민", -1, 0, null, 80, 72, 19, 0, 160, 300, "할거", null],
-[145, "정근우", -1, 0, null, 86, 74, 87, 0, 160, 300, "의협", null],
-[93, "최진행", -1, 0, null, 57, 76, 12, 0, 160, 300, "대의", null, "약 좀 주세요"],
-[73, "한용덕", -1, 0, null, 75, 76, 79, 0, 160, 300, "출세", null],
-[91, "구대성", -1, 0, null, 88, 86, 72, 0, 160, 300, "대의", null],
-[126, "유승안", -1, 0, null, 72, 73, 22, 0, 160, 300, "왕좌", null],
-[145, "정민철", -1, 0, null, 72, 79, 85, 0, 160, 300, "출세", null],
-[22, "장종훈", -1, 0, null, 81, 94, 83, 0, 160, 300, "유지", null, "신고선수의 전설"],
-[46, "송진우", -1, 0, null, 80, 83, 86, 0, 160, 300, "출세", null],
-[31, "이강돈", -1, 0, null, 77, 72, 76, 0, 160, 300, "정복", null],
-[20, "이상목", -1, 0, null, 67, 73, 79, 0, 160, 300, "출세", null],
-[26, "한희민", -1, 0, null, 80, 58, 74, 0, 160, 300, "할거", null],
-[104, "류현진", -1, 0, null, 97, 98, 92, 0, 160, 300, "대의", null, "야구는 수비를 믿지 말고 내가 잘해야 이긴다"],
-[32, "이정훈", -1, 0, null, 83, 60, 81, 0, 160, 300, "패권", null],
-[103, "이영우", -1, 0, null, 82, 79, 77, 0, 160, 300, "대의", null],
-[119, "동봉철", -1, 0, null, 63, 32, 77, 0, 160, 300, "왕좌", null],
-[54, "김현수", -1, 0, null, 88, 81, 48, 0, 160, 300, "대의", null],
-[97, "추신수", -1, 0, null, 99, 99, 96, 0, 160, 300, "유지", null, "Go! Choo! Go! Choo!"],
-[27, "최원호", -1, 0, null, 55, 53, 53, 0, 160, 300, "대의", null],
-[23, "신명철", -1, 0, null, 41, 53, 76, 0, 160, 300, "출세", null],
-[50, "백재호", -1, 0, null, 44, 63, 22, 0, 160, 300, "안전", null],
-[6, "노장진", -1, 0, null, 64, 82, 48, 0, 160, 300, "대의", null],
-[92, "조용준", -1, 0, null, 86, 61, 69, 0, 160, 300, "재간", null],
-[53, "이진영", -1, 0, null, 86, 82, 79, 0, 160, 300, "정복", null, "어디로 던져도 난 머리에 맞는다"],
-[82, "장원삼", -1, 0, null, 70, 80, 83, 0, 160, 300, "정복", null],
-[59, "고영민", -1, 0, null, 50, 45, 76, 0, 160, 300, "왕좌", null],
-[124, "옥스프링", -1, 0, null, 74, 68, 72, 0, 160, 300, "패권", null],
-[48, "사도스키", -1, 0, null, 68, 68, 76, 0, 160, 300, "의협", null],
-[149, "해커", -1, 0, null, 85, 88, 89, 0, 160, 300, "유지", null, "x까! x빨놈아!"],
-[70, "브룸바", -1, 0, null, 84, 77, 22, 0, 160, 300, "패권", null],
-[11, "밴헤켄", -1, 0, null, 80, 82, 86, 0, 160, 300, "왕좌", null],
-[77, "레일리", -1, 0, null, 67, 74, 77, 0, 160, 300, "패권", null],
-[14, "그레이싱어", -1, 0, null, 75, 74, 67, 0, 160, 300, "왕좌", null],
-[135, "글로버", -1, 0, null, 72, 84, 50, 0, 160, 300, "유지", null],
-[149, "소사", -1, 0, null, 69, 80, 72, 0, 160, 300, "왕좌", null],
-[26, "레스", -1, 0, null, 76, 74, 51, 0, 160, 300, "출세", null],
-[113, "켈리", -1, 0, null, 73, 77, 70, 0, 160, 300, "대의", null],
-[145, "피어밴드", -1, 0, null, 70, 73, 77, 0, 160, 300, "의협", null]
+        [0, "김일융", -1, 0, null, 88, 83, 79, 0, 160, 300, null, "랜덤"],
+        [0, "이승엽", -1, 0, null, 90, 108, 37, 0, 160, 300, null, "위압", "안녕하세요 국민타자 이승엽입니다."],
+        [0, "마해영", -1, 0, null, 84, 84, 22, 0, 160, 300, null, "랜덤"],
+        [0, "채태인", -1, 0, null, 86, 54, 15, 0, 160, 300, null, "랜덤", "신대륙은 어디에…"],
+        [0, "김성래", -1, 0, null, 75, 86, 19, 0, 160, 300, null, "랜덤"],
+        [0, "강기웅", -1, 0, null, 82, 61, 83, 0, 160, 300, null, "랜덤"],
+        [0, "나바로", -1, 0, null, 82, 85, 79, 0, 160, 300, null, "랜덤"],
+        [0, "김한수", -1, 0, null, 80, 82, 48, 0, 160, 300, null, "랜덤"],
+        [0, "조동찬", -1, 0, null, 55, 68, 75, 0, 160, 300, null, "랜덤"],
+        [0, "류중일", -1, 0, null, 68, 34, 78, 0, 160, 300, null, "랜덤", "내 아들 상수야…"],
+        [0, "김상수", -1, 0, null, 68, 21, 80, 0, 160, 300, null, "랜덤", "예 아부지…"],
+        [0, "박진만", -1, 0, null, 72, 78, 69, 0, 160, 300, null, "랜덤"],
+        [0, "양준혁", -1, 0, null, 97, 98, 91, 0, 160, 300, null, "무쌍", "내보다 강미노가 머리 더 큰데?"],
+        [0, "박한이", -1, 0, null, 83, 77, 79, 0, 160, 300, null, "랜덤", "킁킁"],
+        [0, "최형우", -1, 0, null, 87, 86, 20, 0, 160, 300, null, "랜덤"],
+        [0, "장효조", -1, 0, null, 95, 39, 68, 0, 160, 300, null, "랜덤"],
+        [0, "동봉철", -1, 0, null, 65, 41, 74, 0, 160, 300, null, "랜덤"],
+        [0, "강동우", -1, 0, null, 67, 53, 79, 0, 160, 300, null, "랜덤"],
+        [0, "신동주", -1, 0, null, 68, 71, 76, 0, 160, 300, null, "랜덤"],
+        [0, "이만수", -1, 0, null, 89, 97, 49, 0, 160, 300, null, "필살"],
+        [0, "진갑용", -1, 0, null, 74, 80, 15, 0, 160, 300, null, "랜덤"],
+        [0, "김시진", -1, 0, null, 84, 88, 75, 0, 160, 300, null, "랜덤"],
+        [0, "배영수", -1, 0, null, 79, 86, 87, 0, 160, 300, null, "랜덤"],
+        [0, "윤성환", -1, 0, null, 74, 86, 87, 0, 160, 300, null, "랜덤"],
+        [0, "안지만", -1, 0, null, 69, 79, 75, 0, 160, 300, null, "랜덤"],
+        [0, "김현욱", -1, 0, null, 82, 85, 84, 0, 160, 300, null, "랜덤"],
+        [0, "정현욱", -1, 0, null, 74, 83, 77, 0, 160, 300, null, "랜덤"],
+        [0, "권혁", -1, 0, null, 75, 86, 62, 0, 160, 300, null, "랜덤"],
+        [0, "임창용", -1, 0, null, 83, 86, 80, 0, 160, 300, null, "랜덤"],
+        [0, "오승환", -1, 0, null, 97, 92, 89, 0, 160, 300, null, "위압"],
+        [0, "권영호", -1, 0, null, 83, 53, 76, 0, 160, 300, null, "랜덤"],
+        [0, "이선희", -1, 0, null, 83, 49, 74, 0, 160, 300, null, "랜덤"],
+        [0, "공필성", -1, 0, null, 46, 47, 77, 0, 160, 300, null, "랜덤"],
+        [0, "양상문", -1, 0, null, 76, 54, 76, 0, 160, 300, null, "랜덤"],
+        [0, "윤형배", -1, 0, null, 77, 69, 73, 0, 160, 300, null, "랜덤"],
+        [0, "박정태", -1, 0, null, 84, 74, 39, 0, 160, 300, null, "랜덤"],
+        [0, "주형광", -1, 0, null, 79, 86, 84, 0, 160, 300, null, "랜덤"],
+        [0, "강영식", -1, 0, null, 63, 69, 60, 0, 160, 300, null, "랜덤"],
+        [0, "김사율", -1, 0, null, 74, 66, 67, 0, 160, 300, null, "랜덤"],
+        [0, "배장호", -1, 0, null, 62, 48, 60, 0, 160, 300, null, "랜덤"],
+        [0, "손민한", -1, 0, null, 85, 84, 94, 0, 160, 300, null, "랜덤", "팝콘이 먹고싶다"],
+        [0, "송승준", -1, 0, null, 65, 84, 67, 0, 160, 300, null, "랜덤"],
+        [0, "이용훈", -1, 0, null, 48, 58, 63, 0, 160, 300, null, "랜덤"],
+        [0, "임경완", -1, 0, null, 68, 57, 39, 0, 160, 300, null, "랜덤"],
+        [0, "장원준", -1, 0, null, 75, 83, 74, 0, 160, 300, null, "랜덤"],
+        [0, "조정훈", -1, 0, null, 67, 59, 79, 0, 160, 300, null, "랜덤"],
+        [0, "최대성", -1, 0, null, 69, 63, 38, 0, 160, 300, null, "랜덤"],
+        [0, "허준혁", -1, 0, null, 58, 51, 48, 0, 160, 300, null, "랜덤"],
+        [0, "강민호", -1, 0, null, 75, 86, 48, 0, 160, 300, null, "랜덤", "모텔에 간민호"],
+        [0, "최기문", -1, 0, null, 65, 37, 64, 0, 160, 300, null, "랜덤"],
+        [0, "임수혁", -1, 0, null, 67, 44, 56, 0, 160, 300, null, "랜덤"],
+        [0, "김주찬", -1, 0, null, 75, 53, 88, 0, 160, 300, null, "랜덤"],
+        [0, "문규현", -1, 0, null, 46, 22, 49, 0, 160, 300, null, "랜덤"],
+        [0, "박기혁", -1, 0, null, 48, 25, 70, 0, 160, 300, null, "랜덤"],
+        [0, "이대호", -1, 0, null, 95, 98, 10, 0, 160, 300, null, "무쌍", "마 니 일로 내리와 "],
+        [0, "전준우", -1, 0, null, 80, 72, 75, 0, 160, 300, null, "랜덤", "홈런! 홈런!....아냐?"],
+        [0, "손아섭", -1, 0, null, 89, 75, 82, 0, 160, 300, null, "랜덤"],
+        [0, "홍성흔", -1, 0, null, 86, 77, 53, 0, 160, 300, null, "랜덤"],
+        [0, "조성환", -1, 0, null, 79, 42, 77, 0, 160, 300, null, "랜덤"],
+        [0, "가르시아", -1, 0, null, 70, 85, 12, 0, 160, 300, null, "랜덤"],
+        [0, "정보명", -1, 0, null, 69, 31, 39, 0, 160, 300, null, "랜덤"],
+        [0, "이재곤", -1, 0, null, 40, 41, 39, 0, 160, 300, null, "랜덤"],
+        [0, "염종석", -1, 0, null, 83, 90, 93, 0, 160, 300, null, "랜덤"],
+        [0, "황재균", -1, 0, null, 79, 77, 83, 0, 160, 300, null, "랜덤", "안녕하세요 섹머입니다"],
+        [0, "윤학길", -1, 0, null, 81, 76, 82, 0, 160, 300, null, "랜덤"],
+        [0, "가득염", -1, 0, null, 60, 67, 61, 0, 160, 300, null, "랜덤"],
+        [0, "조경환", -1, 0, null, 57, 78, 20, 0, 160, 300, null, "랜덤"],
+        [0, "강상수", -1, 0, null, 65, 66, 58, 0, 160, 300, null, "랜덤"],
+        [0, "최준석", -1, 0, null, 79, 86, 10, 0, 160, 300, null, "랜덤"],
+        [0, "최동원", -1, 0, null, 98, 94, 96, 0, 160, 300, null, "환술", "무쇠팔 최동원"],
+        [0, "김용철", -1, 0, null, 77, 79, 67, 0, 160, 300, null, "랜덤"],
+        [0, "김용희", -1, 0, null, 67, 64, 21, 0, 160, 300, null, "랜덤"],
+        [0, "호세", -1, 0, null, 88, 86, 39, 0, 160, 300, null, "랜덤", "헤이 영쑤! 돈 두 댓!"],
+        [0, "감사용", -1, 0, null, 37, 18, 65, 0, 160, 300, null, "랜덤"],
+        [0, "금광옥", -1, 0, null, 31, 30, 39, 0, 160, 300, null, "랜덤"],
+        [0, "김무관", -1, 0, null, 20, 7, 43, 0, 160, 300, null, "랜덤"],
+        [0, "양승관", -1, 0, null, 46, 44, 22, 0, 160, 300, null, "랜덤"],
+        [0, "박철순", -1, 0, null, 89, 82, 80, 0, 160, 300, null, "무쌍"],
+        [0, "하기룡", -1, 0, null, 82, 58, 64, 0, 160, 300, null, "랜덤"],
+        [0, "황규봉", -1, 0, null, 83, 48, 72, 0, 160, 300, null, "랜덤"],
+        [0, "계형철", -1, 0, null, 74, 75, 70, 0, 160, 300, null, "랜덤"],
+        [0, "김경문", -1, 0, null, 48, 9, 34, 0, 160, 300, null, "랜덤"],
+        [0, "조범현", -1, 0, null, 29, 25, 83, 0, 160, 300, null, "랜덤"],
+        [0, "백인천", -1, 0, null, 95, 77, 66, 0, 160, 300, null, "랜덤"],
+        [0, "김인식", -1, 0, null, 58, 15, 75, 0, 160, 300, null, "랜덤"],
+        [0, "김재박", -1, 0, null, 73, 29, 91, 0, 160, 300, null, "랜덤"],
+        [0, "박정현", -1, 0, null, 82, 78, 80, 0, 160, 300, null, "랜덤"],
+        [0, "전준호", -1, 0, null, 79, 42, 101, 0, 160, 300, null, "랜덤", "전설의 대도"],
+        [0, "심정수", -1, 0, null, 80, 92, 41, 0, 160, 300, null, "랜덤"],
+        [0, "박재홍", -1, 0, null, 87, 95, 94, 0, 160, 300, null, "무쌍"],
+        [0, "박경완", -1, 0, null, 48, 89, 79, 0, 160, 300, null, "랜덤"],
+        [0, "박종호", -1, 0, null, 76, 76, 81, 0, 160, 300, null, "랜덤"],
+        [0, "이숭용", -1, 0, null, 81, 83, 67, 0, 160, 300, null, "랜덤"],
+        [0, "송지만", -1, 0, null, 78, 89, 86, 0, 160, 300, null, "랜덤"],
+        [0, "나이트", -1, 0, null, 75, 79, 82, 0, 160, 300, null, "랜덤"],
+        [0, "송신영", -1, 0, null, 67, 69, 69, 0, 160, 300, null, "랜덤"],
+        [0, "이택근", -1, 0, null, 86, 80, 83, 0, 160, 300, null, "랜덤"],
+        [0, "위재영", -1, 0, null, 80, 69, 67, 0, 160, 300, null, "랜덤"],
+        [0, "김성래", -1, 0, null, 77, 81, 23, 0, 160, 300, null, "랜덤"],
+        [0, "데이비스", -1, 0, null, 89, 83, 77, 0, 160, 300, null, "랜덤"],
+        [0, "임선동", -1, 0, null, 67, 72, 76, 0, 160, 300, null, "랜덤"],
+        [0, "우즈", -1, 0, null, 89, 90, 36, 0, 160, 300, null, "필살"],
+        [0, "성준", -1, 0, null, 78, 58, 67, 0, 160, 300, null, "랜덤"],
+        [0, "장명부", -1, 0, null, 84, 82, 76, 0, 160, 300, null, "랜덤"],
+        [0, "정명원", -1, 0, null, 89, 84, 76, 0, 160, 300, null, "랜덤"],
+        [0, "김응국", -1, 0, null, 82, 79, 86, 0, 160, 300, null, "랜덤"],
+        [0, "강정호", -1, 0, null, 81, 81, 48, 0, 160, 300, null, "랜덤"],
+        [0, "박병호", -1, 0, null, 80, 95, 56, 0, 160, 300, null, "위압"],
+        [0, "김민성", -1, 0, null, 79, 80, 38, 0, 160, 300, null, "랜덤"],
+        [0, "서건창", -1, 0, null, 94, 26, 91, 0, 160, 300, null, "환술"],
+        [0, "김하성", -1, 0, null, 80, 63, 69, 0, 160, 300, null, "랜덤"],
+        [0, "이정후", -1, 0, null, 86, 8, 15, 0, 160, 300, null, "랜덤"],
+        [0, "정민태", -1, 0, null, 77, 78, 82, 0, 160, 300, null, "랜덤"],
+        [0, "정경배", -1, 0, null, 64, 76, 67, 0, 160, 300, null, "랜덤"],
+        [0, "김기태", -1, 0, null, 86, 90, 76, 0, 160, 300, null, "랜덤"],
+        [0, "이승호", -1, 0, null, 71, 80, 53, 0, 160, 300, null, "랜덤"],
+        [0, "김광현", -1, 0, null, 84, 90, 86, 0, 160, 300, null, "무쌍", "제가 현진이형보단 낫죠"],
+        [0, "박정배", -1, 0, null, 62, 63, 67, 0, 160, 300, null, "랜덤"],
+        [0, "채병용", -1, 0, null, 68, 77, 79, 0, 160, 300, null, "랜덤"],
+        [0, "윤희상", -1, 0, null, 56, 58, 67, 0, 160, 300, null, "랜덤"],
+        [0, "이재원", -1, 0, null, 83, 67, 10, 0, 160, 300, null, "랜덤"],
+        [0, "박정권", -1, 0, null, 78, 83, 53, 0, 160, 300, null, "랜덤"],
+        [0, "나주환", -1, 0, null, 68, 67, 72, 0, 160, 300, null, "랜덤"],
+        [0, "최정", -1, 0, null, 89, 91, 88, 0, 160, 300, null, "무쌍"],
+        [0, "조동화", -1, 0, null, 48, 11, 83, 0, 160, 300, null, "랜덤"],
+        [0, "김강민", -1, 0, null, 77, 77, 82, 0, 160, 300, null, "랜덤"],
+        [0, "박용택", -1, 0, null, 92, 90, 92, 0, 160, 300, null, "신중", "팬 여러분 올해는 유광잠바 준비하셔야 될 겁니다"],
+        [0, "이병규", -1, 0, null, 93, 90, 89, 0, 160, 300, null, "필살"],
+        [0, "조인성", -1, 0, null, 49, 86, 25, 0, 160, 300, null, "랜덤"],
+        [0, "김동수", -1, 0, null, 65, 86, 65, 0, 160, 300, null, "랜덤"],
+        [0, "유지현", -1, 0, null, 76, 57, 87, 0, 160, 300, null, "랜덤"],
+        [0, "김재현", -1, 0, null, 85, 86, 77, 0, 160, 300, null, "랜덤"],
+        [0, "이상훈", -1, 0, null, 95, 90, 87, 0, 160, 300, null, "무쌍"],
+        [0, "서용빈", -1, 0, null, 81, 22, 87, 0, 160, 300, null, "랜덤"],
+        [0, "봉중근", -1, 0, null, 77, 68, 44, 0, 160, 300, null, "랜덤"],
+        [0, "차우찬", -1, 0, null, 67, 82, 49, 0, 160, 300, null, "랜덤"],
+        [0, "오지환", -1, 0, null, 57, 68, 80, 0, 160, 300, null, "랜덤", "경기를 지배하는 오지배입니다"],
+        [0, "금민철", -1, 0, null, 61, 50, 42, 0, 160, 300, null, "랜덤"],
+        [0, "김동주", -1, 0, null, 92, 92, 48, 0, 160, 300, null, "위압"],
+        [0, "김선우", -1, 0, null, 65, 67, 74, 0, 160, 300, null, "랜덤"],
+        [0, "김재호", -1, 0, null, 68, 21, 58, 0, 160, 300, null, "랜덤"],
+        [0, "노경은", -1, 0, null, 48, 59, 61, 0, 160, 300, null, "랜덤"],
+        [0, "니퍼트", -1, 0, null, 76, 88, 67, 0, 160, 300, null, "랜덤"],
+        [0, "류택현", -1, 0, null, 65, 79, 63, 0, 160, 300, null, "랜덤"],
+        [0, "민병헌", -1, 0, null, 84, 53, 81, 0, 160, 300, null, "랜덤"],
+        [0, "박명환", -1, 0, null, 72, 80, 41, 0, 160, 300, null, "랜덤", "배추 좀 주세요"],
+        [0, "안경현", -1, 0, null, 67, 78, 34, 0, 160, 300, null, "랜덤"],
+        [0, "양의지", -1, 0, null, 83, 77, 39, 0, 160, 300, null, "랜덤"],
+        [0, "오재원", -1, 0, null, 67, 30, 87, 0, 160, 300, null, "랜덤", "식빵!"],
+        [0, "유희관", -1, 0, null, 65, 76, 69, 0, 160, 300, null, "랜덤", "싸인해드릴까요?"],
+        [0, "이용찬", -1, 0, null, 68, 72, 74, 0, 160, 300, null, "랜덤"],
+        [0, "이성열", -1, 0, null, 48, 77, 41, 0, 160, 300, null, "랜덤"],
+        [0, "이재영", -1, 0, null, 63, 64, 39, 0, 160, 300, null, "랜덤"],
+        [0, "이종욱", -1, 0, null, 83, 35, 91, 0, 160, 300, null, "랜덤"],
+        [0, "이현승", -1, 0, null, 63, 65, 67, 0, 160, 300, null, "랜덤"],
+        [0, "이혜천", -1, 0, null, 62, 50, 48, 0, 160, 300, null, "랜덤"],
+        [0, "전병두", -1, 0, null, 71, 78, 29, 0, 160, 300, null, "랜덤"],
+        [0, "정대현", -1, 0, null, 88, 58, 70, 0, 160, 300, null, "랜덤"],
+        [0, "정수빈", -1, 0, null, 72, 19, 83, 0, 160, 300, null, "랜덤"],
+        [0, "정수근", -1, 0, null, 76, 26, 89, 0, 160, 300, null, "랜덤"],
+        [0, "홍상삼", -1, 0, null, 59, 49, 51, 0, 160, 300, null, "랜덤"],
+        [0, "손시헌", -1, 0, null, 68, 57, 31, 0, 160, 300, null, "랜덤"],
+        [0, "박민우", -1, 0, null, 86, 8, 76, 0, 160, 300, null, "랜덤"],
+        [0, "모창민", -1, 0, null, 68, 57, 60, 0, 160, 300, null, "랜덤"],
+        [0, "지석훈", -1, 0, null, 39, 38, 12, 0, 160, 300, null, "랜덤"],
+        [0, "박석민", -1, 0, null, 79, 84, 23, 0, 160, 300, null, "랜덤", "브로콜리 돼지 나가신다"],
+        [0, "이민호", -1, 0, null, 57, 78, 53, 0, 160, 300, null, "랜덤"],
+        [0, "김진성", -1, 0, null, 63, 67, 69, 0, 160, 300, null, "랜덤"],
+        [0, "권희동", -1, 0, null, 49, 41, 21, 0, 160, 300, null, "랜덤"],
+        [0, "임창민", -1, 0, null, 71, 67, 63, 0, 160, 300, null, "랜덤"],
+        [0, "원종현", -1, 0, null, 62, 67, 71, 0, 160, 300, null, "랜덤"],
+        [0, "이재학", -1, 0, null, 62, 53, 58, 0, 160, 300, null, "랜덤"],
+        [0, "최금강", -1, 0, null, 44, 48, 53, 0, 160, 300, null, "랜덤"],
+        [0, "김상엽", -1, 0, null, 68, 60, 39, 0, 160, 300, null, "랜덤"],
+        [0, "김수경", -1, 0, null, 67, 82, 58, 0, 160, 300, null, "랜덤"],
+        [0, "테임즈", -1, 0, null, 94, 96, 76, 0, 160, 300, null, "무쌍", "황재균은 섹x머신이다"],
+        [0, "나성범", -1, 0, null, 90, 83, 70, 0, 160, 300, null, "필살"],
+        [0, "김성한", -1, 0, null, 80, 86, 79, 0, 160, 300, null, "랜덤"],
+        [0, "방수원", -1, 0, null, 74, 53, 76, 0, 160, 300, null, "랜덤"],
+        [0, "김봉연", -1, 0, null, 74, 79, 40, 0, 160, 300, null, "랜덤"],
+        [0, "김일권", -1, 0, null, 53, 29, 95, 0, 160, 300, null, "랜덤"],
+        [0, "김종모", -1, 0, null, 85, 70, 31, 0, 160, 300, null, "랜덤"],
+        [0, "선동열", -1, 0, null, 104, 96, 99, 0, 160, 300, null, "집중", "무등산 폭격기"],
+        [0, "이종범", -1, 0, null, 91, 93, 103, 0, 160, 300, null, "환술", "내겐 보이지 않는 무언가가 있다"],
+        [0, "문희수", -1, 0, null, 72, 61, 63, 0, 160, 300, null, "랜덤"],
+        [0, "유승안", -1, 0, null, 65, 73, 34, 0, 160, 300, null, "랜덤"],
+        [0, "이순철", -1, 0, null, 63, 80, 87, 0, 160, 300, null, "랜덤", "LG는 내 덕에 강팀이 되었지"],
+        [0, "차동철", -1, 0, null, 73, 23, 67, 0, 160, 300, null, "랜덤"],
+        [0, "한대화", -1, 0, null, 79, 82, 71, 0, 160, 300, null, "랜덤"],
+        [0, "이강철", -1, 0, null, 83, 81, 62, 0, 160, 300, null, "랜덤"],
+        [0, "조계현", -1, 0, null, 86, 71, 73, 0, 160, 300, null, "무쌍"],
+        [0, "최향남", -1, 0, null, 63, 64, 34, 0, 160, 300, null, "랜덤"],
+        [0, "홍현우", -1, 0, null, 71, 84, 81, 0, 160, 300, null, "랜덤"],
+        [0, "이대진", -1, 0, null, 73, 74, 58, 0, 160, 300, null, "랜덤"],
+        [0, "장채근", -1, 0, null, 30, 72, 31, 0, 160, 300, null, "랜덤"],
+        [0, "김종국", -1, 0, null, 46, 62, 86, 0, 160, 300, null, "랜덤"],
+        [0, "곽채진", -1, 0, null, 61, 67, 59, 0, 160, 300, null, "랜덤"],
+        [0, "황두성", -1, 0, null, 73, 79, 51, 0, 160, 300, null, "랜덤"],
+        [0, "이호준", -1, 0, null, 82, 86, 51, 0, 160, 300, null, "랜덤", "인생은 이호준처럼"],
+        [0, "장성호", -1, 0, null, 84, 83, 74, 0, 160, 300, null, "랜덤"],
+        [0, "정성훈", -1, 0, null, 84, 80, 77, 0, 160, 300, null, "랜덤"],
+        [0, "최상덕", -1, 0, null, 61, 67, 73, 0, 160, 300, null, "랜덤"],
+        [0, "홍세완", -1, 0, null, 67, 72, 39, 0, 160, 300, null, "랜덤"],
+        [0, "리오스", -1, 0, null, 81, 76, 71, 0, 160, 300, null, "랜덤"],
+        [0, "차일목", -1, 0, null, 38, 31, 34, 0, 160, 300, null, "랜덤"],
+        [0, "진필중", -1, 0, null, 79, 83, 75, 0, 160, 300, null, "랜덤"],
+        [0, "유동훈", -1, 0, null, 74, 51, 64, 0, 160, 300, null, "랜덤"],
+        [0, "이재주", -1, 0, null, 48, 77, 6, 0, 160, 300, null, "랜덤"],
+        [0, "심재학", -1, 0, null, 66, 75, 26, 0, 160, 300, null, "랜덤"],
+        [0, "이용규", -1, 0, null, 86, 20, 86, 0, 160, 300, null, "랜덤"],
+        [0, "윤석민", -1, 0, null, 86, 79, 81, 0, 160, 300, null, "랜덤", "죄송합니다 제가 공황장애가 와서.."],
+        [0, "조규제", -1, 0, null, 83, 76, 58, 0, 160, 300, null, "랜덤"],
+        [0, "한기주", -1, 0, null, 72, 57, 58, 0, 160, 300, null, "랜덤", "속이 꽉찬 남자 99.9"],
+        [0, "이동현", -1, 0, null, 71, 63, 50, 0, 160, 300, null, "랜덤"],
+        [0, "김원섭", -1, 0, null, 67, 29, 77, 0, 160, 300, null, "랜덤"],
+        [0, "신동주", -1, 0, null, 68, 76, 79, 0, 160, 300, null, "랜덤"],
+        [0, "김진우", -1, 0, null, 70, 72, 59, 0, 160, 300, null, "랜덤"],
+        [0, "최희섭", -1, 0, null, 82, 79, 29, 0, 160, 300, null, "랜덤", "형 저 메이저리거에요"],
+        [0, "서재응", -1, 0, null, 67, 69, 80, 0, 160, 300, null, "랜덤"],
+        [0, "나지완", -1, 0, null, 76, 81, 33, 0, 160, 300, null, "랜덤"],
+        [0, "채종범", -1, 0, null, 60, 48, 31, 0, 160, 300, null, "랜덤"],
+        [0, "로페즈", -1, 0, null, 73, 67, 80, 0, 160, 300, null, "랜덤"],
+        [0, "안치홍", -1, 0, null, 83, 67, 73, 0, 160, 300, null, "랜덤"],
+        [0, "양현종", -1, 0, null, 75, 78, 72, 0, 160, 300, null, "랜덤"],
+        [0, "김선빈", -1, 0, null, 86, 16, 76, 0, 160, 300, null, "랜덤"],
+        [0, "이범호", -1, 0, null, 67, 88, 48, 0, 160, 300, null, "랜덤", "꽃보다 아름다운 남자"],
+        [0, "김상현", -1, 0, null, 53, 82, 50, 0, 160, 300, null, "랜덤"],
+        [0, "이대형", -1, 0, null, 74, 12, 94, 0, 160, 300, null, "랜덤", "누구보다 빠르게 난 남들과는 다르게"],
+        [0, "김병현", -1, 0, null, 97, 92, 73, 0, 160, 300, null, "필살"],
+        [0, "박찬호", -1, 0, null, 102, 103, 96, 0, 160, 300, null, "위압", "안녕하세요 제가 LA에 있을 시절부터 놀란 라이언같은 투수가 되고 싶었는데요. 그래서 런닝도 하고 웨이트도 하다보니 어느덧 강속구 투수가 되어서…"],
+        [0, "송은범", -1, 0, null, 60, 57, 63, 0, 160, 300, null, "랜덤"],
+        [0, "심수창", -1, 0, null, 40, 53, 39, 0, 160, 300, null, "랜덤"],
+        [0, "윤규진", -1, 0, null, 53, 60, 38, 0, 160, 300, null, "랜덤"],
+        [0, "정우람", -1, 0, null, 81, 76, 79, 0, 160, 300, null, "랜덤"],
+        [0, "김태균", -1, 0, null, 91, 91, 36, 0, 160, 300, null, "필살"],
+        [0, "송광민", -1, 0, null, 80, 72, 19, 0, 160, 300, null, "랜덤"],
+        [0, "정근우", -1, 0, null, 86, 74, 87, 0, 160, 300, null, "랜덤"],
+        [0, "최진행", -1, 0, null, 57, 76, 12, 0, 160, 300, null, "랜덤", "약 좀 주세요"],
+        [0, "한용덕", -1, 0, null, 75, 76, 79, 0, 160, 300, null, "랜덤"],
+        [0, "구대성", -1, 0, null, 88, 86, 72, 0, 160, 300, null, "랜덤"],
+        [0, "유승안", -1, 0, null, 72, 73, 22, 0, 160, 300, null, "랜덤"],
+        [0, "정민철", -1, 0, null, 72, 79, 85, 0, 160, 300, null, "랜덤"],
+        [0, "장종훈", -1, 0, null, 81, 94, 83, 0, 160, 300, null, "무쌍", "신고선수의 전설"],
+        [0, "송진우", -1, 0, null, 80, 83, 86, 0, 160, 300, null, "환술"],
+        [0, "이강돈", -1, 0, null, 77, 72, 76, 0, 160, 300, null, "랜덤"],
+        [0, "이상목", -1, 0, null, 67, 73, 79, 0, 160, 300, null, "랜덤"],
+        [0, "한희민", -1, 0, null, 80, 58, 74, 0, 160, 300, null, "랜덤"],
+        [0, "류현진", -1, 0, null, 97, 98, 92, 0, 160, 300, null, "위압", "야구는 수비를 믿지 말고 내가 잘해야 이긴다"],
+        [0, "이정훈", -1, 0, null, 83, 60, 81, 0, 160, 300, null, "랜덤"],
+        [0, "이영우", -1, 0, null, 82, 79, 77, 0, 160, 300, null, "랜덤"],
+        [0, "동봉철", -1, 0, null, 63, 32, 77, 0, 160, 300, null, "랜덤"],
+        [0, "김현수", -1, 0, null, 88, 81, 48, 0, 160, 300, null, "랜덤", "사서 쓰라고"],
+        [0, "추신수", -1, 0, null, 99, 99, 96, 0, 160, 300, null, "무쌍", "Go! Choo! Go! Choo!"],
+        [0, "최원호", -1, 0, null, 55, 53, 53, 0, 160, 300, null, "랜덤"],
+        [0, "신명철", -1, 0, null, 41, 53, 76, 0, 160, 300, null, "랜덤"],
+        [0, "백재호", -1, 0, null, 44, 63, 22, 0, 160, 300, null, "랜덤"],
+        [0, "노장진", -1, 0, null, 64, 82, 48, 0, 160, 300, null, "랜덤"],
+        [0, "조용준", -1, 0, null, 86, 61, 69, 0, 160, 300, null, "랜덤"],
+        [0, "이진영", -1, 0, null, 86, 82, 79, 0, 160, 300, null, "랜덤", "어디로 던져도 난 머리에 맞는다"],
+        [0, "장원삼", -1, 0, null, 70, 80, 83, 0, 160, 300, null, "랜덤"],
+        [0, "고영민", -1, 0, null, 50, 45, 76, 0, 160, 300, null, "랜덤"],
+        [0, "옥스프링", -1, 0, null, 74, 68, 72, 0, 160, 300, null, "랜덤"],
+        [0, "사도스키", -1, 0, null, 68, 68, 76, 0, 160, 300, null, "랜덤"],
+        [0, "해커", -1, 0, null, 85, 88, 89, 0, 160, 300, null, "집중", "x까! x빨놈아!"],
+        [0, "브룸바", -1, 0, null, 84, 77, 22, 0, 160, 300, null, "랜덤"],
+        [0, "밴헤켄", -1, 0, null, 80, 82, 86, 0, 160, 300, null, "환술"],
+        [0, "레일리", -1, 0, null, 67, 74, 77, 0, 160, 300, null, "랜덤"],
+        [0, "그레이싱어", -1, 0, null, 75, 74, 67, 0, 160, 300, null, "랜덤"],
+        [0, "글로버", -1, 0, null, 72, 84, 50, 0, 160, 300, null, "랜덤"],
+        [0, "소사", -1, 0, null, 69, 80, 72, 0, 160, 300, null, "랜덤"],
+        [0, "레스", -1, 0, null, 76, 74, 51, 0, 160, 300, null, "랜덤"],
+        [0, "켈리", -1, 0, null, 73, 77, 70, 0, 160, 300, null, "랜덤"],
+        [0, "피어밴드", -1, 0, null, 70, 73, 77, 0, 160, 300, null, "랜덤"],
+        [0, "김종훈", -1, 0, null, 67, 54, 71, 0, 160, 300, null, "랜덤"],
+        [0, "김태한", -1, 0, null, 52, 41, 41, 0, 160, 300, null, "랜덤"],
+        [0, "류명선", -1, 0, null, 60, 54, 34, 0, 160, 300, null, "랜덤"],
+        [0, "박충식", -1, 0, null, 78, 61, 77, 0, 160, 300, null, "랜덤"],
+        [0, "전병호", -1, 0, null, 66, 41, 57, 0, 160, 300, null, "랜덤"],
+        [0, "김대익", -1, 0, null, 70, 34, 70, 0, 160, 300, null, "랜덤"],
+        [0, "김상진", -1, 0, null, 54, 41, 66, 0, 160, 300, null, "랜덤"],
+        [0, "김실", -1, 0, null, 55, 46, 57, 0, 160, 300, null, "랜덤"],
+        [0, "김종호", -1, 0, null, 76, 18, 78, 0, 160, 300, null, "랜덤"],
+        [0, "나광남", -1, 0, null, 18, 18, 18, 0, 160, 300, null, "랜덤", "오심도 경기의 일부입니다."],
+        [0, "박석진", -1, 0, null, 71, 49, 63, 0, 160, 300, null, "랜덤"],
+        [0, "손인호", -1, 0, null, 55, 32, 51, 0, 160, 300, null, "랜덤"],
+        [0, "김일경", -1, 0, null, 49, 12, 56, 0, 160, 300, null, "랜덤"],
+        [0, "최동수", -1, 0, null, 61, 33, 45, 0, 160, 300, null, "랜덤"],
+        [0, "송구홍", -1, 0, null, 57, 29, 48, 0, 160, 300, null, "랜덤"],
+        [0, "김광삼", -1, 0, null, 49, 23, 68, 0, 160, 300, null, "랜덤"],
+        [0, "류제국", -1, 0, null, 70, 46, 81, 0, 160, 300, null, "랜덤"],
+        [0, "임찬규", -1, 0, null, 59, 55, 60, 0, 160, 300, null, "랜덤"],
+        [0, "진해수", -1, 0, null, 49, 63, 50, 0, 160, 300, null, "랜덤"],
+        [0, "백승현", -1, 0, null, 40, 54, 55, 0, 160, 300, null, "랜덤"],
+        [0, "김용의", -1, 0, null, 60, 41, 35, 0, 160, 300, null, "랜덤"],
+        [0, "박지철", -1, 0, null, 70, 51, 62, 0, 160, 300, null, "랜덤"],
+        [0, "강성우", -1, 0, null, 77, 21, 61, 0, 160, 300, null, "랜덤"],
+        [0, "한문연", -1, 0, null, 70, 51, 36, 0, 160, 300, null, "랜덤"],
+        [0, "김민호", -1, 0, null, 82, 73, 31, 0, 160, 300, null, "랜덤"],
+        [0, "유두열", -1, 0, null, 73, 54, 67, 0, 160, 300, null, "랜덤"],
+        [0, "이종운", -1, 0, null, 76, 12, 81, 0, 160, 300, null, "랜덤"],
+        [0, "박현승", -1, 0, null, 49, 46, 23, 0, 160, 300, null, "랜덤"],
+        [0, "고원준", -1, 0, null, 47, 41, 43, 0, 160, 300, null, "랜덤"],
+        [0, "문동환", -1, 0, null, 79, 69, 45, 0, 160, 300, null, "랜덤"],
+        [0, "박동수", -1, 0, null, 73, 64, 52, 0, 160, 300, null, "랜덤"],
+        [0, "이현곤", -1, 0, null, 66, 42, 36, 0, 160, 300, null, "랜덤", "광고니! 제가 타석에 서면 다음은 광고입니다."],
+        [0, "신용운", -1, 0, null, 60, 66, 67, 0, 160, 300, null, "랜덤"],
+        [0, "장문석", -1, 0, null, 68, 41, 78, 0, 160, 300, null, "랜덤"],
+        [0, "이병훈", -1, 0, null, 71, 24, 70, 0, 160, 300, null, "랜덤"],
+        [0, "이상화", -1, 0, null, 51, 48, 44, 0, 160, 300, null, "랜덤"],
+        [0, "손영민", -1, 0, null, 55, 41, 49, 0, 160, 300, null, "랜덤"],
+        [0, "곽정철", -1, 0, null, 57, 55, 54, 0, 160, 300, null, "랜덤"],
+        [0, "이범석", -1, 0, null, 67, 41, 54, 0, 160, 300, null, "랜덤"],
+        [0, "조도연", -1, 0, null, 70, 66, 54, 0, 160, 300, null, "랜덤"],
+        [0, "김무종", -1, 0, null, 66, 55, 41, 0, 160, 300, null, "랜덤"],
+        [0, "강봉규", -1, 0, null, 70, 67, 44, 0, 160, 300, null, "랜덤"],
+        [0, "김진욱", -1, 0, null, 51, 55, 41, 0, 160, 300, null, "랜덤"],
+        [0, "변진수", -1, 0, null, 40, 51, 48, 0, 160, 300, null, "랜덤"],
+        [0, "손혁", -1, 0, null, 59, 58, 61, 0, 160, 300, null, "랜덤"],
+        [0, "오재일", -1, 0, null, 58, 71, 41, 0, 160, 300, null, "랜덤"],
+        [0, "이도형", -1, 0, null, 43, 61, 40, 0, 160, 300, null, "랜덤"],
+        [0, "이원석", -1, 0, null, 50, 60, 34, 0, 160, 300, null, "랜덤"],
+        [0, "진야곱", -1, 0, null, 48, 51, 47, 0, 160, 300, null, "랜덤"],
+        [0, "채상병", -1, 0, null, 41, 43, 61, 0, 160, 300, null, "랜덤"],
+        [0, "추성건", -1, 0, null, 40, 50, 61, 0, 160, 300, null, "랜덤"],
+        [0, "홍원기", -1, 0, null, 51, 43, 66, 0, 160, 300, null, "랜덤"],
+        [0, "가내영", -1, 0, null, 46, 42, 51, 0, 160, 300, null, "랜덤"],
+        [0, "김신부", -1, 0, null, 51, 36, 41, 0, 160, 300, null, "랜덤"],
+        [0, "김홍집", -1, 0, null, 61, 51, 66, 0, 160, 300, null, "랜덤"],
+        [0, "안병원", -1, 0, null, 59, 41, 71, 0, 160, 300, null, "랜덤"],
+        [0, "임호균", -1, 0, null, 66, 46, 73, 0, 160, 300, null, "랜덤"],
+        [0, "조웅천", -1, 0, null, 82, 67, 84, 0, 160, 300, null, "랜덤"],
+        [0, "최창호", -1, 0, null, 83, 71, 79, 0, 160, 300, null, "랜덤"],
+        [0, "김동기", -1, 0, null, 62, 81, 22, 0, 160, 300, null, "랜덤"],
+        [0, "김바위", -1, 0, null, 44, 70, 23, 0, 160, 300, null, "랜덤"],
+        [0, "김성갑", -1, 0, null, 50, 44, 61, 0, 160, 300, null, "랜덤"],
+        [0, "김기덕", -1, 0, null, 60, 23, 66, 0, 160, 300, null, "랜덤"],
+        [0, "김호", -1, 0, null, 53, 32, 71, 0, 160, 300, null, "랜덤"],
+        [0, "김광림", -1, 0, null, 61, 60, 60, 0, 160, 300, null, "랜덤"],
+        [0, "조원우", -1, 0, null, 59, 41, 63, 0, 160, 300, null, "랜덤"],
+        [0, "심성보", -1, 0, null, 54, 56, 41, 0, 160, 300, null, "랜덤"],
+        [0, "오봉옥", -1, 0, null, 43, 41, 61, 0, 160, 300, null, "랜덤"],
+        [0, "구대진", -1, 0, null, 40, 32, 36, 0, 160, 300, null, "랜덤"],
+        [0, "최해식", -1, 0, null, 57, 41, 60, 0, 160, 300, null, "랜덤"],
+        [0, "이종두", -1, 0, null, 70, 31, 70, 0, 160, 300, null, "랜덤"],
+        [0, "노진혁", -1, 0, null, 51, 43, 45, 0, 160, 300, null, "랜덤"],
+        [0, "김건우", -1, 0, null, 78, 61, 60, 0, 160, 300, null, "랜덤"],
+        [0, "이용철", -1, 0, null, 71, 77, 42, 0, 160, 300, null, "랜덤"],
+        [0, "오재영", -1, 0, null, 69, 68, 71, 0, 160, 300, null, "랜덤"],
+        [0, "배영섭", -1, 0, null, 70, 16, 81, 0, 160, 300, null, "랜덤"],
+        [0, "구자욱", -1, 0, null, 73, 59, 72, 0, 160, 300, null, "랜덤"],
+        [0, "신재영", -1, 0, null, 64, 66, 62, 0, 160, 300, null, "랜덤"]
     ],	
     "general_ex":[
     ],
@@ -287,6 +365,7 @@
 
     ],
     "history":[
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>제작자: 세정.",
         "<C>●</>180년 1월:<L><b>【이벤트】</b></>KBO 올스타가 삼모전과 함께합니다."
     ],
     "initialEvents":[

From 6b2000bb39750039bacc4dcb453176e7025ab8da Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 29 Apr 2018 00:53:49 +0900
Subject: [PATCH 181/184] =?UTF-8?q?=EC=98=AC=EC=8A=A4=ED=83=80=EC=A0=84=20?=
 =?UTF-8?q?=EB=82=B4=ED=8A=B9/=EC=A0=84=ED=8A=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/scenario/scenario_30.json | 640 +++++++++++++++++-----------------
 1 file changed, 320 insertions(+), 320 deletions(-)

diff --git a/hwe/scenario/scenario_30.json b/hwe/scenario/scenario_30.json
index 00d587b3..7060459b 100644
--- a/hwe/scenario/scenario_30.json
+++ b/hwe/scenario/scenario_30.json
@@ -7,357 +7,357 @@
     "diplomacy":[
     ],
     "general":[
-        [0, "김일융", -1, 0, null, 88, 83, 79, 0, 160, 300, null, "랜덤"],
+        [0, "김일융", -1, 0, null, 88, 83, 79, 0, 160, 300, null, null],
         [0, "이승엽", -1, 0, null, 90, 108, 37, 0, 160, 300, null, "위압", "안녕하세요 국민타자 이승엽입니다."],
-        [0, "마해영", -1, 0, null, 84, 84, 22, 0, 160, 300, null, "랜덤"],
-        [0, "채태인", -1, 0, null, 86, 54, 15, 0, 160, 300, null, "랜덤", "신대륙은 어디에…"],
-        [0, "김성래", -1, 0, null, 75, 86, 19, 0, 160, 300, null, "랜덤"],
-        [0, "강기웅", -1, 0, null, 82, 61, 83, 0, 160, 300, null, "랜덤"],
-        [0, "나바로", -1, 0, null, 82, 85, 79, 0, 160, 300, null, "랜덤"],
-        [0, "김한수", -1, 0, null, 80, 82, 48, 0, 160, 300, null, "랜덤"],
-        [0, "조동찬", -1, 0, null, 55, 68, 75, 0, 160, 300, null, "랜덤"],
-        [0, "류중일", -1, 0, null, 68, 34, 78, 0, 160, 300, null, "랜덤", "내 아들 상수야…"],
-        [0, "김상수", -1, 0, null, 68, 21, 80, 0, 160, 300, null, "랜덤", "예 아부지…"],
-        [0, "박진만", -1, 0, null, 72, 78, 69, 0, 160, 300, null, "랜덤"],
+        [0, "마해영", -1, 0, null, 84, 84, 22, 0, 160, 300, null, null],
+        [0, "채태인", -1, 0, null, 86, 54, 15, 0, 160, 300, null, null, "신대륙은 어디에…"],
+        [0, "김성래", -1, 0, null, 75, 86, 19, 0, 160, 300, null, null],
+        [0, "강기웅", -1, 0, null, 82, 61, 83, 0, 160, 300, null, null],
+        [0, "나바로", -1, 0, null, 82, 85, 79, 0, 160, 300, null, null],
+        [0, "김한수", -1, 0, null, 80, 82, 48, 0, 160, 300, null, null],
+        [0, "조동찬", -1, 0, null, 55, 68, 75, 0, 160, 300, null, null],
+        [0, "류중일", -1, 0, null, 68, 34, 78, 0, 160, 300, null, null, "내 아들 상수야…"],
+        [0, "김상수", -1, 0, null, 68, 21, 80, 0, 160, 300, null, null, "예 아부지…"],
+        [0, "박진만", -1, 0, null, 72, 78, 69, 0, 160, 300, null, null],
         [0, "양준혁", -1, 0, null, 97, 98, 91, 0, 160, 300, null, "무쌍", "내보다 강미노가 머리 더 큰데?"],
-        [0, "박한이", -1, 0, null, 83, 77, 79, 0, 160, 300, null, "랜덤", "킁킁"],
-        [0, "최형우", -1, 0, null, 87, 86, 20, 0, 160, 300, null, "랜덤"],
-        [0, "장효조", -1, 0, null, 95, 39, 68, 0, 160, 300, null, "랜덤"],
-        [0, "동봉철", -1, 0, null, 65, 41, 74, 0, 160, 300, null, "랜덤"],
-        [0, "강동우", -1, 0, null, 67, 53, 79, 0, 160, 300, null, "랜덤"],
-        [0, "신동주", -1, 0, null, 68, 71, 76, 0, 160, 300, null, "랜덤"],
+        [0, "박한이", -1, 0, null, 83, 77, 79, 0, 160, 300, null, null, "킁킁"],
+        [0, "최형우", -1, 0, null, 87, 86, 20, 0, 160, 300, null, null],
+        [0, "장효조", -1, 0, null, 95, 39, 68, 0, 160, 300, null, null],
+        [0, "동봉철", -1, 0, null, 65, 41, 74, 0, 160, 300, null, null],
+        [0, "강동우", -1, 0, null, 67, 53, 79, 0, 160, 300, null, null],
+        [0, "신동주", -1, 0, null, 68, 71, 76, 0, 160, 300, null, null],
         [0, "이만수", -1, 0, null, 89, 97, 49, 0, 160, 300, null, "필살"],
-        [0, "진갑용", -1, 0, null, 74, 80, 15, 0, 160, 300, null, "랜덤"],
-        [0, "김시진", -1, 0, null, 84, 88, 75, 0, 160, 300, null, "랜덤"],
-        [0, "배영수", -1, 0, null, 79, 86, 87, 0, 160, 300, null, "랜덤"],
-        [0, "윤성환", -1, 0, null, 74, 86, 87, 0, 160, 300, null, "랜덤"],
-        [0, "안지만", -1, 0, null, 69, 79, 75, 0, 160, 300, null, "랜덤"],
-        [0, "김현욱", -1, 0, null, 82, 85, 84, 0, 160, 300, null, "랜덤"],
-        [0, "정현욱", -1, 0, null, 74, 83, 77, 0, 160, 300, null, "랜덤"],
-        [0, "권혁", -1, 0, null, 75, 86, 62, 0, 160, 300, null, "랜덤"],
-        [0, "임창용", -1, 0, null, 83, 86, 80, 0, 160, 300, null, "랜덤"],
+        [0, "진갑용", -1, 0, null, 74, 80, 15, 0, 160, 300, null, null],
+        [0, "김시진", -1, 0, null, 84, 88, 75, 0, 160, 300, null, null],
+        [0, "배영수", -1, 0, null, 79, 86, 87, 0, 160, 300, null, null],
+        [0, "윤성환", -1, 0, null, 74, 86, 87, 0, 160, 300, null, null],
+        [0, "안지만", -1, 0, null, 69, 79, 75, 0, 160, 300, null, null],
+        [0, "김현욱", -1, 0, null, 82, 85, 84, 0, 160, 300, null, null],
+        [0, "정현욱", -1, 0, null, 74, 83, 77, 0, 160, 300, null, null],
+        [0, "권혁", -1, 0, null, 75, 86, 62, 0, 160, 300, null, null],
+        [0, "임창용", -1, 0, null, 83, 86, 80, 0, 160, 300, null, null],
         [0, "오승환", -1, 0, null, 97, 92, 89, 0, 160, 300, null, "위압"],
-        [0, "권영호", -1, 0, null, 83, 53, 76, 0, 160, 300, null, "랜덤"],
-        [0, "이선희", -1, 0, null, 83, 49, 74, 0, 160, 300, null, "랜덤"],
-        [0, "공필성", -1, 0, null, 46, 47, 77, 0, 160, 300, null, "랜덤"],
-        [0, "양상문", -1, 0, null, 76, 54, 76, 0, 160, 300, null, "랜덤"],
-        [0, "윤형배", -1, 0, null, 77, 69, 73, 0, 160, 300, null, "랜덤"],
-        [0, "박정태", -1, 0, null, 84, 74, 39, 0, 160, 300, null, "랜덤"],
-        [0, "주형광", -1, 0, null, 79, 86, 84, 0, 160, 300, null, "랜덤"],
-        [0, "강영식", -1, 0, null, 63, 69, 60, 0, 160, 300, null, "랜덤"],
-        [0, "김사율", -1, 0, null, 74, 66, 67, 0, 160, 300, null, "랜덤"],
-        [0, "배장호", -1, 0, null, 62, 48, 60, 0, 160, 300, null, "랜덤"],
-        [0, "손민한", -1, 0, null, 85, 84, 94, 0, 160, 300, null, "랜덤", "팝콘이 먹고싶다"],
-        [0, "송승준", -1, 0, null, 65, 84, 67, 0, 160, 300, null, "랜덤"],
-        [0, "이용훈", -1, 0, null, 48, 58, 63, 0, 160, 300, null, "랜덤"],
-        [0, "임경완", -1, 0, null, 68, 57, 39, 0, 160, 300, null, "랜덤"],
-        [0, "장원준", -1, 0, null, 75, 83, 74, 0, 160, 300, null, "랜덤"],
-        [0, "조정훈", -1, 0, null, 67, 59, 79, 0, 160, 300, null, "랜덤"],
-        [0, "최대성", -1, 0, null, 69, 63, 38, 0, 160, 300, null, "랜덤"],
-        [0, "허준혁", -1, 0, null, 58, 51, 48, 0, 160, 300, null, "랜덤"],
-        [0, "강민호", -1, 0, null, 75, 86, 48, 0, 160, 300, null, "랜덤", "모텔에 간민호"],
-        [0, "최기문", -1, 0, null, 65, 37, 64, 0, 160, 300, null, "랜덤"],
-        [0, "임수혁", -1, 0, null, 67, 44, 56, 0, 160, 300, null, "랜덤"],
-        [0, "김주찬", -1, 0, null, 75, 53, 88, 0, 160, 300, null, "랜덤"],
-        [0, "문규현", -1, 0, null, 46, 22, 49, 0, 160, 300, null, "랜덤"],
-        [0, "박기혁", -1, 0, null, 48, 25, 70, 0, 160, 300, null, "랜덤"],
+        [0, "권영호", -1, 0, null, 83, 53, 76, 0, 160, 300, null, null],
+        [0, "이선희", -1, 0, null, 83, 49, 74, 0, 160, 300, null, null],
+        [0, "공필성", -1, 0, null, 46, 47, 77, 0, 160, 300, null, null],
+        [0, "양상문", -1, 0, null, 76, 54, 76, 0, 160, 300, null, null],
+        [0, "윤형배", -1, 0, null, 77, 69, 73, 0, 160, 300, null, null],
+        [0, "박정태", -1, 0, null, 84, 74, 39, 0, 160, 300, null, null],
+        [0, "주형광", -1, 0, null, 79, 86, 84, 0, 160, 300, null, null],
+        [0, "강영식", -1, 0, null, 63, 69, 60, 0, 160, 300, null, null],
+        [0, "김사율", -1, 0, null, 74, 66, 67, 0, 160, 300, null, null],
+        [0, "배장호", -1, 0, null, 62, 48, 60, 0, 160, 300, null, null],
+        [0, "손민한", -1, 0, null, 85, 84, 94, 0, 160, 300, null, null, "팝콘이 먹고싶다"],
+        [0, "송승준", -1, 0, null, 65, 84, 67, 0, 160, 300, null, null],
+        [0, "이용훈", -1, 0, null, 48, 58, 63, 0, 160, 300, null, null],
+        [0, "임경완", -1, 0, null, 68, 57, 39, 0, 160, 300, null, null],
+        [0, "장원준", -1, 0, null, 75, 83, 74, 0, 160, 300, null, null],
+        [0, "조정훈", -1, 0, null, 67, 59, 79, 0, 160, 300, null, null],
+        [0, "최대성", -1, 0, null, 69, 63, 38, 0, 160, 300, null, null],
+        [0, "허준혁", -1, 0, null, 58, 51, 48, 0, 160, 300, null, null],
+        [0, "강민호", -1, 0, null, 75, 86, 48, 0, 160, 300, null, null, "모텔에 간민호"],
+        [0, "최기문", -1, 0, null, 65, 37, 64, 0, 160, 300, null, null],
+        [0, "임수혁", -1, 0, null, 67, 44, 56, 0, 160, 300, null, null],
+        [0, "김주찬", -1, 0, null, 75, 53, 88, 0, 160, 300, null, null],
+        [0, "문규현", -1, 0, null, 46, 22, 49, 0, 160, 300, null, null],
+        [0, "박기혁", -1, 0, null, 48, 25, 70, 0, 160, 300, null, null],
         [0, "이대호", -1, 0, null, 95, 98, 10, 0, 160, 300, null, "무쌍", "마 니 일로 내리와 "],
-        [0, "전준우", -1, 0, null, 80, 72, 75, 0, 160, 300, null, "랜덤", "홈런! 홈런!....아냐?"],
-        [0, "손아섭", -1, 0, null, 89, 75, 82, 0, 160, 300, null, "랜덤"],
-        [0, "홍성흔", -1, 0, null, 86, 77, 53, 0, 160, 300, null, "랜덤"],
-        [0, "조성환", -1, 0, null, 79, 42, 77, 0, 160, 300, null, "랜덤"],
-        [0, "가르시아", -1, 0, null, 70, 85, 12, 0, 160, 300, null, "랜덤"],
-        [0, "정보명", -1, 0, null, 69, 31, 39, 0, 160, 300, null, "랜덤"],
-        [0, "이재곤", -1, 0, null, 40, 41, 39, 0, 160, 300, null, "랜덤"],
-        [0, "염종석", -1, 0, null, 83, 90, 93, 0, 160, 300, null, "랜덤"],
-        [0, "황재균", -1, 0, null, 79, 77, 83, 0, 160, 300, null, "랜덤", "안녕하세요 섹머입니다"],
-        [0, "윤학길", -1, 0, null, 81, 76, 82, 0, 160, 300, null, "랜덤"],
-        [0, "가득염", -1, 0, null, 60, 67, 61, 0, 160, 300, null, "랜덤"],
-        [0, "조경환", -1, 0, null, 57, 78, 20, 0, 160, 300, null, "랜덤"],
-        [0, "강상수", -1, 0, null, 65, 66, 58, 0, 160, 300, null, "랜덤"],
-        [0, "최준석", -1, 0, null, 79, 86, 10, 0, 160, 300, null, "랜덤"],
+        [0, "전준우", -1, 0, null, 80, 72, 75, 0, 160, 300, null, null, "홈런! 홈런!....아냐?"],
+        [0, "손아섭", -1, 0, null, 89, 75, 82, 0, 160, 300, null, null],
+        [0, "홍성흔", -1, 0, null, 86, 77, 53, 0, 160, 300, null, null],
+        [0, "조성환", -1, 0, null, 79, 42, 77, 0, 160, 300, null, null],
+        [0, "가르시아", -1, 0, null, 70, 85, 12, 0, 160, 300, null, null],
+        [0, "정보명", -1, 0, null, 69, 31, 39, 0, 160, 300, null, null],
+        [0, "이재곤", -1, 0, null, 40, 41, 39, 0, 160, 300, null, null],
+        [0, "염종석", -1, 0, null, 83, 90, 93, 0, 160, 300, null, null],
+        [0, "황재균", -1, 0, null, 79, 77, 83, 0, 160, 300, null, null, "안녕하세요 섹머입니다"],
+        [0, "윤학길", -1, 0, null, 81, 76, 82, 0, 160, 300, null, null],
+        [0, "가득염", -1, 0, null, 60, 67, 61, 0, 160, 300, null, null],
+        [0, "조경환", -1, 0, null, 57, 78, 20, 0, 160, 300, null, null],
+        [0, "강상수", -1, 0, null, 65, 66, 58, 0, 160, 300, null, null],
+        [0, "최준석", -1, 0, null, 79, 86, 10, 0, 160, 300, null, null],
         [0, "최동원", -1, 0, null, 98, 94, 96, 0, 160, 300, null, "환술", "무쇠팔 최동원"],
-        [0, "김용철", -1, 0, null, 77, 79, 67, 0, 160, 300, null, "랜덤"],
-        [0, "김용희", -1, 0, null, 67, 64, 21, 0, 160, 300, null, "랜덤"],
-        [0, "호세", -1, 0, null, 88, 86, 39, 0, 160, 300, null, "랜덤", "헤이 영쑤! 돈 두 댓!"],
-        [0, "감사용", -1, 0, null, 37, 18, 65, 0, 160, 300, null, "랜덤"],
-        [0, "금광옥", -1, 0, null, 31, 30, 39, 0, 160, 300, null, "랜덤"],
-        [0, "김무관", -1, 0, null, 20, 7, 43, 0, 160, 300, null, "랜덤"],
-        [0, "양승관", -1, 0, null, 46, 44, 22, 0, 160, 300, null, "랜덤"],
+        [0, "김용철", -1, 0, null, 77, 79, 67, 0, 160, 300, null, null],
+        [0, "김용희", -1, 0, null, 67, 64, 21, 0, 160, 300, null, null],
+        [0, "호세", -1, 0, null, 88, 86, 39, 0, 160, 300, null, null, "헤이 영쑤! 돈 두 댓!"],
+        [0, "감사용", -1, 0, null, 37, 18, 65, 0, 160, 300, null, null],
+        [0, "금광옥", -1, 0, null, 31, 30, 39, 0, 160, 300, null, null],
+        [0, "김무관", -1, 0, null, 20, 7, 43, 0, 160, 300, null, null],
+        [0, "양승관", -1, 0, null, 46, 44, 22, 0, 160, 300, null, null],
         [0, "박철순", -1, 0, null, 89, 82, 80, 0, 160, 300, null, "무쌍"],
-        [0, "하기룡", -1, 0, null, 82, 58, 64, 0, 160, 300, null, "랜덤"],
-        [0, "황규봉", -1, 0, null, 83, 48, 72, 0, 160, 300, null, "랜덤"],
-        [0, "계형철", -1, 0, null, 74, 75, 70, 0, 160, 300, null, "랜덤"],
-        [0, "김경문", -1, 0, null, 48, 9, 34, 0, 160, 300, null, "랜덤"],
-        [0, "조범현", -1, 0, null, 29, 25, 83, 0, 160, 300, null, "랜덤"],
-        [0, "백인천", -1, 0, null, 95, 77, 66, 0, 160, 300, null, "랜덤"],
-        [0, "김인식", -1, 0, null, 58, 15, 75, 0, 160, 300, null, "랜덤"],
-        [0, "김재박", -1, 0, null, 73, 29, 91, 0, 160, 300, null, "랜덤"],
-        [0, "박정현", -1, 0, null, 82, 78, 80, 0, 160, 300, null, "랜덤"],
-        [0, "전준호", -1, 0, null, 79, 42, 101, 0, 160, 300, null, "랜덤", "전설의 대도"],
-        [0, "심정수", -1, 0, null, 80, 92, 41, 0, 160, 300, null, "랜덤"],
+        [0, "하기룡", -1, 0, null, 82, 58, 64, 0, 160, 300, null, null],
+        [0, "황규봉", -1, 0, null, 83, 48, 72, 0, 160, 300, null, null],
+        [0, "계형철", -1, 0, null, 74, 75, 70, 0, 160, 300, null, null],
+        [0, "김경문", -1, 0, null, 48, 9, 34, 0, 160, 300, null, null],
+        [0, "조범현", -1, 0, null, 29, 25, 83, 0, 160, 300, null, null],
+        [0, "백인천", -1, 0, null, 95, 77, 66, 0, 160, 300, null, null],
+        [0, "김인식", -1, 0, null, 58, 15, 75, 0, 160, 300, null, null],
+        [0, "김재박", -1, 0, null, 73, 29, 91, 0, 160, 300, null, null],
+        [0, "박정현", -1, 0, null, 82, 78, 80, 0, 160, 300, null, null],
+        [0, "전준호", -1, 0, null, 79, 42, 101, 0, 160, 300, null, null, "전설의 대도"],
+        [0, "심정수", -1, 0, null, 80, 92, 41, 0, 160, 300, null, null],
         [0, "박재홍", -1, 0, null, 87, 95, 94, 0, 160, 300, null, "무쌍"],
-        [0, "박경완", -1, 0, null, 48, 89, 79, 0, 160, 300, null, "랜덤"],
-        [0, "박종호", -1, 0, null, 76, 76, 81, 0, 160, 300, null, "랜덤"],
-        [0, "이숭용", -1, 0, null, 81, 83, 67, 0, 160, 300, null, "랜덤"],
-        [0, "송지만", -1, 0, null, 78, 89, 86, 0, 160, 300, null, "랜덤"],
-        [0, "나이트", -1, 0, null, 75, 79, 82, 0, 160, 300, null, "랜덤"],
-        [0, "송신영", -1, 0, null, 67, 69, 69, 0, 160, 300, null, "랜덤"],
-        [0, "이택근", -1, 0, null, 86, 80, 83, 0, 160, 300, null, "랜덤"],
-        [0, "위재영", -1, 0, null, 80, 69, 67, 0, 160, 300, null, "랜덤"],
-        [0, "김성래", -1, 0, null, 77, 81, 23, 0, 160, 300, null, "랜덤"],
-        [0, "데이비스", -1, 0, null, 89, 83, 77, 0, 160, 300, null, "랜덤"],
-        [0, "임선동", -1, 0, null, 67, 72, 76, 0, 160, 300, null, "랜덤"],
+        [0, "박경완", -1, 0, null, 48, 89, 79, 0, 160, 300, null, null],
+        [0, "박종호", -1, 0, null, 76, 76, 81, 0, 160, 300, null, null],
+        [0, "이숭용", -1, 0, null, 81, 83, 67, 0, 160, 300, null, null],
+        [0, "송지만", -1, 0, null, 78, 89, 86, 0, 160, 300, null, null],
+        [0, "나이트", -1, 0, null, 75, 79, 82, 0, 160, 300, null, null],
+        [0, "송신영", -1, 0, null, 67, 69, 69, 0, 160, 300, null, null],
+        [0, "이택근", -1, 0, null, 86, 80, 83, 0, 160, 300, null, null],
+        [0, "위재영", -1, 0, null, 80, 69, 67, 0, 160, 300, null, null],
+        [0, "김성래", -1, 0, null, 77, 81, 23, 0, 160, 300, null, null],
+        [0, "데이비스", -1, 0, null, 89, 83, 77, 0, 160, 300, null, null],
+        [0, "임선동", -1, 0, null, 67, 72, 76, 0, 160, 300, null, null],
         [0, "우즈", -1, 0, null, 89, 90, 36, 0, 160, 300, null, "필살"],
-        [0, "성준", -1, 0, null, 78, 58, 67, 0, 160, 300, null, "랜덤"],
-        [0, "장명부", -1, 0, null, 84, 82, 76, 0, 160, 300, null, "랜덤"],
-        [0, "정명원", -1, 0, null, 89, 84, 76, 0, 160, 300, null, "랜덤"],
-        [0, "김응국", -1, 0, null, 82, 79, 86, 0, 160, 300, null, "랜덤"],
-        [0, "강정호", -1, 0, null, 81, 81, 48, 0, 160, 300, null, "랜덤"],
+        [0, "성준", -1, 0, null, 78, 58, 67, 0, 160, 300, null, null],
+        [0, "장명부", -1, 0, null, 84, 82, 76, 0, 160, 300, null, null],
+        [0, "정명원", -1, 0, null, 89, 84, 76, 0, 160, 300, null, null],
+        [0, "김응국", -1, 0, null, 82, 79, 86, 0, 160, 300, null, null],
+        [0, "강정호", -1, 0, null, 81, 81, 48, 0, 160, 300, null, null],
         [0, "박병호", -1, 0, null, 80, 95, 56, 0, 160, 300, null, "위압"],
-        [0, "김민성", -1, 0, null, 79, 80, 38, 0, 160, 300, null, "랜덤"],
+        [0, "김민성", -1, 0, null, 79, 80, 38, 0, 160, 300, null, null],
         [0, "서건창", -1, 0, null, 94, 26, 91, 0, 160, 300, null, "환술"],
-        [0, "김하성", -1, 0, null, 80, 63, 69, 0, 160, 300, null, "랜덤"],
-        [0, "이정후", -1, 0, null, 86, 8, 15, 0, 160, 300, null, "랜덤"],
-        [0, "정민태", -1, 0, null, 77, 78, 82, 0, 160, 300, null, "랜덤"],
-        [0, "정경배", -1, 0, null, 64, 76, 67, 0, 160, 300, null, "랜덤"],
-        [0, "김기태", -1, 0, null, 86, 90, 76, 0, 160, 300, null, "랜덤"],
-        [0, "이승호", -1, 0, null, 71, 80, 53, 0, 160, 300, null, "랜덤"],
+        [0, "김하성", -1, 0, null, 80, 63, 69, 0, 160, 300, null, null],
+        [0, "이정후", -1, 0, null, 86, 8, 15, 0, 160, 300, null, null],
+        [0, "정민태", -1, 0, null, 77, 78, 82, 0, 160, 300, null, null],
+        [0, "정경배", -1, 0, null, 64, 76, 67, 0, 160, 300, null, null],
+        [0, "김기태", -1, 0, null, 86, 90, 76, 0, 160, 300, null, null],
+        [0, "이승호", -1, 0, null, 71, 80, 53, 0, 160, 300, null, null],
         [0, "김광현", -1, 0, null, 84, 90, 86, 0, 160, 300, null, "무쌍", "제가 현진이형보단 낫죠"],
-        [0, "박정배", -1, 0, null, 62, 63, 67, 0, 160, 300, null, "랜덤"],
-        [0, "채병용", -1, 0, null, 68, 77, 79, 0, 160, 300, null, "랜덤"],
-        [0, "윤희상", -1, 0, null, 56, 58, 67, 0, 160, 300, null, "랜덤"],
-        [0, "이재원", -1, 0, null, 83, 67, 10, 0, 160, 300, null, "랜덤"],
-        [0, "박정권", -1, 0, null, 78, 83, 53, 0, 160, 300, null, "랜덤"],
-        [0, "나주환", -1, 0, null, 68, 67, 72, 0, 160, 300, null, "랜덤"],
+        [0, "박정배", -1, 0, null, 62, 63, 67, 0, 160, 300, null, null],
+        [0, "채병용", -1, 0, null, 68, 77, 79, 0, 160, 300, null, null],
+        [0, "윤희상", -1, 0, null, 56, 58, 67, 0, 160, 300, null, null],
+        [0, "이재원", -1, 0, null, 83, 67, 10, 0, 160, 300, null, null],
+        [0, "박정권", -1, 0, null, 78, 83, 53, 0, 160, 300, null, null],
+        [0, "나주환", -1, 0, null, 68, 67, 72, 0, 160, 300, null, null],
         [0, "최정", -1, 0, null, 89, 91, 88, 0, 160, 300, null, "무쌍"],
-        [0, "조동화", -1, 0, null, 48, 11, 83, 0, 160, 300, null, "랜덤"],
-        [0, "김강민", -1, 0, null, 77, 77, 82, 0, 160, 300, null, "랜덤"],
+        [0, "조동화", -1, 0, null, 48, 11, 83, 0, 160, 300, null, null],
+        [0, "김강민", -1, 0, null, 77, 77, 82, 0, 160, 300, null, null],
         [0, "박용택", -1, 0, null, 92, 90, 92, 0, 160, 300, null, "신중", "팬 여러분 올해는 유광잠바 준비하셔야 될 겁니다"],
         [0, "이병규", -1, 0, null, 93, 90, 89, 0, 160, 300, null, "필살"],
-        [0, "조인성", -1, 0, null, 49, 86, 25, 0, 160, 300, null, "랜덤"],
-        [0, "김동수", -1, 0, null, 65, 86, 65, 0, 160, 300, null, "랜덤"],
-        [0, "유지현", -1, 0, null, 76, 57, 87, 0, 160, 300, null, "랜덤"],
-        [0, "김재현", -1, 0, null, 85, 86, 77, 0, 160, 300, null, "랜덤"],
+        [0, "조인성", -1, 0, null, 49, 86, 25, 0, 160, 300, null, null],
+        [0, "김동수", -1, 0, null, 65, 86, 65, 0, 160, 300, null, null],
+        [0, "유지현", -1, 0, null, 76, 57, 87, 0, 160, 300, null, null],
+        [0, "김재현", -1, 0, null, 85, 86, 77, 0, 160, 300, null, null],
         [0, "이상훈", -1, 0, null, 95, 90, 87, 0, 160, 300, null, "무쌍"],
-        [0, "서용빈", -1, 0, null, 81, 22, 87, 0, 160, 300, null, "랜덤"],
-        [0, "봉중근", -1, 0, null, 77, 68, 44, 0, 160, 300, null, "랜덤"],
-        [0, "차우찬", -1, 0, null, 67, 82, 49, 0, 160, 300, null, "랜덤"],
-        [0, "오지환", -1, 0, null, 57, 68, 80, 0, 160, 300, null, "랜덤", "경기를 지배하는 오지배입니다"],
-        [0, "금민철", -1, 0, null, 61, 50, 42, 0, 160, 300, null, "랜덤"],
+        [0, "서용빈", -1, 0, null, 81, 22, 87, 0, 160, 300, null, null],
+        [0, "봉중근", -1, 0, null, 77, 68, 44, 0, 160, 300, null, null],
+        [0, "차우찬", -1, 0, null, 67, 82, 49, 0, 160, 300, null, null],
+        [0, "오지환", -1, 0, null, 57, 68, 80, 0, 160, 300, null, null, "경기를 지배하는 오지배입니다"],
+        [0, "금민철", -1, 0, null, 61, 50, 42, 0, 160, 300, null, null],
         [0, "김동주", -1, 0, null, 92, 92, 48, 0, 160, 300, null, "위압"],
-        [0, "김선우", -1, 0, null, 65, 67, 74, 0, 160, 300, null, "랜덤"],
-        [0, "김재호", -1, 0, null, 68, 21, 58, 0, 160, 300, null, "랜덤"],
-        [0, "노경은", -1, 0, null, 48, 59, 61, 0, 160, 300, null, "랜덤"],
-        [0, "니퍼트", -1, 0, null, 76, 88, 67, 0, 160, 300, null, "랜덤"],
-        [0, "류택현", -1, 0, null, 65, 79, 63, 0, 160, 300, null, "랜덤"],
-        [0, "민병헌", -1, 0, null, 84, 53, 81, 0, 160, 300, null, "랜덤"],
-        [0, "박명환", -1, 0, null, 72, 80, 41, 0, 160, 300, null, "랜덤", "배추 좀 주세요"],
-        [0, "안경현", -1, 0, null, 67, 78, 34, 0, 160, 300, null, "랜덤"],
-        [0, "양의지", -1, 0, null, 83, 77, 39, 0, 160, 300, null, "랜덤"],
-        [0, "오재원", -1, 0, null, 67, 30, 87, 0, 160, 300, null, "랜덤", "식빵!"],
-        [0, "유희관", -1, 0, null, 65, 76, 69, 0, 160, 300, null, "랜덤", "싸인해드릴까요?"],
-        [0, "이용찬", -1, 0, null, 68, 72, 74, 0, 160, 300, null, "랜덤"],
-        [0, "이성열", -1, 0, null, 48, 77, 41, 0, 160, 300, null, "랜덤"],
-        [0, "이재영", -1, 0, null, 63, 64, 39, 0, 160, 300, null, "랜덤"],
-        [0, "이종욱", -1, 0, null, 83, 35, 91, 0, 160, 300, null, "랜덤"],
-        [0, "이현승", -1, 0, null, 63, 65, 67, 0, 160, 300, null, "랜덤"],
-        [0, "이혜천", -1, 0, null, 62, 50, 48, 0, 160, 300, null, "랜덤"],
-        [0, "전병두", -1, 0, null, 71, 78, 29, 0, 160, 300, null, "랜덤"],
-        [0, "정대현", -1, 0, null, 88, 58, 70, 0, 160, 300, null, "랜덤"],
-        [0, "정수빈", -1, 0, null, 72, 19, 83, 0, 160, 300, null, "랜덤"],
-        [0, "정수근", -1, 0, null, 76, 26, 89, 0, 160, 300, null, "랜덤"],
-        [0, "홍상삼", -1, 0, null, 59, 49, 51, 0, 160, 300, null, "랜덤"],
-        [0, "손시헌", -1, 0, null, 68, 57, 31, 0, 160, 300, null, "랜덤"],
-        [0, "박민우", -1, 0, null, 86, 8, 76, 0, 160, 300, null, "랜덤"],
-        [0, "모창민", -1, 0, null, 68, 57, 60, 0, 160, 300, null, "랜덤"],
-        [0, "지석훈", -1, 0, null, 39, 38, 12, 0, 160, 300, null, "랜덤"],
-        [0, "박석민", -1, 0, null, 79, 84, 23, 0, 160, 300, null, "랜덤", "브로콜리 돼지 나가신다"],
-        [0, "이민호", -1, 0, null, 57, 78, 53, 0, 160, 300, null, "랜덤"],
-        [0, "김진성", -1, 0, null, 63, 67, 69, 0, 160, 300, null, "랜덤"],
-        [0, "권희동", -1, 0, null, 49, 41, 21, 0, 160, 300, null, "랜덤"],
-        [0, "임창민", -1, 0, null, 71, 67, 63, 0, 160, 300, null, "랜덤"],
-        [0, "원종현", -1, 0, null, 62, 67, 71, 0, 160, 300, null, "랜덤"],
-        [0, "이재학", -1, 0, null, 62, 53, 58, 0, 160, 300, null, "랜덤"],
-        [0, "최금강", -1, 0, null, 44, 48, 53, 0, 160, 300, null, "랜덤"],
-        [0, "김상엽", -1, 0, null, 68, 60, 39, 0, 160, 300, null, "랜덤"],
-        [0, "김수경", -1, 0, null, 67, 82, 58, 0, 160, 300, null, "랜덤"],
+        [0, "김선우", -1, 0, null, 65, 67, 74, 0, 160, 300, null, null],
+        [0, "김재호", -1, 0, null, 68, 21, 58, 0, 160, 300, null, null],
+        [0, "노경은", -1, 0, null, 48, 59, 61, 0, 160, 300, null, null],
+        [0, "니퍼트", -1, 0, null, 76, 88, 67, 0, 160, 300, null, null],
+        [0, "류택현", -1, 0, null, 65, 79, 63, 0, 160, 300, null, null],
+        [0, "민병헌", -1, 0, null, 84, 53, 81, 0, 160, 300, null, null],
+        [0, "박명환", -1, 0, null, 72, 80, 41, 0, 160, 300, null, null, "배추 좀 주세요"],
+        [0, "안경현", -1, 0, null, 67, 78, 34, 0, 160, 300, null, null],
+        [0, "양의지", -1, 0, null, 83, 77, 39, 0, 160, 300, null, null],
+        [0, "오재원", -1, 0, null, 67, 30, 87, 0, 160, 300, null, null, "식빵!"],
+        [0, "유희관", -1, 0, null, 65, 76, 69, 0, 160, 300, null, null, "싸인해드릴까요?"],
+        [0, "이용찬", -1, 0, null, 68, 72, 74, 0, 160, 300, null, null],
+        [0, "이성열", -1, 0, null, 48, 77, 41, 0, 160, 300, null, null],
+        [0, "이재영", -1, 0, null, 63, 64, 39, 0, 160, 300, null, null],
+        [0, "이종욱", -1, 0, null, 83, 35, 91, 0, 160, 300, null, null],
+        [0, "이현승", -1, 0, null, 63, 65, 67, 0, 160, 300, null, null],
+        [0, "이혜천", -1, 0, null, 62, 50, 48, 0, 160, 300, null, null],
+        [0, "전병두", -1, 0, null, 71, 78, 29, 0, 160, 300, null, null],
+        [0, "정대현", -1, 0, null, 88, 58, 70, 0, 160, 300, null, null],
+        [0, "정수빈", -1, 0, null, 72, 19, 83, 0, 160, 300, null, null],
+        [0, "정수근", -1, 0, null, 76, 26, 89, 0, 160, 300, null, null],
+        [0, "홍상삼", -1, 0, null, 59, 49, 51, 0, 160, 300, null, null],
+        [0, "손시헌", -1, 0, null, 68, 57, 31, 0, 160, 300, null, null],
+        [0, "박민우", -1, 0, null, 86, 8, 76, 0, 160, 300, null, null],
+        [0, "모창민", -1, 0, null, 68, 57, 60, 0, 160, 300, null, null],
+        [0, "지석훈", -1, 0, null, 39, 38, 12, 0, 160, 300, null, null],
+        [0, "박석민", -1, 0, null, 79, 84, 23, 0, 160, 300, null, null, "브로콜리 돼지 나가신다"],
+        [0, "이민호", -1, 0, null, 57, 78, 53, 0, 160, 300, null, null],
+        [0, "김진성", -1, 0, null, 63, 67, 69, 0, 160, 300, null, null],
+        [0, "권희동", -1, 0, null, 49, 41, 21, 0, 160, 300, null, null],
+        [0, "임창민", -1, 0, null, 71, 67, 63, 0, 160, 300, null, null],
+        [0, "원종현", -1, 0, null, 62, 67, 71, 0, 160, 300, null, null],
+        [0, "이재학", -1, 0, null, 62, 53, 58, 0, 160, 300, null, null],
+        [0, "최금강", -1, 0, null, 44, 48, 53, 0, 160, 300, null, null],
+        [0, "김상엽", -1, 0, null, 68, 60, 39, 0, 160, 300, null, null],
+        [0, "김수경", -1, 0, null, 67, 82, 58, 0, 160, 300, null, null],
         [0, "테임즈", -1, 0, null, 94, 96, 76, 0, 160, 300, null, "무쌍", "황재균은 섹x머신이다"],
         [0, "나성범", -1, 0, null, 90, 83, 70, 0, 160, 300, null, "필살"],
-        [0, "김성한", -1, 0, null, 80, 86, 79, 0, 160, 300, null, "랜덤"],
-        [0, "방수원", -1, 0, null, 74, 53, 76, 0, 160, 300, null, "랜덤"],
-        [0, "김봉연", -1, 0, null, 74, 79, 40, 0, 160, 300, null, "랜덤"],
-        [0, "김일권", -1, 0, null, 53, 29, 95, 0, 160, 300, null, "랜덤"],
-        [0, "김종모", -1, 0, null, 85, 70, 31, 0, 160, 300, null, "랜덤"],
+        [0, "김성한", -1, 0, null, 80, 86, 79, 0, 160, 300, null, null],
+        [0, "방수원", -1, 0, null, 74, 53, 76, 0, 160, 300, null, null],
+        [0, "김봉연", -1, 0, null, 74, 79, 40, 0, 160, 300, null, null],
+        [0, "김일권", -1, 0, null, 53, 29, 95, 0, 160, 300, null, null],
+        [0, "김종모", -1, 0, null, 85, 70, 31, 0, 160, 300, null, null],
         [0, "선동열", -1, 0, null, 104, 96, 99, 0, 160, 300, null, "집중", "무등산 폭격기"],
         [0, "이종범", -1, 0, null, 91, 93, 103, 0, 160, 300, null, "환술", "내겐 보이지 않는 무언가가 있다"],
-        [0, "문희수", -1, 0, null, 72, 61, 63, 0, 160, 300, null, "랜덤"],
-        [0, "유승안", -1, 0, null, 65, 73, 34, 0, 160, 300, null, "랜덤"],
-        [0, "이순철", -1, 0, null, 63, 80, 87, 0, 160, 300, null, "랜덤", "LG는 내 덕에 강팀이 되었지"],
-        [0, "차동철", -1, 0, null, 73, 23, 67, 0, 160, 300, null, "랜덤"],
-        [0, "한대화", -1, 0, null, 79, 82, 71, 0, 160, 300, null, "랜덤"],
-        [0, "이강철", -1, 0, null, 83, 81, 62, 0, 160, 300, null, "랜덤"],
+        [0, "문희수", -1, 0, null, 72, 61, 63, 0, 160, 300, null, null],
+        [0, "유승안", -1, 0, null, 65, 73, 34, 0, 160, 300, null, null],
+        [0, "이순철", -1, 0, null, 63, 80, 87, 0, 160, 300, null, null, "LG는 내 덕에 강팀이 되었지"],
+        [0, "차동철", -1, 0, null, 73, 23, 67, 0, 160, 300, null, null],
+        [0, "한대화", -1, 0, null, 79, 82, 71, 0, 160, 300, null, null],
+        [0, "이강철", -1, 0, null, 83, 81, 62, 0, 160, 300, null, null],
         [0, "조계현", -1, 0, null, 86, 71, 73, 0, 160, 300, null, "무쌍"],
-        [0, "최향남", -1, 0, null, 63, 64, 34, 0, 160, 300, null, "랜덤"],
-        [0, "홍현우", -1, 0, null, 71, 84, 81, 0, 160, 300, null, "랜덤"],
-        [0, "이대진", -1, 0, null, 73, 74, 58, 0, 160, 300, null, "랜덤"],
-        [0, "장채근", -1, 0, null, 30, 72, 31, 0, 160, 300, null, "랜덤"],
-        [0, "김종국", -1, 0, null, 46, 62, 86, 0, 160, 300, null, "랜덤"],
-        [0, "곽채진", -1, 0, null, 61, 67, 59, 0, 160, 300, null, "랜덤"],
-        [0, "황두성", -1, 0, null, 73, 79, 51, 0, 160, 300, null, "랜덤"],
-        [0, "이호준", -1, 0, null, 82, 86, 51, 0, 160, 300, null, "랜덤", "인생은 이호준처럼"],
-        [0, "장성호", -1, 0, null, 84, 83, 74, 0, 160, 300, null, "랜덤"],
-        [0, "정성훈", -1, 0, null, 84, 80, 77, 0, 160, 300, null, "랜덤"],
-        [0, "최상덕", -1, 0, null, 61, 67, 73, 0, 160, 300, null, "랜덤"],
-        [0, "홍세완", -1, 0, null, 67, 72, 39, 0, 160, 300, null, "랜덤"],
-        [0, "리오스", -1, 0, null, 81, 76, 71, 0, 160, 300, null, "랜덤"],
-        [0, "차일목", -1, 0, null, 38, 31, 34, 0, 160, 300, null, "랜덤"],
-        [0, "진필중", -1, 0, null, 79, 83, 75, 0, 160, 300, null, "랜덤"],
-        [0, "유동훈", -1, 0, null, 74, 51, 64, 0, 160, 300, null, "랜덤"],
-        [0, "이재주", -1, 0, null, 48, 77, 6, 0, 160, 300, null, "랜덤"],
-        [0, "심재학", -1, 0, null, 66, 75, 26, 0, 160, 300, null, "랜덤"],
-        [0, "이용규", -1, 0, null, 86, 20, 86, 0, 160, 300, null, "랜덤"],
-        [0, "윤석민", -1, 0, null, 86, 79, 81, 0, 160, 300, null, "랜덤", "죄송합니다 제가 공황장애가 와서.."],
-        [0, "조규제", -1, 0, null, 83, 76, 58, 0, 160, 300, null, "랜덤"],
-        [0, "한기주", -1, 0, null, 72, 57, 58, 0, 160, 300, null, "랜덤", "속이 꽉찬 남자 99.9"],
-        [0, "이동현", -1, 0, null, 71, 63, 50, 0, 160, 300, null, "랜덤"],
-        [0, "김원섭", -1, 0, null, 67, 29, 77, 0, 160, 300, null, "랜덤"],
-        [0, "신동주", -1, 0, null, 68, 76, 79, 0, 160, 300, null, "랜덤"],
-        [0, "김진우", -1, 0, null, 70, 72, 59, 0, 160, 300, null, "랜덤"],
-        [0, "최희섭", -1, 0, null, 82, 79, 29, 0, 160, 300, null, "랜덤", "형 저 메이저리거에요"],
-        [0, "서재응", -1, 0, null, 67, 69, 80, 0, 160, 300, null, "랜덤"],
-        [0, "나지완", -1, 0, null, 76, 81, 33, 0, 160, 300, null, "랜덤"],
-        [0, "채종범", -1, 0, null, 60, 48, 31, 0, 160, 300, null, "랜덤"],
-        [0, "로페즈", -1, 0, null, 73, 67, 80, 0, 160, 300, null, "랜덤"],
-        [0, "안치홍", -1, 0, null, 83, 67, 73, 0, 160, 300, null, "랜덤"],
-        [0, "양현종", -1, 0, null, 75, 78, 72, 0, 160, 300, null, "랜덤"],
-        [0, "김선빈", -1, 0, null, 86, 16, 76, 0, 160, 300, null, "랜덤"],
-        [0, "이범호", -1, 0, null, 67, 88, 48, 0, 160, 300, null, "랜덤", "꽃보다 아름다운 남자"],
-        [0, "김상현", -1, 0, null, 53, 82, 50, 0, 160, 300, null, "랜덤"],
-        [0, "이대형", -1, 0, null, 74, 12, 94, 0, 160, 300, null, "랜덤", "누구보다 빠르게 난 남들과는 다르게"],
+        [0, "최향남", -1, 0, null, 63, 64, 34, 0, 160, 300, null, null],
+        [0, "홍현우", -1, 0, null, 71, 84, 81, 0, 160, 300, null, null],
+        [0, "이대진", -1, 0, null, 73, 74, 58, 0, 160, 300, null, null],
+        [0, "장채근", -1, 0, null, 30, 72, 31, 0, 160, 300, null, null],
+        [0, "김종국", -1, 0, null, 46, 62, 86, 0, 160, 300, null, null],
+        [0, "곽채진", -1, 0, null, 61, 67, 59, 0, 160, 300, null, null],
+        [0, "황두성", -1, 0, null, 73, 79, 51, 0, 160, 300, null, null],
+        [0, "이호준", -1, 0, null, 82, 86, 51, 0, 160, 300, null, null, "인생은 이호준처럼"],
+        [0, "장성호", -1, 0, null, 84, 83, 74, 0, 160, 300, null, null],
+        [0, "정성훈", -1, 0, null, 84, 80, 77, 0, 160, 300, null, null],
+        [0, "최상덕", -1, 0, null, 61, 67, 73, 0, 160, 300, null, null],
+        [0, "홍세완", -1, 0, null, 67, 72, 39, 0, 160, 300, null, null],
+        [0, "리오스", -1, 0, null, 81, 76, 71, 0, 160, 300, null, null],
+        [0, "차일목", -1, 0, null, 38, 31, 34, 0, 160, 300, null, null],
+        [0, "진필중", -1, 0, null, 79, 83, 75, 0, 160, 300, null, null],
+        [0, "유동훈", -1, 0, null, 74, 51, 64, 0, 160, 300, null, null],
+        [0, "이재주", -1, 0, null, 48, 77, 6, 0, 160, 300, null, null],
+        [0, "심재학", -1, 0, null, 66, 75, 26, 0, 160, 300, null, null],
+        [0, "이용규", -1, 0, null, 86, 20, 86, 0, 160, 300, null, null],
+        [0, "윤석민", -1, 0, null, 86, 79, 81, 0, 160, 300, null, null, "죄송합니다 제가 공황장애가 와서.."],
+        [0, "조규제", -1, 0, null, 83, 76, 58, 0, 160, 300, null, null],
+        [0, "한기주", -1, 0, null, 72, 57, 58, 0, 160, 300, null, null, "속이 꽉찬 남자 99.9"],
+        [0, "이동현", -1, 0, null, 71, 63, 50, 0, 160, 300, null, null],
+        [0, "김원섭", -1, 0, null, 67, 29, 77, 0, 160, 300, null, null],
+        [0, "신동주", -1, 0, null, 68, 76, 79, 0, 160, 300, null, null],
+        [0, "김진우", -1, 0, null, 70, 72, 59, 0, 160, 300, null, null],
+        [0, "최희섭", -1, 0, null, 82, 79, 29, 0, 160, 300, null, null, "형 저 메이저리거에요"],
+        [0, "서재응", -1, 0, null, 67, 69, 80, 0, 160, 300, null, null],
+        [0, "나지완", -1, 0, null, 76, 81, 33, 0, 160, 300, null, null],
+        [0, "채종범", -1, 0, null, 60, 48, 31, 0, 160, 300, null, null],
+        [0, "로페즈", -1, 0, null, 73, 67, 80, 0, 160, 300, null, null],
+        [0, "안치홍", -1, 0, null, 83, 67, 73, 0, 160, 300, null, null],
+        [0, "양현종", -1, 0, null, 75, 78, 72, 0, 160, 300, null, null],
+        [0, "김선빈", -1, 0, null, 86, 16, 76, 0, 160, 300, null, null],
+        [0, "이범호", -1, 0, null, 67, 88, 48, 0, 160, 300, null, null, "꽃보다 아름다운 남자"],
+        [0, "김상현", -1, 0, null, 53, 82, 50, 0, 160, 300, null, null],
+        [0, "이대형", -1, 0, null, 74, 12, 94, 0, 160, 300, null, null, "누구보다 빠르게 난 남들과는 다르게"],
         [0, "김병현", -1, 0, null, 97, 92, 73, 0, 160, 300, null, "필살"],
         [0, "박찬호", -1, 0, null, 102, 103, 96, 0, 160, 300, null, "위압", "안녕하세요 제가 LA에 있을 시절부터 놀란 라이언같은 투수가 되고 싶었는데요. 그래서 런닝도 하고 웨이트도 하다보니 어느덧 강속구 투수가 되어서…"],
-        [0, "송은범", -1, 0, null, 60, 57, 63, 0, 160, 300, null, "랜덤"],
-        [0, "심수창", -1, 0, null, 40, 53, 39, 0, 160, 300, null, "랜덤"],
-        [0, "윤규진", -1, 0, null, 53, 60, 38, 0, 160, 300, null, "랜덤"],
-        [0, "정우람", -1, 0, null, 81, 76, 79, 0, 160, 300, null, "랜덤"],
+        [0, "송은범", -1, 0, null, 60, 57, 63, 0, 160, 300, null, null],
+        [0, "심수창", -1, 0, null, 40, 53, 39, 0, 160, 300, null, null],
+        [0, "윤규진", -1, 0, null, 53, 60, 38, 0, 160, 300, null, null],
+        [0, "정우람", -1, 0, null, 81, 76, 79, 0, 160, 300, null, null],
         [0, "김태균", -1, 0, null, 91, 91, 36, 0, 160, 300, null, "필살"],
-        [0, "송광민", -1, 0, null, 80, 72, 19, 0, 160, 300, null, "랜덤"],
-        [0, "정근우", -1, 0, null, 86, 74, 87, 0, 160, 300, null, "랜덤"],
-        [0, "최진행", -1, 0, null, 57, 76, 12, 0, 160, 300, null, "랜덤", "약 좀 주세요"],
-        [0, "한용덕", -1, 0, null, 75, 76, 79, 0, 160, 300, null, "랜덤"],
-        [0, "구대성", -1, 0, null, 88, 86, 72, 0, 160, 300, null, "랜덤"],
-        [0, "유승안", -1, 0, null, 72, 73, 22, 0, 160, 300, null, "랜덤"],
-        [0, "정민철", -1, 0, null, 72, 79, 85, 0, 160, 300, null, "랜덤"],
+        [0, "송광민", -1, 0, null, 80, 72, 19, 0, 160, 300, null, null],
+        [0, "정근우", -1, 0, null, 86, 74, 87, 0, 160, 300, null, null],
+        [0, "최진행", -1, 0, null, 57, 76, 12, 0, 160, 300, null, null, "약 좀 주세요"],
+        [0, "한용덕", -1, 0, null, 75, 76, 79, 0, 160, 300, null, null],
+        [0, "구대성", -1, 0, null, 88, 86, 72, 0, 160, 300, null, null],
+        [0, "유승안", -1, 0, null, 72, 73, 22, 0, 160, 300, null, null],
+        [0, "정민철", -1, 0, null, 72, 79, 85, 0, 160, 300, null, null],
         [0, "장종훈", -1, 0, null, 81, 94, 83, 0, 160, 300, null, "무쌍", "신고선수의 전설"],
         [0, "송진우", -1, 0, null, 80, 83, 86, 0, 160, 300, null, "환술"],
-        [0, "이강돈", -1, 0, null, 77, 72, 76, 0, 160, 300, null, "랜덤"],
-        [0, "이상목", -1, 0, null, 67, 73, 79, 0, 160, 300, null, "랜덤"],
-        [0, "한희민", -1, 0, null, 80, 58, 74, 0, 160, 300, null, "랜덤"],
+        [0, "이강돈", -1, 0, null, 77, 72, 76, 0, 160, 300, null, null],
+        [0, "이상목", -1, 0, null, 67, 73, 79, 0, 160, 300, null, null],
+        [0, "한희민", -1, 0, null, 80, 58, 74, 0, 160, 300, null, null],
         [0, "류현진", -1, 0, null, 97, 98, 92, 0, 160, 300, null, "위압", "야구는 수비를 믿지 말고 내가 잘해야 이긴다"],
-        [0, "이정훈", -1, 0, null, 83, 60, 81, 0, 160, 300, null, "랜덤"],
-        [0, "이영우", -1, 0, null, 82, 79, 77, 0, 160, 300, null, "랜덤"],
-        [0, "동봉철", -1, 0, null, 63, 32, 77, 0, 160, 300, null, "랜덤"],
-        [0, "김현수", -1, 0, null, 88, 81, 48, 0, 160, 300, null, "랜덤", "사서 쓰라고"],
+        [0, "이정훈", -1, 0, null, 83, 60, 81, 0, 160, 300, null, null],
+        [0, "이영우", -1, 0, null, 82, 79, 77, 0, 160, 300, null, null],
+        [0, "동봉철", -1, 0, null, 63, 32, 77, 0, 160, 300, null, null],
+        [0, "김현수", -1, 0, null, 88, 81, 48, 0, 160, 300, null, null, "사서 쓰라고"],
         [0, "추신수", -1, 0, null, 99, 99, 96, 0, 160, 300, null, "무쌍", "Go! Choo! Go! Choo!"],
-        [0, "최원호", -1, 0, null, 55, 53, 53, 0, 160, 300, null, "랜덤"],
-        [0, "신명철", -1, 0, null, 41, 53, 76, 0, 160, 300, null, "랜덤"],
-        [0, "백재호", -1, 0, null, 44, 63, 22, 0, 160, 300, null, "랜덤"],
-        [0, "노장진", -1, 0, null, 64, 82, 48, 0, 160, 300, null, "랜덤"],
-        [0, "조용준", -1, 0, null, 86, 61, 69, 0, 160, 300, null, "랜덤"],
-        [0, "이진영", -1, 0, null, 86, 82, 79, 0, 160, 300, null, "랜덤", "어디로 던져도 난 머리에 맞는다"],
-        [0, "장원삼", -1, 0, null, 70, 80, 83, 0, 160, 300, null, "랜덤"],
-        [0, "고영민", -1, 0, null, 50, 45, 76, 0, 160, 300, null, "랜덤"],
-        [0, "옥스프링", -1, 0, null, 74, 68, 72, 0, 160, 300, null, "랜덤"],
-        [0, "사도스키", -1, 0, null, 68, 68, 76, 0, 160, 300, null, "랜덤"],
+        [0, "최원호", -1, 0, null, 55, 53, 53, 0, 160, 300, null, null],
+        [0, "신명철", -1, 0, null, 41, 53, 76, 0, 160, 300, null, null],
+        [0, "백재호", -1, 0, null, 44, 63, 22, 0, 160, 300, null, null],
+        [0, "노장진", -1, 0, null, 64, 82, 48, 0, 160, 300, null, null],
+        [0, "조용준", -1, 0, null, 86, 61, 69, 0, 160, 300, null, null],
+        [0, "이진영", -1, 0, null, 86, 82, 79, 0, 160, 300, null, null, "어디로 던져도 난 머리에 맞는다"],
+        [0, "장원삼", -1, 0, null, 70, 80, 83, 0, 160, 300, null, null],
+        [0, "고영민", -1, 0, null, 50, 45, 76, 0, 160, 300, null, null],
+        [0, "옥스프링", -1, 0, null, 74, 68, 72, 0, 160, 300, null, null],
+        [0, "사도스키", -1, 0, null, 68, 68, 76, 0, 160, 300, null, null],
         [0, "해커", -1, 0, null, 85, 88, 89, 0, 160, 300, null, "집중", "x까! x빨놈아!"],
-        [0, "브룸바", -1, 0, null, 84, 77, 22, 0, 160, 300, null, "랜덤"],
+        [0, "브룸바", -1, 0, null, 84, 77, 22, 0, 160, 300, null, null],
         [0, "밴헤켄", -1, 0, null, 80, 82, 86, 0, 160, 300, null, "환술"],
-        [0, "레일리", -1, 0, null, 67, 74, 77, 0, 160, 300, null, "랜덤"],
-        [0, "그레이싱어", -1, 0, null, 75, 74, 67, 0, 160, 300, null, "랜덤"],
-        [0, "글로버", -1, 0, null, 72, 84, 50, 0, 160, 300, null, "랜덤"],
-        [0, "소사", -1, 0, null, 69, 80, 72, 0, 160, 300, null, "랜덤"],
-        [0, "레스", -1, 0, null, 76, 74, 51, 0, 160, 300, null, "랜덤"],
-        [0, "켈리", -1, 0, null, 73, 77, 70, 0, 160, 300, null, "랜덤"],
-        [0, "피어밴드", -1, 0, null, 70, 73, 77, 0, 160, 300, null, "랜덤"],
-        [0, "김종훈", -1, 0, null, 67, 54, 71, 0, 160, 300, null, "랜덤"],
-        [0, "김태한", -1, 0, null, 52, 41, 41, 0, 160, 300, null, "랜덤"],
-        [0, "류명선", -1, 0, null, 60, 54, 34, 0, 160, 300, null, "랜덤"],
-        [0, "박충식", -1, 0, null, 78, 61, 77, 0, 160, 300, null, "랜덤"],
-        [0, "전병호", -1, 0, null, 66, 41, 57, 0, 160, 300, null, "랜덤"],
-        [0, "김대익", -1, 0, null, 70, 34, 70, 0, 160, 300, null, "랜덤"],
-        [0, "김상진", -1, 0, null, 54, 41, 66, 0, 160, 300, null, "랜덤"],
-        [0, "김실", -1, 0, null, 55, 46, 57, 0, 160, 300, null, "랜덤"],
-        [0, "김종호", -1, 0, null, 76, 18, 78, 0, 160, 300, null, "랜덤"],
-        [0, "나광남", -1, 0, null, 18, 18, 18, 0, 160, 300, null, "랜덤", "오심도 경기의 일부입니다."],
-        [0, "박석진", -1, 0, null, 71, 49, 63, 0, 160, 300, null, "랜덤"],
-        [0, "손인호", -1, 0, null, 55, 32, 51, 0, 160, 300, null, "랜덤"],
-        [0, "김일경", -1, 0, null, 49, 12, 56, 0, 160, 300, null, "랜덤"],
-        [0, "최동수", -1, 0, null, 61, 33, 45, 0, 160, 300, null, "랜덤"],
-        [0, "송구홍", -1, 0, null, 57, 29, 48, 0, 160, 300, null, "랜덤"],
-        [0, "김광삼", -1, 0, null, 49, 23, 68, 0, 160, 300, null, "랜덤"],
-        [0, "류제국", -1, 0, null, 70, 46, 81, 0, 160, 300, null, "랜덤"],
-        [0, "임찬규", -1, 0, null, 59, 55, 60, 0, 160, 300, null, "랜덤"],
-        [0, "진해수", -1, 0, null, 49, 63, 50, 0, 160, 300, null, "랜덤"],
-        [0, "백승현", -1, 0, null, 40, 54, 55, 0, 160, 300, null, "랜덤"],
-        [0, "김용의", -1, 0, null, 60, 41, 35, 0, 160, 300, null, "랜덤"],
-        [0, "박지철", -1, 0, null, 70, 51, 62, 0, 160, 300, null, "랜덤"],
-        [0, "강성우", -1, 0, null, 77, 21, 61, 0, 160, 300, null, "랜덤"],
-        [0, "한문연", -1, 0, null, 70, 51, 36, 0, 160, 300, null, "랜덤"],
-        [0, "김민호", -1, 0, null, 82, 73, 31, 0, 160, 300, null, "랜덤"],
-        [0, "유두열", -1, 0, null, 73, 54, 67, 0, 160, 300, null, "랜덤"],
-        [0, "이종운", -1, 0, null, 76, 12, 81, 0, 160, 300, null, "랜덤"],
-        [0, "박현승", -1, 0, null, 49, 46, 23, 0, 160, 300, null, "랜덤"],
-        [0, "고원준", -1, 0, null, 47, 41, 43, 0, 160, 300, null, "랜덤"],
-        [0, "문동환", -1, 0, null, 79, 69, 45, 0, 160, 300, null, "랜덤"],
-        [0, "박동수", -1, 0, null, 73, 64, 52, 0, 160, 300, null, "랜덤"],
-        [0, "이현곤", -1, 0, null, 66, 42, 36, 0, 160, 300, null, "랜덤", "광고니! 제가 타석에 서면 다음은 광고입니다."],
-        [0, "신용운", -1, 0, null, 60, 66, 67, 0, 160, 300, null, "랜덤"],
-        [0, "장문석", -1, 0, null, 68, 41, 78, 0, 160, 300, null, "랜덤"],
-        [0, "이병훈", -1, 0, null, 71, 24, 70, 0, 160, 300, null, "랜덤"],
-        [0, "이상화", -1, 0, null, 51, 48, 44, 0, 160, 300, null, "랜덤"],
-        [0, "손영민", -1, 0, null, 55, 41, 49, 0, 160, 300, null, "랜덤"],
-        [0, "곽정철", -1, 0, null, 57, 55, 54, 0, 160, 300, null, "랜덤"],
-        [0, "이범석", -1, 0, null, 67, 41, 54, 0, 160, 300, null, "랜덤"],
-        [0, "조도연", -1, 0, null, 70, 66, 54, 0, 160, 300, null, "랜덤"],
-        [0, "김무종", -1, 0, null, 66, 55, 41, 0, 160, 300, null, "랜덤"],
-        [0, "강봉규", -1, 0, null, 70, 67, 44, 0, 160, 300, null, "랜덤"],
-        [0, "김진욱", -1, 0, null, 51, 55, 41, 0, 160, 300, null, "랜덤"],
-        [0, "변진수", -1, 0, null, 40, 51, 48, 0, 160, 300, null, "랜덤"],
-        [0, "손혁", -1, 0, null, 59, 58, 61, 0, 160, 300, null, "랜덤"],
-        [0, "오재일", -1, 0, null, 58, 71, 41, 0, 160, 300, null, "랜덤"],
-        [0, "이도형", -1, 0, null, 43, 61, 40, 0, 160, 300, null, "랜덤"],
-        [0, "이원석", -1, 0, null, 50, 60, 34, 0, 160, 300, null, "랜덤"],
-        [0, "진야곱", -1, 0, null, 48, 51, 47, 0, 160, 300, null, "랜덤"],
-        [0, "채상병", -1, 0, null, 41, 43, 61, 0, 160, 300, null, "랜덤"],
-        [0, "추성건", -1, 0, null, 40, 50, 61, 0, 160, 300, null, "랜덤"],
-        [0, "홍원기", -1, 0, null, 51, 43, 66, 0, 160, 300, null, "랜덤"],
-        [0, "가내영", -1, 0, null, 46, 42, 51, 0, 160, 300, null, "랜덤"],
-        [0, "김신부", -1, 0, null, 51, 36, 41, 0, 160, 300, null, "랜덤"],
-        [0, "김홍집", -1, 0, null, 61, 51, 66, 0, 160, 300, null, "랜덤"],
-        [0, "안병원", -1, 0, null, 59, 41, 71, 0, 160, 300, null, "랜덤"],
-        [0, "임호균", -1, 0, null, 66, 46, 73, 0, 160, 300, null, "랜덤"],
-        [0, "조웅천", -1, 0, null, 82, 67, 84, 0, 160, 300, null, "랜덤"],
-        [0, "최창호", -1, 0, null, 83, 71, 79, 0, 160, 300, null, "랜덤"],
-        [0, "김동기", -1, 0, null, 62, 81, 22, 0, 160, 300, null, "랜덤"],
-        [0, "김바위", -1, 0, null, 44, 70, 23, 0, 160, 300, null, "랜덤"],
-        [0, "김성갑", -1, 0, null, 50, 44, 61, 0, 160, 300, null, "랜덤"],
-        [0, "김기덕", -1, 0, null, 60, 23, 66, 0, 160, 300, null, "랜덤"],
-        [0, "김호", -1, 0, null, 53, 32, 71, 0, 160, 300, null, "랜덤"],
-        [0, "김광림", -1, 0, null, 61, 60, 60, 0, 160, 300, null, "랜덤"],
-        [0, "조원우", -1, 0, null, 59, 41, 63, 0, 160, 300, null, "랜덤"],
-        [0, "심성보", -1, 0, null, 54, 56, 41, 0, 160, 300, null, "랜덤"],
-        [0, "오봉옥", -1, 0, null, 43, 41, 61, 0, 160, 300, null, "랜덤"],
-        [0, "구대진", -1, 0, null, 40, 32, 36, 0, 160, 300, null, "랜덤"],
-        [0, "최해식", -1, 0, null, 57, 41, 60, 0, 160, 300, null, "랜덤"],
-        [0, "이종두", -1, 0, null, 70, 31, 70, 0, 160, 300, null, "랜덤"],
-        [0, "노진혁", -1, 0, null, 51, 43, 45, 0, 160, 300, null, "랜덤"],
-        [0, "김건우", -1, 0, null, 78, 61, 60, 0, 160, 300, null, "랜덤"],
-        [0, "이용철", -1, 0, null, 71, 77, 42, 0, 160, 300, null, "랜덤"],
-        [0, "오재영", -1, 0, null, 69, 68, 71, 0, 160, 300, null, "랜덤"],
-        [0, "배영섭", -1, 0, null, 70, 16, 81, 0, 160, 300, null, "랜덤"],
-        [0, "구자욱", -1, 0, null, 73, 59, 72, 0, 160, 300, null, "랜덤"],
-        [0, "신재영", -1, 0, null, 64, 66, 62, 0, 160, 300, null, "랜덤"]
+        [0, "레일리", -1, 0, null, 67, 74, 77, 0, 160, 300, null, null],
+        [0, "그레이싱어", -1, 0, null, 75, 74, 67, 0, 160, 300, null, null],
+        [0, "글로버", -1, 0, null, 72, 84, 50, 0, 160, 300, null, null],
+        [0, "소사", -1, 0, null, 69, 80, 72, 0, 160, 300, null, null],
+        [0, "레스", -1, 0, null, 76, 74, 51, 0, 160, 300, null, null],
+        [0, "켈리", -1, 0, null, 73, 77, 70, 0, 160, 300, null, null],
+        [0, "피어밴드", -1, 0, null, 70, 73, 77, 0, 160, 300, null, null],
+        [0, "김종훈", -1, 0, null, 67, 54, 71, 0, 160, 300, null, null],
+        [0, "김태한", -1, 0, null, 52, 41, 41, 0, 160, 300, null, null],
+        [0, "류명선", -1, 0, null, 60, 54, 34, 0, 160, 300, null, null],
+        [0, "박충식", -1, 0, null, 78, 61, 77, 0, 160, 300, null, null],
+        [0, "전병호", -1, 0, null, 66, 41, 57, 0, 160, 300, null, null],
+        [0, "김대익", -1, 0, null, 70, 34, 70, 0, 160, 300, null, null],
+        [0, "김상진", -1, 0, null, 54, 41, 66, 0, 160, 300, null, null],
+        [0, "김실", -1, 0, null, 55, 46, 57, 0, 160, 300, null, null],
+        [0, "김종호", -1, 0, null, 76, 18, 78, 0, 160, 300, null, null],
+        [0, "나광남", -1, 0, null, 18, 18, 18, 0, 160, 300, null, null, "오심도 경기의 일부입니다."],
+        [0, "박석진", -1, 0, null, 71, 49, 63, 0, 160, 300, null, null],
+        [0, "손인호", -1, 0, null, 55, 32, 51, 0, 160, 300, null, null],
+        [0, "김일경", -1, 0, null, 49, 12, 56, 0, 160, 300, null, null],
+        [0, "최동수", -1, 0, null, 61, 33, 45, 0, 160, 300, null, null],
+        [0, "송구홍", -1, 0, null, 57, 29, 48, 0, 160, 300, null, null],
+        [0, "김광삼", -1, 0, null, 49, 23, 68, 0, 160, 300, null, null],
+        [0, "류제국", -1, 0, null, 70, 46, 81, 0, 160, 300, null, null],
+        [0, "임찬규", -1, 0, null, 59, 55, 60, 0, 160, 300, null, null],
+        [0, "진해수", -1, 0, null, 49, 63, 50, 0, 160, 300, null, null],
+        [0, "백승현", -1, 0, null, 40, 54, 55, 0, 160, 300, null, null],
+        [0, "김용의", -1, 0, null, 60, 41, 35, 0, 160, 300, null, null],
+        [0, "박지철", -1, 0, null, 70, 51, 62, 0, 160, 300, null, null],
+        [0, "강성우", -1, 0, null, 77, 21, 61, 0, 160, 300, null, null],
+        [0, "한문연", -1, 0, null, 70, 51, 36, 0, 160, 300, null, null],
+        [0, "김민호", -1, 0, null, 82, 73, 31, 0, 160, 300, null, null],
+        [0, "유두열", -1, 0, null, 73, 54, 67, 0, 160, 300, null, null],
+        [0, "이종운", -1, 0, null, 76, 12, 81, 0, 160, 300, null, null],
+        [0, "박현승", -1, 0, null, 49, 46, 23, 0, 160, 300, null, null],
+        [0, "고원준", -1, 0, null, 47, 41, 43, 0, 160, 300, null, null],
+        [0, "문동환", -1, 0, null, 79, 69, 45, 0, 160, 300, null, null],
+        [0, "박동수", -1, 0, null, 73, 64, 52, 0, 160, 300, null, null],
+        [0, "이현곤", -1, 0, null, 66, 42, 36, 0, 160, 300, null, null, "광고니! 제가 타석에 서면 다음은 광고입니다."],
+        [0, "신용운", -1, 0, null, 60, 66, 67, 0, 160, 300, null, null],
+        [0, "장문석", -1, 0, null, 68, 41, 78, 0, 160, 300, null, null],
+        [0, "이병훈", -1, 0, null, 71, 24, 70, 0, 160, 300, null, null],
+        [0, "이상화", -1, 0, null, 51, 48, 44, 0, 160, 300, null, null],
+        [0, "손영민", -1, 0, null, 55, 41, 49, 0, 160, 300, null, null],
+        [0, "곽정철", -1, 0, null, 57, 55, 54, 0, 160, 300, null, null],
+        [0, "이범석", -1, 0, null, 67, 41, 54, 0, 160, 300, null, null],
+        [0, "조도연", -1, 0, null, 70, 66, 54, 0, 160, 300, null, null],
+        [0, "김무종", -1, 0, null, 66, 55, 41, 0, 160, 300, null, null],
+        [0, "강봉규", -1, 0, null, 70, 67, 44, 0, 160, 300, null, null],
+        [0, "김진욱", -1, 0, null, 51, 55, 41, 0, 160, 300, null, null],
+        [0, "변진수", -1, 0, null, 40, 51, 48, 0, 160, 300, null, null],
+        [0, "손혁", -1, 0, null, 59, 58, 61, 0, 160, 300, null, null],
+        [0, "오재일", -1, 0, null, 58, 71, 41, 0, 160, 300, null, null],
+        [0, "이도형", -1, 0, null, 43, 61, 40, 0, 160, 300, null, null],
+        [0, "이원석", -1, 0, null, 50, 60, 34, 0, 160, 300, null, null],
+        [0, "진야곱", -1, 0, null, 48, 51, 47, 0, 160, 300, null, null],
+        [0, "채상병", -1, 0, null, 41, 43, 61, 0, 160, 300, null, null],
+        [0, "추성건", -1, 0, null, 40, 50, 61, 0, 160, 300, null, null],
+        [0, "홍원기", -1, 0, null, 51, 43, 66, 0, 160, 300, null, null],
+        [0, "가내영", -1, 0, null, 46, 42, 51, 0, 160, 300, null, null],
+        [0, "김신부", -1, 0, null, 51, 36, 41, 0, 160, 300, null, null],
+        [0, "김홍집", -1, 0, null, 61, 51, 66, 0, 160, 300, null, null],
+        [0, "안병원", -1, 0, null, 59, 41, 71, 0, 160, 300, null, null],
+        [0, "임호균", -1, 0, null, 66, 46, 73, 0, 160, 300, null, null],
+        [0, "조웅천", -1, 0, null, 82, 67, 84, 0, 160, 300, null, null],
+        [0, "최창호", -1, 0, null, 83, 71, 79, 0, 160, 300, null, null],
+        [0, "김동기", -1, 0, null, 62, 81, 22, 0, 160, 300, null, null],
+        [0, "김바위", -1, 0, null, 44, 70, 23, 0, 160, 300, null, null],
+        [0, "김성갑", -1, 0, null, 50, 44, 61, 0, 160, 300, null, null],
+        [0, "김기덕", -1, 0, null, 60, 23, 66, 0, 160, 300, null, null],
+        [0, "김호", -1, 0, null, 53, 32, 71, 0, 160, 300, null, null],
+        [0, "김광림", -1, 0, null, 61, 60, 60, 0, 160, 300, null, null],
+        [0, "조원우", -1, 0, null, 59, 41, 63, 0, 160, 300, null, null],
+        [0, "심성보", -1, 0, null, 54, 56, 41, 0, 160, 300, null, null],
+        [0, "오봉옥", -1, 0, null, 43, 41, 61, 0, 160, 300, null, null],
+        [0, "구대진", -1, 0, null, 40, 32, 36, 0, 160, 300, null, null],
+        [0, "최해식", -1, 0, null, 57, 41, 60, 0, 160, 300, null, null],
+        [0, "이종두", -1, 0, null, 70, 31, 70, 0, 160, 300, null, null],
+        [0, "노진혁", -1, 0, null, 51, 43, 45, 0, 160, 300, null, null],
+        [0, "김건우", -1, 0, null, 78, 61, 60, 0, 160, 300, null, null],
+        [0, "이용철", -1, 0, null, 71, 77, 42, 0, 160, 300, null, null],
+        [0, "오재영", -1, 0, null, 69, 68, 71, 0, 160, 300, null, null],
+        [0, "배영섭", -1, 0, null, 70, 16, 81, 0, 160, 300, null, null],
+        [0, "구자욱", -1, 0, null, 73, 59, 72, 0, 160, 300, null, null],
+        [0, "신재영", -1, 0, null, 64, 66, 62, 0, 160, 300, null, null]
     ],	
     "general_ex":[
     ],

From 1e54220230fff5e153d35248b10081cbc4da1266 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 29 Apr 2018 01:19:31 +0900
Subject: [PATCH 182/184] =?UTF-8?q?=EC=97=B0,=20=EC=9B=94=20=EA=B3=84?=
 =?UTF-8?q?=EC=82=B0=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index 20969d22..5b8f7d4d 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1774,25 +1774,27 @@ function addAge() {
 
 function turnDate($curtime) {
     $db = DB::db();
-    $connect=$db->get();
 
-    $query = "select startyear,starttime,turnterm,year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $db->queryFirstRow('SELECT startyear,starttime,turnterm,year,month from game limit 1');
 
     $turn = $admin['starttime'];
     $curturn = cutTurn($curtime, $admin['turnterm']);
-    $num = 0;
-    $term = $admin['turnterm']*60;
-    $num = intdiv((strtotime($curturn) - strtotime($turn)), $term);
+    $term = $admin['turnterm'];
+    
+    $num = intdiv((strtotime($curturn) - strtotime($turn)), $term*60);
 
-    $year = $admin['startyear'] + intdiv($num, 12);
-    $month = 1 + (12+$num) % 12;
+    $date = $admin['startyear'] * 12;
+    $date += $num;
+    
+    $year = intdiv($date, 12);
+    $month = 1 + $year % 12;    
 
     // 바뀐 경우만 업데이트
     if($admin['month'] != $month || $admin['year'] != $year) {
-        $query = "update game set year='$year',month='$month'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('game', [
+            'year'=>$year,
+            'month'=>$month
+        ], true);
     }
 
     return [$year, $month];

From 13fccb998efcef3a1e95f8c5b995615299dbc142 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 29 Apr 2018 01:47:48 +0900
Subject: [PATCH 183/184] =?UTF-8?q?=EB=85=84=EB=8F=84=20=EA=B3=84=EC=82=B0?=
 =?UTF-8?q?=20=EA=B3=B5=EC=8B=9D=20=EC=9E=AC=20=EC=88=98=EC=A0=95.=20?=
 =?UTF-8?q?=EC=8B=9C=EB=82=98=EB=A6=AC=EC=98=A4=20=EC=8B=9C=EC=9E=91?=
 =?UTF-8?q?=EC=8B=9C=20=EB=82=A8=EC=9D=80=20=EA=B0=9C=EC=9B=94=20=EC=88=98?=
 =?UTF-8?q?=EB=A5=BC=20=EA=B3=84=EC=82=B0.=20=EB=B0=98=EB=8F=99=ED=83=81?=
 =?UTF-8?q?=EC=97=B0=ED=95=A9=20=EC=8B=9C=EB=82=98=EB=A6=AC=EC=98=A4=20?=
 =?UTF-8?q?=EC=99=B8=EA=B5=90=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php                 |  2 +-
 hwe/sammo/Scenario.php       |  4 +-
 hwe/scenario/scenario_2.json | 78 ++++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index 5b8f7d4d..06192ea1 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1787,7 +1787,7 @@ function turnDate($curtime) {
     $date += $num;
     
     $year = intdiv($date, 12);
-    $month = 1 + $year % 12;    
+    $month = 1 + $date % 12;    
 
     // 바뀐 경우만 업데이트
     if($admin['month'] != $month || $admin['year'] != $year) {
diff --git a/hwe/sammo/Scenario.php b/hwe/sammo/Scenario.php
index 983090e5..2e552dd0 100644
--- a/hwe/sammo/Scenario.php
+++ b/hwe/sammo/Scenario.php
@@ -280,12 +280,14 @@ class Scenario{
     private function buildDiplomacy($env){
         $this->initFull();
 
+        $monthDiff = ($env['year'] * 12) + ($env['month'] - 1) - ($env['startyear'] * 12);
+
         $db = DB::db();
         foreach($this->diplomacy as $diplomacy){
             list($me, $you, $state, $remain) = $diplomacy;
             $db->update('diplomacy', [
                 'state'=>$state,
-                'term'=>$remain
+                'term'=>$remain - $monthDiff
             ], '(me = %i AND you = %i) OR (me = %i AND you = %i)', $me, $you, $you, $me);
         }
     }
diff --git a/hwe/scenario/scenario_2.json b/hwe/scenario/scenario_2.json
index 8e810e0b..16b3738a 100644
--- a/hwe/scenario/scenario_2.json
+++ b/hwe/scenario/scenario_2.json
@@ -67,6 +67,84 @@
          
     ],
     "diplomacy":[
+        [1, 2, 1, 36],
+        [1, 4, 1, 36],
+        [1, 6, 1, 36],
+        [1, 7, 1, 36],
+        [1, 8, 1, 36],
+        [1, 9, 1, 36],
+        [1, 10, 1, 36],
+        [1, 11, 1, 36],
+        [1, 13, 1, 36],
+        [1, 14, 1, 36],
+        [1, 16, 1, 36],
+        [1, 17, 1, 36],
+        [1, 20, 1, 36],
+
+        [2, 4, 7, 48],
+        [2, 6, 7, 48],
+        [2, 8, 7, 48],
+        [2, 9, 7, 48],
+        [2, 11, 7, 48],
+        [2, 13, 7, 48],
+        [2, 14, 7, 48],
+        [2, 16, 7, 48],
+        [2, 17, 7, 48],
+        [2, 20, 7, 48],
+
+        [4, 6, 7, 48],
+        [4, 8, 7, 48],
+        [4, 9, 7, 48],
+        [4, 11, 7, 48],
+        [4, 13, 7, 48],
+        [4, 14, 7, 48],
+        [4, 16, 7, 48],
+        [4, 17, 7, 48],
+        [4, 20, 7, 48],
+
+        [6, 8, 7, 48],
+        [6, 9, 7, 48],
+        [6, 11, 7, 48],
+        [6, 13, 7, 48],
+        [6, 14, 7, 48],
+        [6, 16, 7, 48],
+        [6, 17, 7, 48],
+        [6, 20, 7, 48],
+
+        [8, 9, 7, 48],
+        [8, 11, 7, 48],
+        [8, 13, 7, 48],
+        [8, 14, 7, 48],
+        [8, 16, 7, 48],
+        [8, 17, 7, 48],
+        [8, 20, 7, 48],
+
+        [9, 11, 7, 48],
+        [9, 13, 7, 48],
+        [9, 14, 7, 48],
+        [9, 16, 7, 48],
+        [9, 17, 7, 48],
+        [9, 20, 7, 48],
+
+        [11, 13, 7, 48],
+        [11, 14, 7, 48],
+        [11, 16, 7, 48],
+        [11, 17, 7, 48],
+        [11, 20, 7, 48],
+
+        [13, 14, 7, 48],
+        [13, 16, 7, 48],
+        [13, 17, 7, 48],
+        [13, 20, 7, 48],
+
+        [14, 16, 7, 48],
+        [14, 17, 7, 48],
+        [14, 20, 7, 48],
+
+        [16, 17, 7, 48],
+        [16, 20, 7, 48],
+
+        [17, 20, 7, 48]
     ],
     "general":[
         [   1,    "소제1",1001,  0,    null, 20, 11, 48, 0, 168, 190, "유지",    null],

From a1397e41aadecfab4d40d7ccb803fd3c6edbdf49 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 29 Apr 2018 01:58:59 +0900
Subject: [PATCH 184/184] =?UTF-8?q?=ED=8A=B8=EB=9E=98=ED=94=BD=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/a_traffic.php | 20 ++++++++++----------
 hwe/func.php      | 14 ++++++++------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/hwe/a_traffic.php b/hwe/a_traffic.php
index de600ece..cb52d2b5 100644
--- a/hwe/a_traffic.php
+++ b/hwe/a_traffic.php
@@ -22,15 +22,15 @@ $refresh = [];
 $online = [];
 
 $curonline = getOnlineNum();
-$visibleLogs = min(11, count($log));
-for ($i=0; $i < $visibleLogs; $i++) {
-    $parse = explode("|", $log[count($log)-$visibleLogs+$i]);
-    $date[$i]    = trim($parse[0]);
-    $year[$i]    = trim($parse[1]);
-    $month[$i]   = trim($parse[2]);
-    $refresh[$i] = trim($parse[3]);
-    $online[$i]  = trim($parse[4]);
+foreach($log as $i=>$value){
+    $parse = Json::decode($value);
+    $date[$i]    = $parse[0];
+    $year[$i]    = $parse[1];
+    $month[$i]   = $parse[2];
+    $refresh[$i] = $parse[3];
+    $online[$i]  = $parse[4];
 }
+
 if ($game['maxrefresh'] == 0) {
     $game['maxrefresh'] = 1;
 }
@@ -63,7 +63,7 @@ if ($game['maxonline'] < $curonline) {
         <table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
             <tr><td colspan=4 align=center id=bg2><font size=5>접 속 량</font></td></tr>
 <?php
-for ($i=0; $i < $visibleLogs; $i++) {
+foreach($log as $i=>$value){
     $w = round($refresh[$i] / $game['maxrefresh'] * 100, 1);
     if ($w >= 100) {
         $w -= 0.1;
@@ -133,7 +133,7 @@ $dt = date('H:i');
         <table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
             <tr><td colspan=4 align=center id=bg2><font size=5>접 속 자</font></td></tr>
 <?php
-for ($i=0; $i < $visibleLogs; $i++) {
+foreach($log as $i=>$value){
     $w = round($online[$i] / $game['maxonline'] * 100, 1);
     if ($w >= 100) {
         $w -= 0.1;
diff --git a/hwe/func.php b/hwe/func.php
index 06192ea1..c96998ca 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -1349,12 +1349,14 @@ function updateTraffic() {
     $date = date('Y-m-d H:i:s');
     //일시|년|월|총갱신|접속자|최다갱신자
     file_put_contents(__dir__."/logs/_traffic.txt",
-        StringUtil::padStringAlignRight($date,20," ")
-        ."|".StringUtil::padStringAlignRight($game['year'],3," ")
-        ."|".StringUtil::padStringAlignRight($game['month'],2," ")
-        ."|".StringUtil::padStringAlignRight($game['refresh'],8," ")
-        ."|".StringUtil::padStringAlignRight($online,5," ")
-        ."|".StringUtil::padStringAlignRight($user['name']."(".$user['refresh'].")",20," ")
+        Json::encode([
+            $date,
+            $game['year'],
+            $game['month'],
+            $game['refresh'],
+            $online,
+            $user['name']."(".$user['refresh'].")"
+        ])."\n"
     , FILE_APPEND);
 }