은퇴 후 명전 등록 시 '이전 값보다 높아진 경우'에만 경신하도록 수정

e_lib/linkify/linkify-string.min.js

@@ -0,0 +1 @@
+"use strict";!function(t,r){var n=function(t){function r(t){return t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function n(t){return t.replace(/"/g,"&quot;")}function e(t){if(!t)return"";var r=[];for(var e in t){var i=t[e]+"";r.push(e+'="'+n(i)+'"')}return r.join(" ")}function i(t){var i=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};i=new a(i);for(var f=o(t),u=[],c=0;c<f.length;c++){var p=f[c];if("nl"===p.type&&i.nl2br)u.push("<br>\n");else if(p.isLink&&i.check(p)){var l=i.resolve(p),s=l.formatted,g=l.formattedHref,y=l.tagName,h=l.className,v=l.target,k=l.attributes,S="<"+y+' href="'+n(g)+'"';h&&(S+=' class="'+n(h)+'"'),v&&(S+=' target="'+n(v)+'"'),k&&(S+=" "+e(k)),S+=">"+r(s)+"</"+y+">",u.push(S)}else u.push(r(p.toString()))}return u.join("")}var o=t.tokenize,f=t.options,a=f.Options;if(!String.prototype.linkify)try{Object.defineProperty(String.prototype,"linkify",{a:function(){},get:function(){return function(t){return i(this,t)}}})}catch(u){String.prototype.linkify||(String.prototype.linkify=function(t){return i(this,t)})}return i}(r);t.linkifyStr=n}(window,linkify);

hwe/a_kingdomList.php

@@ -130,6 +130,19 @@ for($i=1; $i <= $count; $i++) {
     elseif($level5['npc'] == 1) { $l5 = "<font color=skyblue>{$level5['name']}</font>"; }
     else { $l5 = $level5['name']; }
 
+    $generals = $db->query('SELECT no,nation,npc,name,level,penalty,permission FROM general WHERE nation=%i ORDER BY no ASC', $nation['nation']);
+    $ambassadors = [];
+    $auditors = [];
+    foreach($generals as $general){
+        $generalPermission = checkSecretPermission($general, false);
+        if($generalPermission == 4){
+            $ambassadors[] = $general['name'];
+        }
+        else if($generalPermission == 3){
+            $auditors[] = $general['name'];
+        }
+    }
+
     echo "
 <table align=center width=1000 class='tb_layout bg2'>
     <tr>
@@ -143,7 +156,7 @@ for($i=1; $i <= $count; $i++) {
         <td width=80 align=center id=bg1>국 력</td>
         <td width=170 align=center>{$nation['power']}</td>
         <td width=80 align=center id=bg1>장수 / 속령</td>
-        <td width=170 align=center>{$gencount} / {$citycount}</td>
+        <td width=170 align=center>".count($generals)." / {$citycount}</td>
     </tr>
     <tr>
         <td align=center id=bg1>".getLevel(12, $nation['level'])."</td>
@@ -165,6 +178,12 @@ for($i=1; $i <= $count; $i++) {
         <td align=center id=bg1>".getLevel( 5, $nation['level'])."</td>
         <td align=center>$l5</td>
     </tr>
+    <tr>
+        <td align=center id=bg1>외교권자</td><td colspan=5>";
+    echo join(', ', $ambassadors);
+    echo "</td><td align=center id=bg1>조언자</td><td align=center >";
+    echo count($auditors).'명';
+    echo "</td></tr>
     <tr>
         <td colspan=8>";
     if($nation['level'] > 0) {
@@ -190,8 +209,7 @@ for($i=1; $i <= $count; $i++) {
     </tr>
     <tr>
         <td colspan=8> 장수 일람 : ";
-    for($j=0; $j < $gencount; $j++) {
-        $general = MYDB_fetch_array($genresult);
+    foreach($generals as $general){
         if($general['npc'] >= 2) { echo "<font color=cyan>{$general['name']}</font>, "; }
         elseif($general['npc'] == 1) { echo "<font color=skyblue>{$general['name']}</font>, "; }
         else { echo "{$general['name']}, "; }

hwe/b_battleCenter.php

@@ -33,7 +33,7 @@ $query = "select nation from general where no='$gen'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $general = MYDB_fetch_array($result);
 
-$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
+$query = "select no,nation,level,con,turntime,belong,permission,penalty from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
@@ -161,7 +161,7 @@ for ($i=0; $i < $gencount; $i++) {
             <?=getBatResRecent($gen, 24)?>
         </td>
     </tr>
-<?php if($npc > 1 || $meLevel >= 5): ?>
+<?php if($npc > 1 || $permission >= 2): ?>
     <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>

hwe/b_chiefcenter.php

@@ -13,7 +13,7 @@ $connect=$db->get();
 
 increaseRefresh("사령부", 1);
 
-$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
+$query = "select no,nation,level,con,turntime,belong,permission,penalty from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
 

hwe/b_dipcenter.php

@@ -13,7 +13,7 @@ $connect=$db->get();
 
 increaseRefresh("내무부", 1);
 
-$me = $db->queryFirstRow('SELECT no, nation, level, con, turntime, belong FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no, nation, level, con, turntime, belong, permission, penalty FROM general WHERE owner=%i', $userID);
 
 $nation = $db->queryFirstRow('SELECT msg, scoutmsg FROM nation WHERE nation = %i', $me['nation']);
 
@@ -85,7 +85,6 @@ var scoutmsg = <?=Json::encode($nation['scoutmsg']??'')?>;
         <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
 $admin = $gameStor->getValues(['year','month']);

hwe/b_genList.php

@@ -19,7 +19,7 @@ $connect=$db->get();
 
 increaseRefresh("암행부", 1);
 
-$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
+$query = "select no,nation,level,con,turntime,belong,permission,penalty from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 

hwe/b_myBossInfo.php

@@ -35,8 +35,12 @@ if($meLevel == 0) {
 <title><?=UniqueConst::$serverName?>: 인사부</title>
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
 <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('../e_lib/select2/select2.full.min.js')?>
 <?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/bossInfo.js')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+<?=WebUtil::printCSS('../e_lib/select2/select2.min.css')?>
+<?=WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <script type="text/javascript">
@@ -45,6 +49,51 @@ function out() {
 }
 </script>
 
+<?php 
+
+$query = "select nation,name,level,color,l12set,l11set,l10set,l9set,l8set,l7set,l6set,l5set from nation where nation='{$me['nation']}'";
+$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+$nation = MYDB_fetch_array($result);   //국가정보
+
+$ambassadors = $db->query('SELECT no, name, level, penalty, permission FROM general WHERE permission = \'ambassador\' AND nation = %i', $nation['nation']);
+$auditors = $db->query('SELECT no, name, level, penalty, permission FROM general WHERE permission = \'auditor\' AND nation = %i', $nation['nation']);
+$candidateAmbassadors = [];
+$candidateAuditors = [];
+foreach($ambassadors as $ambassador){
+    $candidateAmbassadors[] = $ambassador;
+}
+foreach($auditors as $auditor){
+    $candidateAuditors[] = $auditor;
+}
+foreach($db->query('SELECT no, name, nation, level, penalty, permission FROM general WHERE nation = %i AND permission = \'normal\' AND level != 12', $nation['nation']) as $candidate){
+    $maxPermission = checkSecretMaxPermission($candidate);
+    if($maxPermission == 4){
+        $candidateAmbassadors[] = $candidate;
+    }
+    if($maxPermission >= 3){
+        $candidateAuditors[] = $candidate;
+    }
+}
+
+?>
+<script>
+var candidateAmbassadors = <?=Json::encode(array_map(function($value){
+    return [
+        'id'=>$value['no'],
+        'text'=>$value['name'],
+        "selected"=>($value['permission']!='normal')
+    ];
+}, $candidateAmbassadors))?>;
+
+var candidateAuditors = <?=Json::encode(array_map(function($value){
+    return [
+        'id'=>$value['no'],
+        'text'=>$value['name'],
+        "selected"=>($value['permission']!='normal')
+    ];
+}, $candidateAuditors))?>;
+</script>
+
 </head>
 
 <body>
@@ -55,10 +104,6 @@ function out() {
 
 <?php
 
-$query = "select nation,name,level,color,l12set,l11set,l10set,l9set,l8set,l7set,l6set,l5set from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$nation = MYDB_fetch_array($result);   //국가정보
-
 $lv = getNationChiefLevel($nation['level']);
 if($meLevel >= 5) { $btn = "submit"; }
 else { $btn = "hidden"; }
@@ -77,6 +122,7 @@ $tigerresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connec
 $query = "select name,picture,firenum from general where nation='{$nation['nation']}' order by firenum desc limit 7";   // 건안칠자
 $eagleresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
+
 echo "
 <table align=center width=1000 class='tb_layout bg0'>
     <tr>
@@ -279,9 +325,35 @@ for($i=10; $i >= $lv; $i--) {
 echo "
     <tr><td colspan=4>※ <font color=red>빨간색</font>은 현재 임명중인 장수, <font color=orange>노란색</font>은 다른 관직에 임명된 장수, 하얀색은 일반 장수를 뜻합니다.</td></tr>
 </table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td colspan=5 height=5></td></tr>
+
 ";
+
+if($meLevel == 12):
+?>
+<table align='center' width='1000' class='tb_layout bg0'>
+    <tr><td colspan='4' height='5'></td></tr>
+<tr><td colspan='4' align='center' bgcolor='purple'>외 교 권 자 임 명</td></tr>
+    <tr>
+        <td width=98  align=right id=bg1>외교권자</td>
+        <td width=398>
+<select id="selectAmbassador" multiple="multiple">
+</select>
+    <button id='changeAmbassador' type='button'>임명</button>
+        </td>
+        <td width=98  align=right id=bg1>조언자</td>
+        <td width=398>
+<select id="selectAuditor" multiple="multiple">
+</select>
+        <button id='changeAuditor' type='button'>임명</button>
+        </td>
+    </tr>
+</table>
+<?php
+endif;
+?>
+<table align=center width=1000 id='officer_list' class='tb_layout bg0'>
+    <tr><td colspan=5 height=5></td></tr>
+<?php
 if($meLevel >= 5) {
     echo "
     <tr><td colspan=5 align=center bgcolor=orange>도 시 관 직 임 명</td></tr>
@@ -395,7 +467,7 @@ if($meLevel >= 5) {
 </form>
 <form method=post action=c_myBossInfo.php>
     <tr>
-        <td colspan=3 align=right id=bg2>시 중 임 명</td>
+        <td colspan=3 align=right id=bg2>종 사 임 명</td>
         <td colspan=2>
             <select name=citylist size=1 style=color:white;background-color:black;>
     ";
@@ -455,7 +527,7 @@ echo "
         <td width=158 align=center id=bg1 colspan=2><font size=4>도 시</font></td>
         <td width=278 align=center id=bg1><font size=4>태 수 (사관) 【현재도시】</font></td>
         <td width=278 align=center id=bg1><font size=4>군 사 (사관) 【현재도시】</font></td>
-        <td width=278 align=center id=bg1><font size=4>시 중 (사관) 【현재도시】</font></td>
+        <td width=278 align=center id=bg1><font size=4>종 사 (사관) 【현재도시】</font></td>
     </tr>
 ";
 

hwe/c_dipcenter.php

@@ -18,7 +18,7 @@ $userID = Session::getUserID();
 
 $db = DB::db();
 
-$me = $db->queryFirstRow('SELECT `no`,nation,`level` FROM general WHERE `owner`=%i', $userID);
+$me = $db->queryFirstRow('SELECT `no`,nation,`level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
 
 //내가 수뇌부이어야함
 $permission = checkSecretPermission($me);

hwe/c_myBossInfo.php

@@ -59,7 +59,7 @@ if($btn == "임명") {
         header('location:b_myBossInfo.php');
         exit();
     }
-    $query = "select no,name,gold,rice,nation,troop,level,npc,picture,imgsvr,permission,penalty from general where no='$outlist'";
+    $query = "select no,name,gold,rice,nation,troop,level,npc,picture,imgsvr,permission,penalty,belong from general where no='$outlist'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
 
@@ -150,6 +150,7 @@ if($btn == "추방") {
                     'level'=>0,
                     'nation'=>0,
                     'belong'=>0,
+                    'permission'=>'normal',
                 ], 'no=%i', $general['no']);
             }
             else{
@@ -309,27 +310,29 @@ if($btn == "임명" && $level >= 5 && $level <= 11) {
 
 if($btn == "임명" && $level >= 2 && $level <= 4 && $citylist > 0) {
     switch($level) {
-    case 4: $lv = 1; break;
-    case 3: $lv = 2; break;
-    case 2: $lv = 3; break;
+    case 4: $genlv = 'gen1'; $genlvset = 'gen1set'; break;
+    case 3: $genlv = 'gen2'; $genlvset = 'gen2set'; break;
+    case 2: $genlv = 'gen3'; $genlvset = 'gen3set'; break;
     }
 
-    $query = "select gen{$lv} from city where nation='{$me['nation']}' and city='$citylist'";
+    $query = "select {$genlv} from city where nation='{$me['nation']}' and city='$citylist'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $city = MYDB_fetch_array($result);
     if(!$city){
         header('location:b_myBossInfo.php');
         die();
     }
-    $oldlist = $city["gen{$lv}"];
+    $oldlist = $city[$genlv];
 
     if($oldlist != 0) {
         //기존 장수 일반으로
-        $query = "update general set level=1 where no='$oldlist'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('general', [
+            'level'=>1
+        ], 'no=%i', $oldlist);
         //기존 자리 공석으로
-        $query = "update city set gen{$lv}=0 where city='$citylist'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('city', [
+            $genlv=>0
+        ], 'city = %i AND nation = %i', $citylist , $me['nation']);
     }
     if($genlist != 0) {
         $valid = 0;
@@ -341,17 +344,26 @@ if($btn == "임명" && $level >= 2 && $level <= 4 && $citylist > 0) {
 
         if($valid == 1) {
             // 신임 장수의 원래 자리 해제
-            $query = "update city set gen1=0 where gen1='$genlist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update city set gen2=0 where gen2='$genlist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update city set gen3=0 where gen3='$genlist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $db->update('city', [
+                'gen1'=>0,
+            ], 'gen1=%i', $genlist);
+            $db->update('city', [
+                'gen2'=>0,
+            ], 'gen2=%i', $genlist);
+            $db->update('city', [
+                'gen3'=>0,
+            ], 'gen3=%i', $genlist);
+
             //신임 장수
-            $query = "update general set level='$level' where no='$genlist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update city set gen{$lv}='$genlist',gen{$lv}set='1' where city='$citylist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $db->update('city', [
+                $genlv=>$genlist,
+                $genlvset=>1
+            ], 'city=%i AND nation=%i', $citylist, $general['nation']);
+            if($db->affectedRows() > 0){
+                $db->update('general',[
+                    'level'=>$level
+                ], 'no=%i', $genlist);
+            }
         }
     }
     header('location:b_myBossInfo.php');

hwe/c_vacation.php

@@ -12,7 +12,9 @@ $gameStor = KVStorage::getStorage($db, 'game_env');
 
 $killturn = $gameStor->killturn;
 
-$db->update('general', ['killturn'=>$killturn*3], 'owner=%i', $userID);
+$db->update('general', [
+    'killturn'=>$killturn*3,
+], 'owner=%i', $userID);
 
 
 header('location:b_myPage.php');

hwe/css/board.css

@@ -0,0 +1,56 @@
+#newArticle{
+    width:1000px;
+    margin: 0 auto;
+}
+
+.titleInput{
+    width:100%;
+    color:white;
+    background-color:transparent;
+    border:none;
+    margin:1px 5px;
+}
+
+.contentInput{
+    width:100%;
+    min-height:3em;
+    color:white;
+    background-color:transparent;
+    border:none;
+    padding:1px 5px;
+}
+
+.articleFrame{
+    width:1000px;
+    margin: 20px auto;
+}
+
+.commentText{
+    width:100%;
+}
+
+.authorName, .comment .author{
+    width:110px;
+    font-size:85%;
+}
+
+.date{
+    width:125px;
+    font-size:85%;
+}
+
+.text{
+    text-align:left;
+    padding:1px 5px;
+}
+
+.submitComment{
+    width:100%;
+}
+
+.commentText{
+    color:white;
+    background-color:transparent;
+    border:none;
+    padding:1px 5px;
+}

hwe/css/diplomacy.css

@@ -0,0 +1,58 @@
+#newLetter {
+    width:1000px;
+    margin: 10px auto;
+}
+
+#newLetter th{
+    width:20ch;
+}
+
+#newLetter textarea{
+    width:100%;
+    min-height:3em;
+    color:white;
+    background-color:transparent;
+    border:none;
+}
+
+.letterFrame{
+    width:1000px;
+    margin: 10px auto;
+}
+
+.letterFrame th{
+    width:20ch;
+}
+
+.letterHeader{
+    position: relative;
+    font-size:200%;
+}
+
+.letterDate{
+    position: absolute;
+    right:1ch;
+    bottom:0.2em;
+    font-size:50%;
+
+}
+
+.letterBrief, .letterDetail{
+    text-align: left;
+}
+
+.letterSignerPlate{
+    text-align:center;
+}
+
+.letterSrc, .letterDest{
+    display:inline-block;
+    margin: 0 10px;
+    border: 1px solid gray;
+    width:110px;
+    text-align:center;
+}
+
+.signerNation, .signerName{
+    border-top: 1px solid gray;
+}

hwe/css/main.css

@@ -67,4 +67,15 @@ color:white;
 
 .nation_info td{
     height:18px;
+}
+
+#sidebar{
+    position:fixed;
+    right:0;
+    top: 50%;
+    transform: translateY(-50%);
+}
+
+#sidebar button{
+    /*width:100px;*/
 }

hwe/css/msg.css

@@ -60,11 +60,11 @@
 }
 
 .diplomacy_message{
-    height:667px;
+    flex: 1;
 }
 
 .national_message{
-    flex: 1;
+    height:667px;
 }
 
 .private_message{

hwe/func.php

@@ -399,8 +399,22 @@ function myNationInfo() {
 ";
 }
 
-function checkSecretPermission($me){
-    if(!key_exists($me['penalty']) || !key_exists($me['permission'])){
+function checkSecretMaxPermission($me){
+    $secretMax = 4;
+    if($penalty['noTopSecret']??false){
+        $secretMax = 1;
+    }
+    else if($penalty['noChief']??false){
+        $secretMax = 1;
+    }
+    else if($penalty['noAmbassador']??false){
+        $secretMax = 2;
+    }
+    return $secretMax;
+}
+
+function checkSecretPermission($me, $checkSecretLimit=true){
+    if(!key_exists('penalty', $me) || !key_exists('permission', $me)){
         trigger_error ('canAccessSecret() 함수에 필요한 인자가 부족');
     }
     $penalty = Json::decode($me['penalty'])??[];
@@ -413,24 +427,15 @@ function checkSecretPermission($me){
     if($me['level'] == 0){
         return -1;
     }
-
-    $secretLimit = $db->queryFirstField('SELECT secretlimit FROM nation WHERE nation = %i', $me['nation']);
+    
 
     if($pernalty['noSecret']??false){
         return 0;
     }
 
     $secretMin = 0;
-    $secretMax = 3;
-    if($penalty['noTopSecret']??false){
-        $secretMax = 1;
-    }
-    else if($penalty['noChief']??false){
-        $secretMax = 1;
-    }
-    else if($penalty['noAmbassador']??false){
-        $secretMax = 2;
-    }    
+    $secretMax = checkSecretMaxPermission($me);
+    
 
     if($me['level'] == 12){
         $secretMin = 4;
@@ -447,8 +452,12 @@ function checkSecretPermission($me){
     else if($me['level'] > 1){
         $secretMin = 1;
     }
-    else if($me['belong'] >= $secretLimit){
-        $secretMin = 1;
+    else if($checkSecretLimit){
+        $db = DB::db();
+        $secretLimit = $db->queryFirstField('SELECT secretlimit FROM nation WHERE nation = %i', $me['nation']);
+        if ($me['belong'] >= $secretLimit) {
+            $secretMin = 1;
+        }
     }
 
     return min($secretMin, $secretMax);
@@ -1944,6 +1953,7 @@ function updateTurntime($no) {
                 'npc'=>$general['npc_org'],
                 'killturn'=>$general['killturn'],
                 'mode'=>2,
+                'permission'=>'normal',
                 'name2'=>null
             ], 'no=%i',$no);
 
@@ -1959,7 +1969,7 @@ function updateTurntime($no) {
                 nextRuler($general);
             }
 
-            //도시의 태수, 군사, 시중직도 초기화
+            //도시의 태수, 군사, 종사직도 초기화
             $query = "update city set gen1='0' where gen1='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
             $query = "update city set gen2='0' where gen2='{$general['no']}'";
@@ -2178,7 +2188,7 @@ function CheckHall($no) {
         ];
         $jsonAux = Json::encode($aux);
 
-        $db->insertUpdate('ng_hall', [
+        $db->insertIgnore('ng_hall', [
             'server_id'=>UniqueConst::$serverID,
             'scenario'=>$scenarioIdx,
             'general_no'=>$no,
@@ -2186,10 +2196,21 @@ function CheckHall($no) {
             'value'=>$general[$typeName]??0,
             'owner'=>$general['owner']??null,
             'aux'=>$jsonAux
-        ],[
-            'value'=>$general[$typeName]??0,
-            'aux'=>$jsonAux
         ]);
+
+        if($db->affectedRows() == 0){
+            $db->update('ng_hall', [
+                'value'=>$general[$typeName]??0,
+                'aux'=>$jsonAux
+            ], 
+            'server_id = %s AND scenario = %i AND general_no = %i AND type = %i AND value < %?', 
+            UniqueConst::$serverID,
+            $scenarioIdx,
+            $no,
+            $idx,
+            $general[$typeName]??0);
+        }
+        
     }
 }
 
@@ -2550,7 +2571,7 @@ function deleteNation($general) {
     $oldNation['aux'] = Json::decode($oldNation['aux']);
 
     // 전 장수 재야로    // 전 장수 소속 무소속으로
-    $query = "update general set belong=0,troop=0,level=0,nation=0,makelimit=12 where nation='{$general['nation']}'";
+    $query = "update general set belong=0,troop=0,level=0,nation=0,permission='normal',makelimit=12 where nation='{$general['nation']}'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     // 도시 공백지로
     $query = "update city set nation=0,front=0,gen1=0,gen2=0,gen3=0 where nation='{$general['nation']}'";

hwe/func_gamerule.php

@@ -776,6 +776,7 @@ function checkMerge() {
 
         $db->update('general', [
             'nation'=>0,
+            'permission'=>'normal',
         ], 'nation=%i AND npc = 5', $me['nation']);
 
         $query = "delete from nation where nation='{$me['nation']}'";
@@ -922,6 +923,7 @@ function checkSurrender() {
 
         $db->update('general', [
             'nation'=>0,
+            'permission'=>'normal',
         ], 'nation=%i AND npc = 5', $me['nation']);
 
         $query = "delete from nation where nation='{$me['nation']}'";

hwe/func_message.php

@@ -5,14 +5,15 @@ function getMailboxList(){
         
     $generalNations = [];
 
-    foreach(DB::db()->queryAllLists('select `no`, `name`, `nation`, `level`, `npc` from `general` where `npc` < 2') as $general)
+    foreach(DB::db()->query('select `no`, `name`, `nation`, `level`, `npc`, `permission`, `penalty` from `general` where `npc` < 2') as $general)
     {
-        list($generalID, $generalName, $nationID, $level, $npc) = $general;
+        [$generalID, $generalName, $nationID, $level, $npc] = [$general['no'], $general['name'], $general['nation'], $general['level'], $general['npc']];
         if(!isset($generalNations[$nationID])){
             $generalNations[$nationID] = [];
         }
 
         $obj = [$generalID, $generalName, 0];
+        $permission = checkSecretPermission($general, false);
 
         if($level == 12){
             $obj[2] |= 1;
@@ -22,6 +23,10 @@ function getMailboxList(){
             $obj[2] |= 2;
         }
 
+        if($permission == 4){
+            $obj[2] |= 4;
+        }
+
         $generalNations[$nationID][] = $obj;
     }
 
@@ -37,7 +42,7 @@ function getMailboxList(){
             "mailbox"=>$mailbox,
             "name"=>$nationName,
             "color"=>$color,
-            "general"=>$generals
+            "general"=>$generals,
         ];
     }, array_merge([getNationStaticInfo(0)], getAllNationStaticInfo()));
 

hwe/func_npc.php

@@ -204,6 +204,21 @@ function processAI($no) {
                 'killturn'=>1
             ], 'no=%i', $general['no']);
         }
+        else if($general['level'] == 12){
+            $newRuler = $db->queryFirstField('SELECT `no` FROM general WHERE nation = %i AND no != %i ORDER BY RAND() LIMIT 1', $general['nation'], $general['no']);
+            if($newRuler){
+                $command = EncodeCommand(0, 0, $newRuler, 54); //선양
+                $db->update('general', [
+                    'turn0'=>$command,
+                    'turn1'=>$command,
+                    'turn2'=>$command,
+                    'turn3'=>$command,
+                    'turn4'=>$command,
+                    'killturn'=>rand(70,75),
+                ], 'no=%i', $general['no']);
+            }
+            
+        }
         else{
             $command = EncodeCommand(0, 0, 0, 26); //집합
             $db->update('general', [
@@ -1416,6 +1431,10 @@ function Promotion($nation, $level) {
         $query = "update general set level={$i2} where no='{$level['no']}'";
         MYDB_query($query, $connect) or Error("Promotion_02 ".MYDB_error($connect),"");
     }
+
+    $db->update('general', [
+        'permission'=>'ambassador',
+    ], 'nation=%i AND npc < 2 AND level > 4', $nation);
 }
 
 function TaxRate($nation) {

hwe/func_process_personnel.php

@@ -243,6 +243,7 @@ function process_25(&$general) {
             'nation'=>$nation['nation'],
             'nations'=>Json::encode($joinedNations),
             'level'=>1,
+            'permission'=>'normal',
             'experience'=>$db->sqleval('experience + %i', $exp),
             'city'=>$king['city'],
             'belong'=>1
@@ -846,18 +847,28 @@ function process_54(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:현재 통합 진행중입니다. 선양 실패.";
     } else {
         //군주 교체
-        $query = "update general set level='12' where no='$who'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        // 태수,군사,종사이었다면 해제
-        $query = "update city set gen1='0' where gen1='$who'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $query = "update city set gen2='0' where gen2='$who'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $query = "update city set gen3='0' where gen3='$who'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('general', [
+            'level'=>12,
+            'permission'=>'normal'
+        ], 'no=%i', $who);
 
-        $query = "update general set resturn='SUCCESS',level='1',experience=experience*0.7 where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        // 태수,군사,종사이었다면 해제
+        $db->update('city', [
+            'gen1'=>0,
+        ], 'gen1=%i', $who);
+        $db->update('city', [
+            'gen2'=>0,
+        ], 'gen2=%i', $who);
+        $db->update('city', [
+            'gen3'=>0,
+        ], 'gen3=%i', $who);
+        
+        $db->update('general', [
+            'resturn'=>'SUCCESS',
+            'level'=>1,
+            'permission'=>'auditor',
+            'experience'=>$db->sqleval('experience*0.7'),
+        ], 'no=%i', $general['no']);
 
         $josaYi = JosaUtil::pick($general['name'], '이');
         $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【선양】</b></><Y>{$general['name']}</>{$josaYi} <D><b>{$nation['name']}</b></>의 군주 자리를 <Y>{$nextruler['name']}</>에게 선양했습니다.";

hwe/func_template.php

@@ -136,9 +136,9 @@ function commandButton() {
     }
     
     $db = DB::db();
-    $me = $db->queryFirstRow("select no,nation,level,belong from general where owner=%i", $userID);
+    $me = $db->queryFirstRow("select no,nation,level,belong,permission,penalty from general where owner=%i", $userID);
 
-    $nation = $db->queryFirstRow("select permission,penalty,nation,level,color,secretlimit from nation where nation=%i",$me['nation'])??[
+    $nation = $db->queryFirstRow("select nation,level,color,secretlimit from nation where nation=%i",$me['nation'])??[
         'nation'=>0,
         'level'=>0,
         'secretlimit'=>99,
@@ -163,7 +163,8 @@ function commandButton() {
         'fgColor'=>$fgColor,
         'meLevel'=>$me['level'],
         'nationLevel'=>$nation['level'],
-        'showSecret'=>$showSecret
+        'showSecret'=>$showSecret,
+        'permission'=>$permission,
     ]);
 }
 

hwe/func_time_event.php

@@ -40,7 +40,7 @@ function processSpring() {
 
     $admin = $gameStor->getValues(['year', 'month']);
 
-    pushWorldHistory(["<R>★</>{$admin['year']}년 {$admin['month']}월: <S>모두들 즐거운 게임 하고 계신가요? ^^ <Y>삼국일보</> 애독해 주시고, <M>훼접</>은 삼가주세요~</>"], $admin['year'], $admin['month']);
+    pushWorldHistory(["<R>★</>{$admin['year']}년 {$admin['month']}월: <S>모두들 즐거운 게임 하고 계신가요? ^^ <Y>매너 있는 플레이</> 부탁드리고, <M>지나친 훼접</>은 삼가주세요~</>"], $admin['year'], $admin['month']);
 }
 
 function processGoldIncome() {

hwe/index.php

@@ -89,6 +89,8 @@ $mapTheme = $admin['map_theme'];
 <?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
 <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../e_lib/moment.min.js')?>
+<?=WebUtil::printJS('../e_lib/linkify/linkify.min.js')?>
+<?=WebUtil::printJS('../e_lib/linkify/linkify-string.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printJS('js/main.js')?>
@@ -115,6 +117,7 @@ $(function(){
 <?=WebUtil::printCSS('css/main.css')?>
 <?=WebUtil::printCSS('css/map.css')?>
 <?=WebUtil::printCSS('css/msg.css')?>
+<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
 <link href="https://fonts.googleapis.com/css?family=Nanum+Gothic|Nanum+Myeongjo|Nanum+Pen+Script" rel="stylesheet">
 
 </head>
@@ -231,7 +234,7 @@ else if($session->userGrade == 4){
 ?>
 
 </table>
-<table class="tb_layout bg0" style="width:1000px;">
+<table class="tb_layout bg0" style="width:1000px;" id='map_position'>
     <tr>
         <td style='width:700px;height:520px;' colspan=2>
             <?=getMapHtml($mapTheme)?>
@@ -263,7 +266,7 @@ else if($session->userGrade == 4){
         </td>
     </tr>
     <tr>
-        <td align=right style="'width:650px;border:none;">
+        <td align=right style="'width:650px;border:none;"><br>
             <?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('../')><br>
         </td>
@@ -277,7 +280,7 @@ else if($session->userGrade == 4){
     </tr>
     <tr><td colspan=2><?=commandButton()?></td></tr>
 </table>
-<table class="tb_layout bg0">
+<table class="tb_layout bg0" id='history_position'>
     <tr>
         <td width=498 class='bg1 center'><b>장수 동향</b></td>
         <td width=498 class='bg1 center'><b>개인 기록</b></td>
@@ -303,11 +306,11 @@ else if($session->userGrade == 4){
 </div>
 <div><?=allButton()?></div>
 <div id="message_board"><div style="left:0;" class="board_side bg0">
-        <div class="board_header bg0">전체 메시지(최고99자)</div>
+        <div class="board_header bg0" id='public_talk_position'>전체 메시지(최고99자)</div>
         <section class="public_message">
         <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="public">이전 메시지 불러오기</button>
         </section>
-        <div class="board_header bg0">개인 메시지(최고99자)</div>
+        <div class="board_header bg0" id='secret_talk_position'>개인 메시지(최고99자)</div>
         <section class="private_message">
         <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="private">이전 메시지 불러오기</button>
         </section>
@@ -323,12 +326,19 @@ else if($session->userGrade == 4){
  </div></div>
 <div style="clear:left;"><?=allButton()?><?=banner()?></div>
 </div>
+<div id='sidebar' class='btn-group-vertical'>
+<button type="button" class="btn btn-primary" onclick='refreshing(this, 0,0)'><i class="fas fa-sync-alt"></i>&nbsp;갱신</button>
+<a class="btn btn-secondary" href="#map_position" role="button">지도 & 턴입력</a>
+<a class="btn btn-secondary" href="#history_position" role="button">장수 동향</a>
+<a class="btn btn-secondary" href="#public_talk_position" role="button">국가 메시지</a>
+<a class="btn btn-secondary" href="#secret_talk_position" role="button">개인 메시지</a>
+</div>
 <?php
 if ($con == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다!");
 }
 if ($me['newmsg'] == 1) {
-    MessageBox("개인 서신이 도착했습니다!");
+    MessageBox("새로운 서신이 도착했습니다!");
 }
 if ($me['newvote'] == 1) {
     $develcost = $admin['develcost']*5;

hwe/j_basic_info.php

@@ -2,6 +2,7 @@
 namespace sammo;
 
 include('lib.php');
+include 'func.php';
 
 $result = [
     "generalID"=>null,
@@ -11,7 +12,7 @@ $result = [
 $session = Session::requireGameLogin([])->setReadOnly();
 $userID = Session::getUserID();
 
-$generalInfo = DB::db()->queryFirstRow('SELECT `no`, `nation`, `level`, penalty, permission from `general` where `owner`=%i', $userID);
+$generalInfo = DB::db()->queryFirstRow('SELECT `no`, `nation`, `level`, belong, penalty, permission from `general` where `owner`=%i', $userID);
 if(!$generalInfo){
     Json::die($result);
 }

hwe/j_board_article_add.php

@@ -15,7 +15,7 @@ $text = Util::getReq('text');
 
 increaseRefresh("회의실", 1);
 
-$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no, nation, name, level, permission, con, turntime, belong, penalty, `picture`,`imgsvr` FROM general WHERE owner=%i', $userID);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -57,12 +57,15 @@ else if ($isSecretBoard && $permission < 2) {
     ]);
 }
 
+$icon = GetImageURL($me['imgsvr'], $me['picture']);
+
 $db->insert('board', [
     'nation_no'=>$me['nation'],
     'is_secret'=>$isSecretBoard,
     'date'=>TimeUtil::DatetimeNow(),
     'general_no'=>$me['no'],
     'author'=>$me['name'],
+    'author_icon'=>$icon,
     'title'=>$title,
     'text'=>$text
 ]);

hwe/j_board_comment_add.php

@@ -14,7 +14,7 @@ $text = Util::getReq('text');
 
 increaseRefresh("회의실", 1);
 
-$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no, nation, name, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {

hwe/j_board_get_articles.php

@@ -62,7 +62,7 @@ foreach(
     ) as $comment
 ){
     //TODO:아이콘 받아오기?
-    $articles[$article['no']]['comment'] = $comment;
+    $articles[$comment['document_no']]['comment'][] = $comment;
 }
 
 Json::die([

hwe/j_diplomacy_destroy_letter.php

@@ -0,0 +1,134 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+
+$letterNo = Util::getReq('letterNo', 'int');
+
+increaseRefresh("외교부", 1);
+
+$me = $db->queryFirstRow('SELECT no, name, nation, level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+if($letterNo === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 입력입니다.'
+    ]);
+}
+
+
+$permission = checkSecretPermission($me);
+if ($permission < 4) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'권한이 부족합니다. 수뇌부가 아닙니다.'
+    ]);
+}
+
+$letter = $db->queryFirstRow('SELECT * FROM ng_diplomacy WHERE no=%i AND (src_nation_id = %i OR dest_nation_id = %i) AND state = \'activated\'', $letterNo, $me['nation'], $me['nation']);
+if(!$letter){
+    Json::die([
+        'result'=>false,
+        'reason'=>'서신이 없습니다.'
+    ]);
+}
+
+
+$aux = Json::decode($letter['aux']);
+
+
+$stateOpt = $aux['state_opt']??null;
+
+if(($stateOpt == 'try_destroy_src' && $letter['src_nation_id'] == $me['nation'])||
+($stateOpt == 'try_destroy_dest' && $letter['dest_nation_id'] == $me['nation'])){
+    Json::die([
+        'result'=>false,
+        'reason'=>'이미 파기 신청을 했습니다.'
+    ]);
+}
+
+$srcNation = getNationStaticInfo($letter['src_nation_id']);
+$destNation = getNationStaticInfo($letter['dest_nation_id']);
+$me['icon'] = GetImageURL($me['imgsvr'], $me['picture']);
+
+
+if($letter['src_nation_id'] == $me['nation']){
+    $src = new MessageTarget($me['no'], $me['name'], $srcNation['nation'], $srcNation['name'], $srcNation['color'], $me['icon']);
+    $dest = new MessageTarget(0, '', $destNation['nation'], $destNation['name'], $destNation['color']);
+}
+else{
+    $src = new MessageTarget($me['no'], $me['name'], $destNation['nation'], $destNation['name'], $destNation['color'], $me['icon']);
+    $dest = new MessageTarget(0, '', $srcNation['nation'], $srcNation['name'], $srcNation['color']);
+}
+
+
+$now = new \DateTime();
+$unlimited = new \DateTime('9999-12-31');
+
+if(in_array($stateOpt, ['try_destroy_src', 'try_destroy_dest'])){
+    $deleteLetterNo = $letterNo;
+    $db->update('ng_diplomacy', [
+        'state'=>'cancelled',
+        'aux'=>Json::encode($aux)
+    ], 'no=%i', $letterNo);
+    while(true){
+        $deleteLetter = $db->queryFirstRow('SELECT prev_no, aux FROM ng_diplomacy WHERE no = %i AND state = \'replaced\'', $currentLetterNo);
+        if(!$deleteLetter){
+            break;
+        }
+        $deleteAux = Json::decode($deleteLetter['aux']);
+        $deleteLetterNo = $deleteLetter['prev_no'];
+        $deleteAux['reason'] = [
+            'who'=>$me['no'],
+            'action'=>'destroy',
+            'reason'=>'파기'
+        ];
+    }
+    $msgText = "외교 서신 #{$letterNo}를 파기했습니다.";
+    $lastState = 'cancelled';
+}
+else{
+    if ($letter['src_nation_id'] == $me['nation']) {
+        $aux['state_opt'] = 'try_destroy_src';
+    }
+    else{
+        $aux['state_opt'] = 'try_destroy_dest';
+    }
+    $db->update('ng_diplomacy', [
+        'aux'=>Json::encode($aux)
+    ], 'no=%i', $letterNo);
+
+    $msgText = "외교 서신 #{$letterNo}를 파기 요청합니다.";
+    $lastState = 'activated';
+}
+
+$msg = new Message(
+    Message::MSGTYPE_DIPLOMACY,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success',
+    'state'=>$lastState
+]);

hwe/j_diplomacy_get_letter.php

@@ -38,17 +38,32 @@ $letters = [];
 
 foreach(
     $db->query(
-        'SELECT * FROM ng_diplomacy WHERE src_nation_id = %i OR dest_nation_id = %i ORDER BY date desc',
+        'SELECT * FROM ng_diplomacy WHERE (src_nation_id = %i OR dest_nation_id = %i) AND state != \'cancelled\' ORDER BY date desc',
         $me['nation'], $me['nation']
     ) as $letter
 ){
 
-    if($permission < 3){
-        $letter['detail'] = '(권한이 부족합니다)';
+    if($permission < 3 && $letter['text_detail']){
+        $letter['text_detail'] = '(권한이 부족합니다)';
     }
-    $letter['comment'] = [];
     $letter['aux'] = Json::decode($letter['aux']);
-    $letters[$letter['no']] = $letter;
+    $letter['src'] = $letter['aux']['src'];
+    $letter['dest'] = $letter['aux']['dest'];
+
+    $letter['src']['nationID'] = $letter['src_nation_id'];
+    $letter['dest']['nationID'] = $letter['dest_nation_id'];
+
+    $letters[$letter['no']] = [
+        'no'=>$letter['no'],
+        'src'=>$letter['src'],
+        'dest'=>$letter['dest'],
+        'prev_no'=>$letter['prev_no'],
+        'state'=>$letter['state'],
+        'state_opt'=>($letter['aux']['state_opt']??null),
+        'brief'=>$letter['text_brief'],
+        'detail'=>$letter['text_detail'],
+        'date'=>$letter['date']
+    ];
 }
 
 $nations = [];
@@ -63,6 +78,7 @@ Json::die([
     'result'=>true,
     'nations'=>$nations,
     'letters'=>$letters,
+    'myNationID'=>$me['nation'],
     'reason'=>'success'
 ]);
 

hwe/j_diplomacy_respond_letter.php

@@ -16,9 +16,9 @@ $reason = Util::getReq('reason', 'string', '');
 
 
 
-increaseRefresh("회의실", 1);
+increaseRefresh("외교부", 1);
 
-$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no, name, nation, level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -35,7 +35,6 @@ if($letterNo === null){
     ]);
 }
 
-
 $permission = checkSecretPermission($me);
 if ($permission < 4) {
     Json::die([
@@ -55,15 +54,36 @@ if(!$letter){
 }
 
 $aux = Json::decode($letter['aux']);
+$me['icon'] = GetImageURL($me['imgsvr'], $me['picture']);
+
+$srcNation = getNationStaticInfo($letter['src_nation_id']);
+$destNation = getNationStaticInfo($letter['dest_nation_id']);
+
+$src = new MessageTarget($me['no'], $me['name'], $destNation['nation'], $destNation['name'], $destNation['color'], $me['icon']);
+$dest = new MessageTarget(0, '', $srcNation['nation'], $srcNation['name'], $srcNation['color']);
+
+$now = new \DateTime();
+$unlimited = new \DateTime('9999-12-31');
 
 if($isAgree){
     $aux['dest']['generalName'] = $me['name'];
+    $aux['dest']['generalIcon'] = $me['icon'];
+
     $db->update('ng_diplomacy', [
         'state'=>'activated',
         'dest_signer'=>$me['no'],
         'aux'=>Json::encode($aux)
     ], 'no=%i', $letterNo);
     //TODO: 외교 서신에 대한 메시지를 양국에 발송해야함
+
+    $prevLetterNo = $letter['prev_no'];
+    while($prevLetterNo !== null){
+        $db->update('ng_diplomacy', [
+            'state'=>'replaced',
+        ], 'no=%i', $prevLetterNo);
+        $prevLetterNo = $db->queryFirstField('SELECT prev_no FROM ng_diplomacy WHERE state != \'cancelled\' AND no = %i', $prevLetterNo);
+    }
+    $msgText = "외교 서신 #{$letterNo}가 승인되었습니다.";
 }
 else{
     $aux['reason'] = [
@@ -74,10 +94,35 @@ else{
     $db->update('ng_diplomacy', [
         'state'=>'cancelled',
         'aux'=>Json::encode($aux)
-    ]);
-    //TODO: 외교 서신에 대한 메시지를 양국에 발송해야함
+    ], 'no=%i', $letterNo);
+    $msgText = "외교 서신 #{$letterNo}가 거부되었습니다.";
+    if($reason){
+        $msgText .= ' 이유 : '.$reason;
+    }
 }
 
+$msg = new Message(
+    Message::MSGTYPE_DIPLOMACY,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
+
+$msg = new Message(
+    Message::MSGTYPE_NATIONAL,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
+
 Json::die([
     'result'=>true,
     'reason'=>'success'

hwe/j_diplomacy_rollback_letter.php

@@ -0,0 +1,89 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+
+$letterNo = Util::getReq('letterNo', 'int');
+
+increaseRefresh("외교부", 1);
+
+$me = $db->queryFirstRow('SELECT no, name, nation, level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+if($letterNo === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 입력입니다.'
+    ]);
+}
+
+
+$permission = checkSecretPermission($me);
+if ($permission < 4) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'권한이 부족합니다. 수뇌부가 아닙니다.'
+    ]);
+}
+
+$reason = trim($reason);
+
+$letter = $db->queryFirstRow('SELECT * FROM ng_diplomacy WHERE no=%i AND src_nation_id = %i AND state = \'proposed\'', $letterNo, $me['nation']);
+if(!$letter){
+    Json::die([
+        'result'=>false,
+        'reason'=>'서신이 없습니다.'
+    ]);
+}
+
+$aux = Json::decode($letter['aux']);
+$me['icon'] = GetImageURL($me['imgsvr'], $me['picture']);
+
+$srcNation = getNationStaticInfo($letter['src_nation_id']);
+$destNation = getNationStaticInfo($letter['dest_nation_id']);
+
+$src = new MessageTarget($me['no'], $me['name'], $srcNation['nation'], $srcNation['name'], $srcNation['color'], $me['icon']);
+$dest = new MessageTarget(0, '', $destNation['nation'], $destNation['name'], $destNation['color']);
+
+$now = new \DateTime();
+$unlimited = new \DateTime('9999-12-31');
+
+$aux['reason'] = [
+    'who'=>$me['no'],
+    'action'=>'cancelled',
+    'reason'=>$reason
+];
+$db->update('ng_diplomacy', [
+    'state'=>'cancelled',
+    'aux'=>Json::encode($aux)
+], 'no=%i', $letterNo);
+$msgText = "외교 서신 #{$letterNo}가 회수되었습니다.";
+
+$msg = new Message(
+    Message::MSGTYPE_DIPLOMACY,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success'
+]);

hwe/j_diplomacy_send_letter.php

@@ -11,8 +11,8 @@ $db = DB::db();
 
 $destNationNo = Util::getReq('destNation', 'int', 0);
 $prevNo = Util::getReq('prevNo', 'int', null);
-$textBrief = Util::getReq('textBrief');
-$textDetail = Util::getReq('textDetail');
+$textBrief = Util::getReq('brief');
+$textDetail = Util::getReq('detail');
 
 increaseRefresh("외교부", 1);
 
@@ -20,7 +20,7 @@ if($prevNo < 1){
     $prevNo = null;
 }
 
-$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+$me = $db->queryFirstRow('SELECT no, name, nation, level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -65,18 +65,10 @@ if ($permission < 4) {
 
 $srcNationNo = $me['nation'];
 
-$nations = $db->query('SELECT nation, name, color FROM nation WHERE nation IN (%i, %i)', $srcNationNo, $destNationNo);
-if(count($nations) != 2){
-    Json::die([
-        'result'=>false,
-        'reason'=>'올바르지 않은 국가입니다.'
-    ]);
-}
-
 if($prevNo !== null){
     //state는 체크하지 않는걸로 하자. 파기한 것을 재 송신하는 경우도 있을 수 있음.
     $prevLetter = $db->queryFirstRow(
-        'SELECT no, state, aux FROM ng_diplomacy WHERE no = %i AND src_nation_id IN (%i, %i) AND dest_nation_id IN (%i, %i)',
+        'SELECT no, src_nation_id, dest_nation_id, state, aux FROM ng_diplomacy WHERE no = %i AND src_nation_id IN (%i, %i) AND dest_nation_id IN (%i, %i)',
         $prevNo,
         $srcNationNo, $destNationNo,
         $srcNationNo, $destNationNo
@@ -89,6 +81,24 @@ if($prevNo !== null){
         ]);
     }
 
+    //새로 나온 문서가 있는지 확인하자
+    $newerLetter = $db->queryFirstField(
+        'SELECT count(no) FROM ng_diplomacy WHERE prev_no = %i AND state != \'cancelled\'', $prevNo
+    );
+    if($newerLetter){
+        Json::die([
+            'result'=>false,
+            'reason'=>'해당 문서에 대한 새로운 문서가 이미 있습니다.'
+        ]);
+    }
+
+    if($prevLetter['src_nation_id'] != $srcNationNo){
+        $destNationNo = $prevLetter['src_nation_id'];
+    }
+    else{
+        $destNationNo = $prevLetter['dest_nation_id'];
+    }
+
     if($prevLetter['state'] == 'proposed'){
         $prevAux = Json::decode($prevLetter['aux']);
         $prevAux['reason'] = [
@@ -97,12 +107,20 @@ if($prevNo !== null){
             'reason'=>'new_letter'
         ];
         $db->update('ng_diplomacy', [
-            'state'=>'cancelled',
+            'state'=>'replaced',
             'aux'=>Json::encode($prevAux)
         ], 'no=%i', $prevNo);
     }
 }
 
+$nations = $db->query('SELECT nation, name, color FROM nation WHERE nation IN (%i, %i)', $srcNationNo, $destNationNo);
+if(count($nations) != 2){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 국가입니다.'
+    ]);
+}
+
 if($nations[0]['nation'] == $me['nation']){
     //index 순서에 따라 또 모름.
     $srcNation = $nations[0];
@@ -113,6 +131,8 @@ else{
     $destNation = $nations[0];
 }
 
+$me['icon'] = GetImageURL($me['imgsvr'], $me['picture']);
+
 $db->insert('ng_diplomacy', [
     'src_nation_id'=>$srcNation['nation'],
     'dest_nation_id'=>$destNation['nation'],
@@ -127,7 +147,8 @@ $db->insert('ng_diplomacy', [
         'src'=>[
             'nationName'=>$srcNation['name'],
             'nationColor'=>$srcNation['color'],
-            'generalName'=>$me['name']
+            'generalName'=>$me['name'],
+            'generalIcon'=>$me['icon']
         ],
         'dest'=>[
             'nationName'=>$destNation['name'],
@@ -135,9 +156,33 @@ $db->insert('ng_diplomacy', [
         ]
     ]),
 ]);
+$newLetterNo = $db->insertId();
+
+$src = new MessageTarget($me['no'], $me['name'], $srcNation['nation'], $srcNation['name'], $srcNation['color'], $me['icon']);
+$dest = new MessageTarget(0, '', $destNation['nation'], $destNation['name'], $destNation['color']);
+
+$now = new \DateTime();
+$unlimited = new \DateTime('9999-12-31');
+
+$josaYi = JosaUtil::pick($newLetterNo, '이');
+if($prevNo){
+    $msgText = "문서 #{$prevNo}의 새로운 외교 문서 #{$newLetterNo}{$josaYi} 준비되었습니다. 외교부에서 확인해주세요.";
+}
+else{
+    $msgText = "새로운 외교 문서 #{$newLetterNo}{$josaYi} 준비되었습니다. 외교부에서 확인해주세요.";
+}
 
 
-//TODO: 외교 서신에 대한 메시지를 양국에 발송해야함
+$msg = new Message(
+    Message::MSGTYPE_DIPLOMACY,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
 
 Json::die([
     'result'=>true,

hwe/j_general_set_permission.php

@@ -0,0 +1,80 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+// $btn, $level, $genlist, $outlist
+
+//TODO: 변경이 완료되면 항상 공지되어야함
+
+$isAmbassador = Util::getReq('isAmbassador', bool);
+$genlist = Util::getReq('genlist', 'array_int');
+
+//로그인 검사
+$session = Session::requireGameLogin([])->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$me = $db->queryFirstRow('SELECT no, level, nation FROM general WHERE owner = %i', $userID);
+
+if(!$me || $me['level'] != 12){
+    Json::die([
+        'result'=>false,
+        'reason'=>'군주가 아닙니다',
+        'tmp'=>$me
+    ]);
+}
+
+$nationID = $me['nation'];
+
+if($isAmbassador){
+    $targetType = 'ambassador';
+    $targetLevel = 4;
+    if(count($genlist) > 2){
+        Json::die([
+            'result'=>false,
+            'reason'=>'외교권자는 최대 둘까지만 설정 가능합니다.'
+        ]);
+    }
+}
+else{
+    $targetType = 'auditor';
+    $targetLevel = 3;
+}
+
+$db->update('general', [
+    'permission'=>'normal'
+], 'nation = %i AND permission = %s', $nationID, $targetType);
+
+if(!$genlist){
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+$realCandidates = [];
+foreach($db->query('SELECT no, nation, level, penalty, permission FROM general WHERE nation = %i AND level != 12 AND permission = \'normal\' AND no IN %li', $nationID, $genlist) as $candidate){
+    $maxPermission = checkSecretMaxPermission($candidate);
+    if($maxPermission < $targetLevel){
+        continue;
+    }
+    $realCandidates[] = $candidate['no'];
+}
+
+if(!$realCandidates){
+    Json::die([
+        'result'=>true,
+        'reason'=>'success'
+    ]);
+}
+
+$db->update('general', [
+    'permission'=>$targetType,
+], 'no IN %li', $realCandidates);
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success'
+]);

hwe/j_msg_get_old.php

@@ -16,7 +16,7 @@ if($reqTo === null){
         'reason'=>'올바르지 않은 범위 입니다.'
     ]);
 }
-if($reqType === null || !in_array($reqType, ['private', 'public', 'national'])){
+if($reqType === null || !in_array($reqType, ['private', 'public', 'national', 'diplomacy'])){
     Json::die([
         'result'=>false,
         'reason'=>'올바르지 않은 타입입니다.'
@@ -50,20 +50,18 @@ if($delayTime){
 }
 $session->setReadOnly();
 
-list($generalID, $nationID, $generalName) = DB::db()->queryFirstList(
-    'select `no`, `nation`, `name` from `general` where owner = %i',
-    $userID
-);
+$me = DB::db()->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
 
-
-
-if($nationID === null){
+if($me === null){
     Json::die([
         'result'=>false,
         'reason'=>'장수가 사망했습니다.'
     ]);
 }
 
+[$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']];
+$permission = checkSecretPermission($me, false);
+
 $result = [
     'private'=>[],
     'public'=>[],
@@ -95,13 +93,26 @@ else if($reqType == 'public'){
         return $msg->toArray();
     }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_PUBLIC, Message::MSGTYPE_PUBLIC, $reqTo, 20));
 }
-else{
+else if($reqType == 'national'){
     $result['national'] = array_map(function(Message $msg)use (&$nextSequence){
         if($msg->id > $nextSequence){
             $nextSequence = $msg->id;
         }
         return $msg->toArray();
-    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, $reqTo, 40));
+    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, $reqTo, 20));
+}
+else{
+    $result['diplomacy'] = array_map(function(Message $msg)use (&$nextSequence, $permission){
+        if($msg->id > $nextSequence){
+            $nextSequence = $msg->id;
+        }
+        $values = $msg->toArray();
+        if($msg->dest->nationID != 0 && $permission < 3){
+            $values['text'] = '(외교 메시지입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
+            $values['option']['invalid'] = true;
+        }
+        return $values;
+    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, $reqTo, 20));
 }
 
 Json::die($result);

hwe/j_msg_get_recent.php

@@ -47,10 +47,8 @@ if($me === null){
     ]);
 }
 
-$generalID = $me['no'];
-$nationID = $me['nation'];
-$generalName = $me['name'];
-$permission = checkSecretPermission($me);
+[$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']];
+$permission = checkSecretPermission($me, false);
 
 $result = [];
 $result['result'] = true;
@@ -90,7 +88,7 @@ $result['national'] = array_map(function(Message $msg)use (&$nextSequence, &$min
         $lastType = 'national';
     }
     return $msg->toArray();
-}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, 40, $reqSequence));
+}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, 20, $reqSequence));
 
 $result['diplomacy']= array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType, $permission){
     if($msg->id > $nextSequence){
@@ -101,11 +99,12 @@ $result['diplomacy']= array_map(function(Message $msg)use (&$nextSequence, &$min
         $lastType = 'diplomacy';
     }
     $values = $msg->toArray();
-    if($permission < 3){
-        $values['text'] = '(외교 문서입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
+    if($msg->dest->nationID != 0 && $permission < 3){
+        $values['text'] = '(외교 메시지입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
+        $values['option']['invalid'] = true;
     }
     return $values;
-}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, 40, $reqSequence));
+}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, 20, $reqSequence));
 
 if($lastType !== null){
     array_pop($result[$lastType]);

hwe/j_msg_submit.php

@@ -49,7 +49,7 @@ $now = new \DateTime();
 $unlimited = new \DateTime('9999-12-31');
 
 $db = DB::db();
-$me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
+$me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission,belong FROM general WHERE `owner`=%i', $userID);
 
 if(!$me){
     $session->logoutGame();
@@ -150,8 +150,8 @@ if($mailbox > 0) {
     
     $session->lastMsg = $now->format('Y-m-d H:i:s');
 
-    $destUser = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`con`,`picture`,`imgsvr` FROM general WHERE `no`=%i',$mailbox);
-
+    $destUser = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,permission,penalty FROM general WHERE `no`=%i',$mailbox);
+    
     if(!$destUser){
         Json::die([
             'result' => false,
@@ -160,6 +160,15 @@ if($mailbox > 0) {
         ]);
     }
 
+    $destPermission = checkSecretPermission($destUser, false);
+    if($permission == 4 && $destPermission == 4 && $destUser['nation'] != $me['nation']){
+        Json::die([
+            'result' => false,
+            'reason' => '외교권자끼리는 메시지를 보낼 수 없습니다.',
+            'msgID' => null
+        ]);
+    }
+
     $destNation = getNationStaticInfo($destUser['nation']);
 
     $dest = new MessageTarget(

hwe/j_select_npc.php

@@ -77,6 +77,7 @@ $db->update('general', [
     'npc'=>1,
     'killturn'=>6,
     'mode'=>2,
+    'permission'=>'normal',
     'owner'=>$userID,
 ], 'owner <= 0 AND npc = 2 AND no = %i', $pick);
 

hwe/js/board.js

@@ -2,8 +2,8 @@
 
 function submitArticle(){
     var $article = $('#newArticle');
-    var $title = $article.find('input.titleInput');
-    var $text = $article.find('input.contentInput');
+    var $title = $article.find('.titleInput');
+    var $text = $article.find('.contentInput');
     var title = $.trim($title.val());
     var text = $.trim($text.val());
 
@@ -48,7 +48,8 @@ function submitArticle(){
 
 function submitComment(){
     var $this = $(this);
-    var $article = $this.parents('.article').eq(0);
+    
+    var $article = $this.closest('.articleObj').eq(0);
     var articleNo = $article.data('no');
     var $text = $article.find('input.commentText');
     var text = $.trim($text.val());
@@ -87,25 +88,30 @@ function submitComment(){
     return false;
 }
 
-function drawArticle(articleObj){
+function drawArticle(idx, articleObj){
     var $articleFrame = $('#articleTemplate > .articleFrame');
-    var $commentFrame = $('#commentTemplate > .comment');
+    var $commentFrame = $($('#commentTemplate').prop('content'));
 
     var $article = $articleFrame.clone();
     $article.addClass('articleObj')
         .data('no', articleObj.no)
         .data('author', articleObj.general_no);
 
-    $article.find('.author').text(articleObj.author);
-    $article.find('.title').text(articleObj.title);
+    
+    $article.find('.articleNo').text(articleObj.no);
+    $article.find('.authorName').text(articleObj.author);
+    $article.find('.articleTitle').text(articleObj.title);
     $article.find('.date').text(articleObj.date);
+    if(articleObj.author_icon){
+        $article.find('.authorIcon').attr('src', articleObj.author_icon);
+    }
     //$article.find('.text').text(articleObj.text);
     $article.find('.text').html(nl2br(escapeHtml(articleObj.text)));
     //TODO: 바꿀 것
 
-    var $articleComment = $article.find('ul.commentList');
+    var $articleComment = $article.find('.commentList');
     
-    $.each(articleObj.comment, function(commentObj){
+    $.each(articleObj.comment, function(_, commentObj){
         var $comment = $commentFrame.clone();
         $comment.find('.author').text(commentObj.author);
         //$comment.find('.text').text(commentObj.text);
@@ -114,7 +120,19 @@ function drawArticle(articleObj){
         $articleComment.append($comment);
     });
 
-    $('#board').append($article);
+    $article.find('.submitComment').click(submitComment);
+    $article.find('.commentText').on('keypress', function (e) {
+        if(e.which === 13){
+            $article.find('.submitComment').click();
+        }
+    });
+    $article.find('.inputCommentHeader').click(function(){
+        $article.find('.commentText').focus();
+    })
+
+    var $board = $('#board');
+
+    $board.prepend($article);
 }
 
 function drawArticles(articlesObj){
@@ -143,10 +161,16 @@ function loadArticles(){
     });
 }
 
+function resizeTextarea($obj){
+    $obj.height(1).height($obj.prop('scrollHeight')+12 );
+}
+
 $(function(){
+    $('textarea.autosize').on('keydown keyup', function(){
+        resizeTextarea($(this));
+    })
 
 $('#submitArticle').click(submitArticle);
-$('.submitComment').click(submitComment);
 
 loadArticles()
 .then(drawArticles, errUnknown)

hwe/js/bossInfo.js

@@ -0,0 +1,81 @@
+function changePermission(isAmbassador, rawGeneralList){
+    console.log(isAmbassador);
+    console.log(rawGeneralList);
+
+    var generalList = [];
+    $.each(rawGeneralList, function(idx, value){
+        generalList.push(parseInt(value.id));
+    })
+
+    $.post({
+        url:'j_general_set_permission.php',
+        dataType:'json',
+        data:{
+            isAmbassador:isAmbassador,
+            genlist:generalList
+        },
+    }).then(function(data){
+        if(!data){
+            alert('변경하지 못했습니다.');
+            return false;
+        }
+        if(!data.result){
+            alert('변경하지 못했습니다. : '+data.reason);
+            return false;
+        }
+        alert('변경했습니다.');
+        location.reload();
+    }, errUnknown);
+}
+
+$(function(){
+    $('#selectAmbassador').select2({
+        theme: 'bootstrap4',
+        placeholder: "",
+        allowClear: true,
+        language: "ko",
+        width:300,
+        maximumSelectionLength: 2,
+        containerCss: {
+            display: "inline-block !important;",
+            color: 'white !important'
+        },
+        data:candidateAmbassadors,
+        //containerCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+        dropdownCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+    });
+
+    $('#selectAuditor').select2({
+        theme: 'bootstrap4',
+        placeholder: "",
+        allowClear: true,
+        language: "ko",
+        width:300,
+        maximumSelectionLength: 2,
+        containerCss: {
+            display: "inline-block !important;",
+            color: 'white !important'
+        },
+        data:candidateAuditors,
+        //containerCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+        dropdownCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+    });
+
+    $('#changeAmbassador').click(function(){
+        if(!confirm('외교권자를 변경할까요?')){
+            return false;
+        }
+        
+        changePermission(true, $('#selectAmbassador').select2('data'));
+        return false;
+    });
+
+    $('#changeAuditor').click(function(){
+        if(!confirm('조언자를 변경할까요?')){
+            return false;
+        }
+
+        changePermission(false, $('#selectAuditor').select2('data'));
+        return false;
+    })
+})

hwe/js/common.js

@@ -70,6 +70,27 @@ String.prototype.format = function() {
 };
 
 
+function hexToRgb(hex) {
+    var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+    return result ? {
+        r: parseInt(result[1], 16),
+        g: parseInt(result[2], 16),
+        b: parseInt(result[3], 16)
+    } : null;
+}
+
+
+function isBrightColor(color){
+    color = hexToRgb(color);
+    if ((color.r*0.299 + color.g*0.587 + color.b*0.114) > 140){
+        return true;
+    }
+    else{
+        return false;
+    }
+}
+
+
 /**
  * 게임내에서 지원하는 color type만 선택할 수 있도록 해주는 함수
  * @param {string} color #AAAAAA 또는 AAAAAA 형태로 작성된 RGB hex color string
@@ -102,6 +123,10 @@ function numberWithCommas(x) {
     return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 }
 
+function linkifyStrWithOpt(text){
+    return linkifyStr(text, {});
+}
+
 /**
  * 단순한 Template 함수.  <%변수명%>으로 template 가능
  * @see  https://github.com/krasimir/absurd/blob/master/lib/processors/html/helpers/TemplateEngine.js
@@ -122,6 +147,7 @@ var TemplateEngine = function (html, options) {
         return add;
     }
     options.e = escapeHtml;
+    options.linkifyStr = linkifyStrWithOpt;
     while (match = re.exec(html)) {
         add(html.slice(cursor, match.index))(match[1], true);
         cursor = match.index + match[0].length;

hwe/js/diplomacy.js

@@ -1,11 +1,10 @@
 
 
 function submitLetter(){
-    var $letter = $('#newLetter');
-    var $brief = $letter.find('input.briefInput');
-    var $detail = $letter.find('input.detailInput');
-    var $prevNo = $letter.find('input.prevNo');
-    var $destNation = $letter.find('input.destNation');
+    var $brief = $('#inputBrief');
+    var $detail = $('#inputDetail');
+    var $prevNo = $('#inputPrevNo');
+    var $destNation = $('#inputDestNation');
     var brief = $.trim($brief.val());
     var detail = $.trim($detail.val());
     var prevNo = parseInt($prevNo.val());
@@ -15,7 +14,7 @@ function submitLetter(){
         prevNo = null;
     }
 
-
+    console.log(brief);
     if(!brief){
         return false;
     }
@@ -34,18 +33,18 @@ function submitLetter(){
         }
     }).then(function(data){
         if(!data){
-            $title.val(title);
-            $text.val(text);
-            alert()
+            $brief.val(brief);
+            $detail.val(detail);
             return quickReject('외교 서신을 보내는데 실패했습니다.');
         }
         if(!data.result){
-            $title.val(title);
-            $text.val(text);
+            $brief.val(brief);
+            $detail.val(detail);
             return quickReject('외교 서신을 보내는데 실패했습니다. : '+data.reason);
         }
 
-        return loadLetters().done(drawLetters);
+        alert('전송했습니다.');
+        location.reload();
 
     }, errUnknown)
     .fail(function(reason){
@@ -55,31 +54,33 @@ function submitLetter(){
     return false;
 }
 
-function repondLetter(isAgree){
-    var $this = $(this);
-    var $letter = $this.parents('.letter').eq(0);
-    var letterNo = $letter.data('no');
-    
+function repondLetter(letterNo, isAgree, reason){
     $.post({
         url:'j_diplomacy_respond_letter.php',
         dataType:'json',
         data:{
             letterNo:letterNo,
             isAgree:isAgree,
-            reason:'', //TODO: reason 받기
+            reason:reason,
         }
     }).then(function(data){
         if(!data){
-            $text.val(text);
             alert()
             return quickReject('응답을 실패했습니다.');
         }
         if(!data.result){
-            $text.val(text);
             return quickReject('응답을 실패했습니다. : '+data.reason);
         }
 
-        return loadArticles().done(drawLetters);
+        if(isAgree){
+            alert('승인했습니다.');
+        }
+        else{
+            alert('거부했습니다.');
+        }
+
+        location.reload();
+        return false;
 
     }, errUnknown)
     .fail(function(reason){
@@ -89,22 +90,276 @@ function repondLetter(isAgree){
     return false;
 }
 
-function drawLetter(letterObj){
+function rollbackLetter(letterNo){
+    $.post({
+        url:'j_diplomacy_rollback_letter.php',
+        dataType:'json',
+        data:{
+            letterNo:letterNo,
+        }
+    }).then(function(data){
+        if(!data){
+            alert()
+            return quickReject('회수를 실패했습니다.');
+        }
+        if(!data.result){
+            return quickReject('회수를 실패했습니다. : '+data.reason);
+        }
+
+        alert('회수 했습니다.');
+
+        location.reload();
+        return false;
+
+    }, errUnknown)
+    .fail(function(reason){
+        alert(reason);
+    });
+
+    return false;
+}
+
+function destroyLetter(letterNo){
+    $.post({
+        url:'j_diplomacy_destroy_letter.php',
+        dataType:'json',
+        data:{
+            letterNo:letterNo,
+        }
+    }).then(function(data){
+        if(!data){
+            alert()
+            return quickReject('파기를 실패했습니다.');
+        }
+        if(!data.result){
+            return quickReject('파기를 실패했습니다. : '+data.reason);
+        }
+
+        if(data.state == 'activated'){
+            alert('파기를 요청 했습니다.');
+        }
+        else{
+            alert('파기 되었습니다.');
+        }
+
+        location.reload();
+        return false;
+
+    }, errUnknown)
+    .fail(function(reason){
+        alert(reason);
+    });
+
+    return false;
+}
+
+function drawLetter(idx, letterObj){
+    
+    if(letterObj.state == 'cancelled'){
+        //TODO: 취소되거나, 대체된 문서도 보여줄 방법을 찾아볼 것
+        return;
+    }
+
+    console.log(letterObj);
+
     var $letterFrame = $('#letterTemplate > .letterFrame');
 
+    var srcColorFormat = {
+        'background-color':letterObj.src.nationColor,
+        'color':isBrightColor(letterObj.src.nationColor)?'#000000':'#ffffff'
+    };
+
+    var destColorFormat = {
+        'background-color':letterObj.dest.nationColor,
+        'color':isBrightColor(letterObj.dest.nationColor)?'#000000':'#ffffff'
+    };
+
+    var targetNation = letterObj.src.nationID==myNationID?letterObj.dest:letterObj.src;
+    var targetColor = letterObj.src.nationID==myNationID?destColorFormat:srcColorFormat;
+
     var $letter = $letterFrame.clone();
+
+    if(letterObj.state == 'replaced'){
+        $letter.hide();
+    }
+
     $letter.addClass('letterObj')
         .data('no', letterObj.no)
+        .data('brief', letterObj.brief)
+        .data('detail', letterObj.detail)
+        .attr('id', 'letter_'+letterObj.no);
 
-    //TODO: 국가명, 수뇌명 입력
-    $letter.find('.date').text(letterObj.date);
+    $letter.find('.letterHeader').css(targetColor);
+    $letter.find('.letterNationName').text(targetNation.nationName);
+    $letter.find('.letterDate').text(letterObj.date);
     $letter.find('.letterNo').text('#'+letterObj.no);
-    $letter.find('.srcNation').text(letterObj.aux[''])
-    $letter.find('.brief').html(nl2br(escapeHtml(letterObj.brief)));
-    $letter.find('.detail').html(nl2br(escapeHtml(letterObj.detail)));
-    //TODO: 바꿀 것
 
-    $('#board').append($letter);
+    var stateText = {
+        'proposed':'제안됨',
+        'activated':'승인됨',
+        'cancelled':'거부됨',
+        'replaced':'대체됨',
+    };
+
+    var stateOptionText = {
+        'try_destroy_src':'송신측의 파기 요청',
+        'try_destroy_dest':'수신측의 파기 요청',
+    }
+    $letter.find('.letterStatus').text(stateText[letterObj.state]);
+
+    if(letterObj.state_opt !== null){
+        $letter.find('.letterStatusOpt').text('('+stateOptionText[letterObj.state_opt]+')');
+    }
+    if(letterObj.prev_no !== null){
+        var $showPrev = $('<a href="#">#{0}</a>'.format(letterObj.prev_no));
+        $showPrev.click(function(){
+            $('#letter_'+letterObj.prev_no).toggle();
+        })
+        $letter.find('.letterPrevNo').html($showPrev);
+    }
+    else{
+        $letter.find('.letterPrevNo').text('신규');
+    }
+    $letter.find('.letterBrief').html(nl2br(escapeHtml(letterObj.brief)));
+    $letter.find('.letterDetail').html(nl2br(escapeHtml(letterObj.detail)));
+
+    $letter.find('.letterSrc .signerImg img.generalIcon').attr('src', letterObj.src.generalIcon);
+    $letter.find('.letterSrc .signerNation').text(letterObj.src.nationName).css(srcColorFormat);
+    $letter.find('.letterSrc .signerName').text(letterObj.src.generalName).css(srcColorFormat);
+
+    if(letterObj.dest.generalName){
+        $letter.find('.letterDest .signerImg img.generalIcon').attr('src', letterObj.dest.generalIcon);
+        $letter.find('.letterDest .signerNation').text(letterObj.dest.nationName).css(destColorFormat);
+        $letter.find('.letterDest .signerName').text(letterObj.dest.generalName).css(destColorFormat);
+    }
+
+    if(letterObj.state == 'proposed' && letterObj.src.nationID != myNationID){
+        $letter.find('.btnAgree').show().click(function(){
+            if(!confirm('승인하시겠습니까?')){
+                return false;
+            }
+            return repondLetter(letterObj.no, true, null);
+        });
+        $letter.find('.btnDisagree').show().click(function(){
+            var reason = prompt('거부하시겠습니까? (이유 [최대 50자])');
+            if(reason === null){
+                return false;
+            }
+            reason = substr.substr(0, 50);
+            return repondLetter(letterObj.no, false, reason);
+        });
+    }
+
+    if(letterObj.state == 'proposed' && letterObj.src.nationID == myNationID){
+        $letter.find('.btnRollback').show().click(function(){
+            if(!confirm('회수하시겠습니까?')){
+                return false;
+            }
+            return rollbackLetter(letterObj.no);
+        });
+    }
+
+    if(letterObj.state == 'activated'){
+        var $btnDestroy = $letter.find('.btnDestroy');
+        if((letterObj.src.nationID==myNationID && letterObj.state_opt == 'try_destroy_src') || 
+            (letterObj.dest.nationID==myNationID && letterObj.state_opt == 'try_destroy_dest')){
+            $btnDestroy.show().prop('disabled', true);
+        }
+        else{
+            $btnDestroy.show().click(function(){
+                if(!confirm('본 문서를 파기하겠습니까? (상호 동의 필요)')){
+                    return false;
+                }
+                return destroyLetter(letterObj.no);
+            })
+            
+        }
+    }
+    
+
+    $letter.find('.btnRenew').click(function(){
+        var $inputPrevNo = $('#inputPrevNo');
+        $inputPrevNo.val(letterObj.no);
+        $inputPrevNo.trigger('change');
+    })
+
+
+    $('#letters').prepend($letter);
+}
+
+function initNewLetterForm(lettersObj){
+    console.log(lettersObj);
+    var nationList = [];
+    $.each(lettersObj.nations, function(idx, nation){
+        nation.id = nation.nation;
+        nation.text = nation.name;
+        nationList.push(nation);
+    })
+
+    var $destNation = $('#inputDestNation').select2({
+        theme: 'bootstrap4',
+        placeholder: "",
+        language: "ko",
+        width:300,
+        containerCss: {
+            display: "inline-block !important;",
+            color: 'white !important'
+        },
+        data:nationList,
+        templateResult: colorNation,
+        containerCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+        dropdownCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+    });
+
+    
+    var prevNoList = [{
+        id:0,
+        text:'-새 문서-',
+        nation:null,
+    }];
+
+    $.each(lettersObj.letters, function(idx, letterObj){
+        if(letterObj.state == 'replaced' || letterObj.state == 'cancelled'){
+            return true;
+        }
+        var targetNation = letterObj.src.nationID==myNationID?letterObj.dest:letterObj.src;
+        prevNoList.push({
+            id:letterObj.no,
+            text:'#{0} <{1}>'.format(letterObj.no, targetNation.nationName),
+            nation:targetNation.nationID
+        });
+    });
+
+    var $inputPrevNo = $('#inputPrevNo').select2({
+        theme: 'bootstrap4',
+        placeholder: "",
+        language: "ko",
+        width:300,
+        containerCss: {
+            display: "inline-block !important;",
+            color: 'white !important'
+        },
+        data:prevNoList,
+        containerCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+        dropdownCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+    });
+    $inputPrevNo.on('change', function(e){
+        var data = $inputPrevNo.select2('data')[0];
+        console.log(data);
+        if(data.nation == null){
+            $destNation.prop("disabled", false);
+        }
+        else{
+            $destNation.val(data.nation).prop("disabled", true);
+            var $targetLetter = $('#letter_'+data.id);
+            resizeTextarea($('#inputBrief').val($targetLetter.data('brief')));
+            resizeTextarea($('#inputDetail').val($targetLetter.data('detail')));
+        }
+    });
+
+    $('#btnSend').click(submitLetter);
+
+    $('#newLetter').show();
 }
 
 function drawLetters(lettersObj){
@@ -113,12 +368,17 @@ function drawLetters(lettersObj){
         return quickReject('받아오는데 실패했습니다.');
     }
 
-    //TODO: 국가 리스트 출력
-
     if(!lettersObj.result){
         return quickReject('에러가 발생했습니다. : '+lettersObj.reason);
     }
 
+    window.myNationID = lettersObj.myNationID;
+
+    if(permissionLevel == 4){
+        initNewLetterForm(lettersObj);
+        $('.letterActionPlate').show();
+    }
+
     $('.letterObj').detach();//첫 버전이니까 일괄 삭제 일괄 로드
     $.each(lettersObj.letters,  drawLetter);
     return true;
@@ -126,22 +386,35 @@ function drawLetters(lettersObj){
 
 function loadLetters(){
     return $.post({
-        url:'j_diplomacy_get_letters.php',
+        url:'j_diplomacy_get_letter.php',
         dataType:'json', //첫 버전이니까 전체 다 불러오자
         data:{
         }
     });
 }
 
+function colorNation(nationInfo){
+    if(!nationInfo.color){
+        return nationInfo.text;
+    }
+
+    var fgColor = isBrightColor(nationInfo.color)?'#000000':'#ffffff';
+    var $nationForm = $('<div>'+nationInfo.text+'</div>').css({
+        'color':fgColor,
+        'background-color':nationInfo.color
+    });
+    return $nationForm;
+}
+
+function resizeTextarea($obj){
+    $obj.height(1).height($obj.prop('scrollHeight')+12 );
+}
+
 $(function(){
 
-$('#submitLetter').click(submitLetter);
-$('.respondAgree').click(function(){
-    return repondLetter(true);
-});
-$('.respondDisagree').click(function(){
-    return repondLetter(false);
-});
+$('textarea.autosize').on('keydown keyup', function(){
+    resizeTextarea($(this));
+})
 
 loadLetters()
 .then(drawLetters, errUnknown)

hwe/js/ext.expand_city.js

@@ -330,16 +330,7 @@ $(function() {
                 //window.$html = $html;
                 
                 var cnt =0;
-                var $tmpTable = null;
-                $html.each(function(idx){
-                    if(this.tagName == "TABLE"){
-                        cnt+=1;
-                        if(cnt==5){
-                            $tmpTable = $(this);
-                            return false;
-                        }
-                    }
-                });
+                var $tmpTable = $html.filter('#officer_list').eq(0);
                 
                 $selects = $tmpTable.find("select");
                 if($selects.length == 0){

hwe/js/main.js

@@ -36,6 +36,7 @@ function refreshing(obj, arg1, arg2) {
             message.msg.focus();
             break;
     }
+    return false;
 }
 
 function moveProcessing(commandtype, turn){

hwe/js/msg.js

@@ -1,24 +1,5 @@
 
 
-function hexToRgb(hex) {
-    var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-    return result ? {
-        r: parseInt(result[1], 16),
-        g: parseInt(result[2], 16),
-        b: parseInt(result[3], 16)
-    } : null;
-}
-
-
-function isBrightColor(color){
-    color = hexToRgb(color);
-    if ((color.r*0.299 + color.g*0.587 + color.b*0.114) > 140){
-        return true;
-    }
-    else{
-        return false;
-    }
-}
 
 var messageTemplate = '';
 var myGeneralID=null;
@@ -29,6 +10,7 @@ var minMsgSeq = {
     'private':0x7fffffff,
     'public':0x7fffffff,
     'national':0x7fffffff,
+    'diplomacy':0x7fffffff,
 }
 
 var generalList = {};
@@ -376,6 +358,7 @@ function refreshMailboxList(obj){
             var generalName = this[1];
             var isNPC = !!(this[2] & 0x2);
             var isRuler = !!(this[2] & 0x1);
+            var isAmbassador = !!(this[2] & 0x4);
 
             
 
@@ -387,6 +370,9 @@ function refreshMailboxList(obj){
             if(isRuler){
                 textName = '*{0}*'.format(textName);
             }
+            else if(isAmbassador){
+                textName = '#{0}#'.format(textName);
+            }
 
             generalList[generalID] = {
                 id:generalID,
@@ -398,6 +384,10 @@ function refreshMailboxList(obj){
             };
 
             var $item = $('<option value="{0}">{1}</option>'.format(generalID, textName));
+
+            if(permissionLevel == 4 && isAmbassador && myNation.mailbox != nation.mailbox){
+                $item.prop('disabled', true);
+            }
             $optgroup.append($item);
         });
 
@@ -460,7 +450,7 @@ function registerGlobal(basicInfo){
     window.myGeneralID = basicInfo.generalID;
     window.isChief = basicInfo.isChief;
     window.myGeneralLevel = basicInfo.generalLevel;
-    window.permissionLevel = basicInfo.permissionLevel;
+    window.permissionLevel = basicInfo.permission;
 }
 
 function activateMessageForm(){
@@ -514,7 +504,7 @@ function activateMessageForm(){
 jQuery(function($){
 
     //tmp_template.html은 추후 msg.js에 통합될 수 있음
-    var getTemplate = $.get('js/templates/message.html?9',function(obj){
+    var getTemplate = $.get('js/templates/message.html?11',function(obj){
         messageTemplate = obj;
     });
 

hwe/js/templates/message.html

@@ -12,7 +12,7 @@
     </div>
     <div class="msg_body">
         <div class="msg_header">
-            <%if(!this.option && !this.option.action && src.id == myGeneralID && now <= last5min && invalidType == 'msg_valid'){%>
+            <%if(!this.option.action && src.id == myGeneralID && now <= last5min && invalidType == 'msg_valid'){%>
                 <button type="button" data-erase_until="<%last5min%>" class="btn btn btn-outline-warning btn-sm btn-delete-msg" style='float:right'>❌</button>
             <%}%>
             <%if(msgType == 'private') {%>
@@ -41,7 +41,7 @@
             <%} %>
             <span class="msg_time">&lt;<%e(time)%>&gt;</span>
         </div>        
-        <div class="msg_content <%invalidType%>"><%e(text)%></div>
+        <div class="msg_content <%invalidType%>"><%linkifyStr(text)%></div>
         <%if(this.option && this.option.action) {%>
         <div class="msg_prompt">
             <button class="prompt_yes btn_prompt" <%allowButton?'':'disabled="disabled"'%>>>수락</button> <button class="prompt_no btn_prompt" <%allowButton?'':'disabled="disabled"'%>>거절</button>

hwe/sammo/DiplomaticMessage.php

@@ -64,7 +64,7 @@ class DiplomaticMessage extends Message{
             return [self::INVALID, '송신자가 외교서신을 처리할 수 없습니다.'];
         }
 
-        $permission = checkSecretPermission($general);
+        $permission = checkSecretPermission($general, false);
 
         if(!$general || $permission < 4){
             return [self::INVALID, '해당 국가의 외교권자 아닙니다.'];
@@ -273,7 +273,7 @@ class DiplomaticMessage extends Message{
         $gameStor = KVStorage::getStorage($db, 'game_env');
 
         $general = $db->queryFirstRow(
-            'SELECT `name`, `level`, `permission`, `penalty` FROM general WHERE `no`=%i AND nation=%i', 
+            'SELECT `name`, nation, `level`, `permission`, `penalty` FROM general WHERE `no`=%i AND nation=%i', 
             $receiverID, 
             $this->dest->nationID
         );
@@ -345,6 +345,20 @@ class DiplomaticMessage extends Message{
         $this->invalidate();
         $newMsg->send();
 
+        $newMsg = new Message(
+            self::MSGTYPE_DIPLOMACY, 
+            $this->dest, 
+            $this->src, 
+            "【외교】{$year}년 {$month}월: {$this->src->nationName}{$josaYi} {$this->dest->nationName}에게 제안한 {$this->diplomacyDetail}{$this->diplomacyName} 동의.",
+            new \DateTime(),
+            new \DateTime('9999-12-31'),
+            [
+                'delete'=>$this->id,
+                'silence'=>true,
+            ]
+        );
+        $newMsg->send();
+
         return self::ACCEPTED;
 
     }

hwe/sammo/Engine/Personnel.php

@@ -177,9 +177,9 @@ class Personnel{
                 $setOriginalCityValues['gen3'] = 0;
             }
 
-            $setValues['betray'] = $db->sqleval('betray + 1');
             $setValues['experience'] = $db->sqleval('experience * (1 - 0.1 * betray)');//XXX: 상수
             $setValues['dedication'] = $db->sqleval('dedication * (1 - 0.1 * betray)');//XXX: 상수
+            $setValues['betray'] = $db->sqleval('betray + 1');
         }
         else{
             //재야이면 100 100 증가

hwe/sammo/Message.php

@@ -275,8 +275,8 @@ class Message
             return '본인의 메시지만 삭제할 수 있습니다.';
         }
 
-        if($msgObj->msgType == Message::MSGTYPE_DIPLOMACY){
-            return '외교 메시지는 삭제할 수 없습니다.';
+        if($msgObj instanceof DiplomaticMessage){
+            return '시스템 외교 메시지는 삭제할 수 없습니다.';
         }
 
         $prev5min = new \DateTime();
@@ -366,6 +366,9 @@ class Message
         if($this->msgType === self::MSGTYPE_NATIONAL && $this->src->nationID !== $this->dest->nationID){
             return $this->sendRaw($this->src->nationID + self::MAILBOX_NATIONAL);
         }
+        if($this->msgType === self::MSGTYPE_DIPLOMACY && !key_exists('action', $this->msgOption)){
+            return $this->sendRaw($this->src->nationID + self::MAILBOX_NATIONAL);
+        }
         return [0, 0];
     }
 
@@ -384,7 +387,17 @@ class Message
             return $this->sendRaw($this->dest->generalID);
         }
 
-        if($this->msgType === self::MSGTYPE_NATIONAL || $this->msgType === self::MSGTYPE_DIPLOMACY){
+        if($this->msgType === self::MSGTYPE_NATIONAL){
+            return $this->sendRaw($this->dest->nationID + self::MAILBOX_NATIONAL);
+        }
+
+        if($this->msgType === self::MSGTYPE_DIPLOMACY){
+            if(!($this->msgOption['silence']??false)){
+                //XXX: 알림을 이런식으로 보내는게 맞는가에 대한 의문 있음
+                DB::db()->update('general', [
+                    'newmsg'=>1
+                ], 'nation = %i AND (level = 12 OR permission IN (\'ambassador\', \'auditor\')) ',$this->dest->nationID);
+            }
             return $this->sendRaw($this->dest->nationID + self::MAILBOX_NATIONAL);
         }
 

hwe/scenario/scenario_2160.json

@@ -3,59 +3,55 @@
     "startYear": 180,
     "history": [
         "<C>●</>180년 1월:<L><b>【이벤트】</b></>제작자: 강서유서.",
-        "<C>●</>180년 1월:<L><b>【가상모드15】</b>애니집결!</>",
-        "<C>●</>180년 1월:<L><b>【이벤트】</b></>애니의 등장인물들이 한곳에서 자웅을 겨룬다!"
+        "<C>●</>180년 1월:<L><b>【가상모드16】</b>애니집결</>",
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>더더욱 많아진 애니 캐릭터들이 삼국지에서 자웅을 겨룬다"
     ],
     "stat": {
         "total": 220,
         "min": 40,
-        "max": 95,
-        "npcMax": 95
-    },
-    "iconPath": "애니집결",
-    "map": {
-        "mapName": "miniche"
+        "max": 90
     },
+    "iconPath": ".",
     "fiction": 1,
     "nation":[
         
     ],
     "diplomacy":[],
     "general":[
-        [0, "기타노시오리", null, 0, null, 96, 92, 93, 0, 160, 333, "왕좌", null],
+        [0, "기타노시오리", null, 0, null, 96, 92, 93, 0, 160, 333, null, "위압", "언니는 내가 지켜….!"],
         [0, "카나메 마도카", null, 0, null, 86, 50, 77, 0, 160, 300, null, "집중", "친구들에겐 비밀이야★"],
-        [0, "토모에 마미", null, 0, null, 70, 74, 60, 0, 165, 240, null, null, "이젠 아무것도 두렵지 않아"],
-        [0, "아케미 호무라", null, 0, null, 76, 64, 80, 0, 160, 333, null, "집중", "이게바로…사랑이야..♥"],
-        [0, "사쿠라 쿄코", null, 0, null, 68, 77, 54, 0, 160, 240, null, null],
-        [0, "미키 사야카", null, 0, null, 80, 77, 62, 0, 160, 240, null, null, "나는 정말…바보"],
+        [0, "토모에 마미", null, 0, null, 70, 74, 60, 0, 165, 240, null, null, "마법소녀가 마녀가 된다면 죽을수밖에 없잖아..!! 너도! 나도!"],
+        [0, "아케미 호무라", null, 0, null, 76, 64, 80, 0, 160, 333, null, "집중", "원래 기적이라는건 인간의 생명으로도 사고팔수 있는게 아니야"],
+        [0, "사쿠라 쿄코", null, 0, null, 68, 77, 54, 0, 160, 240, null, null, "이제 겨우…친구가 되었는데…."],
+        [0, "미키 사야카", null, 0, null, 80, 77, 62, 0, 160, 240, null, null, "이거 실례네~? 나는 네가 알고 있는 그대로의 나야 전.학.,생~?"],
         [0, "모모에 나기사", null, 0, null, 72, 80, 70, 0, 160, 240, null, null, "나기사는 단지 치즈가 먹고싶엇던것 뿐이에요!"],
-        [0, "미쿠니 오리코", null, 0, null, 65, 33, 94, 0, 160, 240, null, null, "이세계에 최악의 절망을."],
+        [0, "미쿠니 오리코", null, 0, null, 65, 33, 94, 0, 160, 240, null, null, "당신에게 제대로 말하고 싶었어 미안해. 그리고 고마워."],
         [0, "쿠레 키리카", null, 0, null, 50, 80, 50, 0, 160, 240, null, null],
-        [0, "치토세 유마", null, 0, null, 69, 74, 70, 0, 160, 333, null, null],
+        [0, "치토세 유마", null, 0, null, 69, 74, 70, 0, 160, 333, null, null, "언젠가 모두 마녀가 되지만. 그건 지금이 아니야."],
         [0, "큐베", null, 0, null, 22, 14, 64, 0, 160, 333, null, null, "나랑 계약해서 마녀가 되어줘!"],
-        [0, "사사", null, 0, null, 64, 78, 72, 0, 160, 333, null, null],
-        [0, "코이토", null, 0, null, 65, 70, 74, 0, 160, 333, null, null],
-        [0, "코마키", null, 0, null, 80, 75, 49, 0, 160, 333, null, null],
+        [0, "유키 사사", null, 0, null, 64, 78, 72, 0, 160, 333, null, null],
+        [0, "코이토", null, 0, null, 65, 70, 74, 0, 160, 333, null, null, "미쿠니 선배가 증오해야할 적인가 구세주인가 그답이 나오질 않아."],
+        [0, "코마키", null, 0, null, 80, 75, 49, 0, 160, 333, null, null, "너 말이야 냉담한 주제에 이상한 곳에서 사려 깊구나"],
         [0, "파브", null, 0, null, 40, 3, 32, 0, 160, 300, null, null, "지금부터 마을의 마법소녀를 반으로 줄여야 한다퐁!"],
         [0, "스노우화이트", null, 0, null, 86, 84, 79, 0, 160, 333, null, "돌격", "사람들을 도울수 있는게 기뻐서!"],
         [0, "프흐레", null, 0, null, 84, 25, 100, 0, 160, 333, null, "집중", "괜찮아...... 그리고 데류지 에게 전달해 줘...... 원하는 나의 요구"],
         [0, "섀도게일", null, 0, null, 52, 75, 74, 0, 160, 333, null, null],
-        [0, "7753.0", null, 0, null, 64, 19, 84, 0, 160, 333, null, null, "전 인사부문소속의 7753이라고 합니다"],
+        [0, "나나코상", null, 0, null, 64, 19, 84, 0, 160, 333, null, null, "전 인사부문소속의 7753이라고 합니다"],
         [0, "인페르노", null, 0, null, 82, 85, 60, 0, 160, 399, null, null, "저녀석..해버려줘,,,,마법소녀…사냥….그럼….가.."],
         [0, "룰러", null, 0, null, 70, 30, 80, 0, 160, 333, null, null, "룰러의 이름으로 명한다"],
         [0, "네무링", null, 0, null, 71, 63, 58, 0, 160, 333, null, null, "공주님이 되어버리면 되는거야."],
         [0, "크랑테일", null, 0, null, 75, 86, 72, 0, 160, 333, null, null, "라즐리느와 페치카가 살려준 난...... 못 죽어"],
-        [0, "리플", null, 0, null, 59, 81, 70, 0, 160, 299, null, null],
+        [0, "리플", null, 0, null, 59, 81, 70, 0, 160, 299, null, null, "톱스피드를 그런식으로 말하지마…!!!"],
         [0, "글라시아네", null, 0, null, 42, 20, 85, 0, 160, 333, null, null, "죽이지마! 죽고싶지 않아!!"],
         [0, "페치카", null, 0, null, 71, 33, 75, 0, 160, 333, null, null, "그래도…이번엔 누군가를 구할수있어서..행복해요…"],
         [0, "하무엘", null, 0, null, 73, 23, 65, 0, 160, 333, null, null, "푸크푹이 유적안으로..윽…들어가고…있습니다…"],
-        [0, "타마", null, 0, null, 76, 88, 27, 0, 160, 300, null, null],
+        [0, "이누보자키 타마", null, 0, null, 76, 88, 27, 0, 160, 300, null, null, "어디서 부터 잘못된걸까…."],
         [0, "파르", null, 0, null, 30, 10, 82, 0, 160, 300, null, null, "여기서 벌어진 일들을 모두 마법나라에 고발했퐁!"],
         [0, "타카마치 나노하", null, 0, null, 85, 105, 85, 0, 160, 300, "패권", "위압", "잠깐 머리좀 식힐까?"],
-        [0, "페이트", null, 0, null, 75, 89, 73, 0, 160, 300, null, null],
+        [0, "페이트t,h,t", null, 0, null, 75, 89, 73, 0, 160, 300, null, null],
         [0, "타카마치 비비오", null, 0, null, 75, 70, 70, 0, 160, 300, null, null, "엄마를 돌려줘!!"],
-        [0, "린디", null, 0, null, 78, 50, 50, 0, 160, 300, null, null],
-        [0, "크로노", null, 0, null, 73, 27, 58, 0, 160, 300, null, null],
+        [0, "린디 하라오운", null, 0, null, 78, 50, 50, 0, 160, 300, null, null],
+        [0, "크로노 하라오운", null, 0, null, 73, 27, 58, 0, 160, 300, null, null, "시공관리국 소속의 집무관 크로노 하라오운이다!!"],
         [0, "스바루 나카지마", null, 0, null, 53, 50, 64, 0, 160, 300, null, null],
         [0, "긴카 나카지마", null, 0, null, 73, 80, 52, 0, 160, 300, null, null],
         [0, "캐로", null, 0, null, 71, 63, 74, 0, 160, 300, null, null],
@@ -79,7 +75,7 @@
         [0, "루비아", null, 0, null, 56, 40, 50, 0, 160, 300, null, "상재"],
         [0, "에미야 시로", null, 0, null, 78, 40, 70, 0, 160, 300, null, null],
         [0, "타이가", null, 0, null, 55, 50, 40, 0, 160, 300, null, null],
-        [0, "루비", null, 0, null, 49, 20, 70, 0, 160, 300, null, "척사"],
+        [0, "루비", null, 0, null, 49, 20, 70, 0, 160, 300, null, null],
         [0, "사파이어", null, 0, null, 49, 55, 86, 0, 160, 300, null, null],
         [0, "세라", null, 0, null, 50, 77, 30, 0, 160, 300, null, null],
         [0, "리즈", null, 0, null, 50, 80, 30, 0, 160, 300, null, null],
@@ -89,28 +85,28 @@
         [0, "로드 엘멜로이", null, 0, null, 75, 43, 90, 0, 160, 300, null, null, "아니,나는 그의 신하다"],
         [0, "후루카와 나기사", null, 0, null, 85, 30, 85, 0, 160, 300, null, null, "경단~ 경단~ 경단 경단 경단 경단 대가족~"],
         [0, "오카자키 토모야", null, 0, null, 85, 84, 75, 0, 160, 300, null, null],
-        [0, "후지바야시쿄", null, 0, null, 80, 85, 82, 0, 160, 300, null, "무쌍", "요헤이! 또 그러는 거야??"],
+        [0, "후지바야시쿄", null, 0, null, 80, 85, 82, 0, 160, 300, null, "무쌍"],
         [0, "후지바야시료", null, 0, null, 74, 30, 77, 0, 160, 300, null, null],
         [0, "사카가미 토모요", null, 0, null, 80, 92, 87, 0, 160, 300, null, "무쌍"],
         [0, "히이라기 캇페이", null, 0, null, 75, 55, 18, 0, 160, 300, null, null],
         [0, "스노하라 요헤이", null, 0, null, 69, 60, 30, 0, 160, 300, null, "견고", "그리고 변기커버!"],
         [0, "스노하라 메이", null, 0, null, 70, 70, 70, 0, 160, 300, null, null, "저희 못난 오빠떔에 고생이 많으십니다"],
-        [0, "후루카와 사나에", null, 0, null, 80, 40, 75, 0, 160, 300, null, null],
-        [0, "후루카와 아키오", null, 0, null, 76, 86, 70, 0, 160, 300, null, "무쌍"],
-        [0, "오카자키 나오유키", null, 0, null, 70, 20, 55, 0, 160, 300, null, null, "토모야.. 고맙다."],
+        [0, "후루카와 사나에", null, 0, null, 80, 40, 75, 0, 160, 300, null, null, "제빵은…제빵은…xx하는데나 써야되는군요…!"],
+        [0, "후루카와 아키오", null, 0, null, 76, 86, 70, 0, 160, 300, null, "무쌍", "꿈을 이뤄라!! 나기사!!!!!!!!!!!"],
+        [0, "오카자키나오유키", null, 0, null, 70, 20, 55, 0, 160, 300, null, null, "토모야.. 고맙다."],
         [0, "이치노세 코토미", null, 0, null, 74, 52, 78, 0, 160, 300, null, null],
         [0, "오카자키 우시오", null, 0, null, 82, 55, 83, 0, 160, 300, null, null, "안녕.. 아빠…"],
         [0, "니시나 리에", null, 0, null, 77, 37, 82, 0, 160, 300, null, null],
         [0, "미야자와 유키네", null, 0, null, 78, 30, 85, 0, 160, 300, null, null],
-        [0, "시마 카츠키", null, 0, null, 72, 49, 63, 0, 160, 300, null, null],
-        [0, "사가라 미사에", null, 0, null, 85, 87, 85, 0, 160, 300, null, "위압"],
-        [0, "코즈키 미유", null, 0, null, 77, 73, 64, 0, 160, 300, null, null, "혹시 루에게 고백이라도 한거니?"],
-        [0, "사이온지 카나타", null, 0, null, 75, 70, 69, 0, 160, 300, null, null],
-        [0, "사이온지 미우", null, 0, null, 75, 49, 76, 0, 160, 300, null, null, "엄마! 쉿! 쉬잇!!"],
-        [0, "하나코마치 크리스", null, 0, null, 67, 80, 60, 0, 160, 300, null, "무쌍", "미유랑 카나타가 붙어있어…."],
-        [0, "하나코마치 모모카", null, 0, null, 80, 60, 55, 0, 160, 300, null, null, "마이 달링! 루!"],
+        [0, "시마 카츠키", null, 0, null, 72, 49, 63, 0, 160, 300, null, null, "주인님 주인님 지금의 주인님은 그날의 주인님과는 다른 사람이지만 너무나 상냥한 사람이에요"],
+        [0, "사가라 미사에", null, 0, null, 85, 87, 85, 0, 160, 300, null, "위압", "언제까지나 나를 사랑해줘. 시마 카츠키."],
+        [0, "코즈키 미유", null, 0, null, 77, 73, 64, 0, 160, 300, null, null, "이제는 알거같아… 자식을 싫어하는 부모는 없다는걸,"],
+        [0, "사이온지 카나타", null, 0, null, 75, 70, 69, 0, 160, 300, null, null, "내가 먼저 말할께 좋아해 미유."],
+        [0, "사이온지 미우", null, 0, null, 41, 11, 19, 0, 160, 300, null, null, "엄마도 아빠도 우리들도 모두, 모든것은… 이곳에서 시작됫어."],
+        [0, "하나코마치크리스", null, 0, null, 67, 90, 60, 0, 160, 300, null, "무쌍", "미유랑 카나타가 붙어있어…."],
+        [0, "하나코마치모모카", null, 0, null, 80, 60, 55, 0, 160, 300, null, null, "마이 달링! 루!"],
         [0, "쿠로스 산타", null, 0, null, 54, 10, 30, 0, 160, 300, "유지", null],
-        [0, "하나코마치 쿠리타", null, 0, null, 46, 14, 10, 0, 160, 300, null, null],
+        [0, "하나코마치쿠리타", null, 0, null, 46, 14, 10, 0, 160, 300, null, null, "미유씨는 제가 싫으신가요?"],
         [0, "고니시 아야", null, 0, null, 67, 15, 77, 0, 160, 300, null, null],
         [0, "루", null, 0, null, 81, 50, 73, 0, 160, 300, null, null, "다아!★"],
         [0, "완냐", null, 0, null, 69, 48, 75, 0, 160, 300, null, null],
@@ -118,11 +114,11 @@
         [0, "야보시 세이야", null, 0, null, 70, 50, 70, 0, 160, 300, null, null],
         [0, "야보시 루이", null, 0, null, 75, 73, 71, 0, 160, 300, null, null],
         [0, "도리안", null, 0, null, 65, 49, 86, 0, 160, 300, null, "발명"],
-        [0, "키위", null, 0, null, 66, 33, 70, 0, 160, 300, null, "상재"],
+        [0, "키위", null, 0, null, 66, 33, 70, 0, 160, 300, null, "상재", "와…왕자님…."],
         [0, "구아바", null, 0, null, 45, 49, 51, 0, 160, 300, null, null],
         [0, "히카리가오카", null, 0, null, 70, 49, 77, 0, 160, 300, null, null],
         [0, "코즈키유우", null, 0, null, 85, 33, 75, 0, 160, 300, null, "발명"],
-        [0, "코즈키미키", null, 0, null, 88, 33, 80, 0, 160, 300, null, null],
+        [0, "코즈키미키", null, 0, null, 88, 33, 80, 0, 160, 300, null, null, "그래도 이래뵈도 걱정되서 온거라고..?"],
         [0, "란", null, 0, null, 80, 72, 40, 0, 160, 300, null, null],
         [0, "하루네 아이라", null, 0, null, 84, 45, 74, 0, 160, 300, null, null, "오로라~~~~~~~~~라이징~ 드리임!"],
         [0, "아마미야 리즈무", null, 0, null, 80, 25, 82, 0, 160, 300, null, null],
@@ -167,7 +163,7 @@
         [0, "모리 란", null, 0, null, 67, 100, 82, 0, 160, 300, null, "돌격"],
         [0, "스즈키 소노코", null, 0, null, 66, 55, 86, 0, 160, 300, null, "상재"],
         [0, "쿄고쿠 마코토", null, 0, null, 79, 108, 52, 0, 160, 300, null, "무쌍"],
-        [0, "진", null, 0, null, 79, 87, 90, 0, 160, 300, null, "돌격"],
+        [0, "진", null, 0, null, 79, 87, 90, 0, 160, 300, null, "돌격", "시체가 없다는건 죽지 않았다는 거지"],
         [0, "베르무트", null, 0, null, 75, 67, 96, 0, 160, 300, null, null, "A secret makes a woman woman…"],
         [0, "키얀티", null, 0, null, 56, 80, 49, 0, 160, 300, null, "저격"],
         [0, "코른", null, 0, null, 57, 84, 55, 0, 160, 300, null, "저격"],
@@ -214,7 +210,7 @@
         [0, "후우란", null, 0, null, 82, 30, 90, 0, 160, 300, null, null],
         [0, "파이렌", null, 0, null, 84, 85, 64, 0, 160, 300, null, "기병"],
         [0, "파이탄", null, 0, null, 19, 10, 67, 0, 160, 300, null, null],
-        [0, "쿠탄", null, 0, null, 7, 3, 31, 0, 160, 300, null, null],
+        [999, "쿠우탄", null, 0, null, 1, 1, 1, 0, 160, 300, null, null],
         [0, "엔야", null, 0, null, 79, 91, 38, 0, 160, 300, null, null],
         [0, "키쿄우", null, 0, null, 86, 90, 72, 0, 160, 300, null, null],
         [0, "유도", null, 0, null, 19, 11, 52, 0, 160, 300, null, null],
@@ -223,10 +219,10 @@
         [0, "이이셰", null, 0, null, 87, 94, 41, 0, 160, 300, null, null, "지력 36이 지력100을 이겼다!"],
         [0, "마치", null, 0, null, 77, 23, 94, 0, 160, 300, null, null],
         [0, "카린", null, 0, null, 96, 75, 92, 0, 160, 300, null, "반계"],
-        [0, "슌란", null, 0, null, 85, 89, 20, 0, 160, 300, null, "돌격"],
+        [0, "슌란", null, 0, null, 85, 89, 10, 0, 160, 300, null, "돌격"],
         [0, "슈란", null, 0, null, 87, 92, 75, 0, 160, 300, null, "저격"],
-        [0, "케이파", null, 0, null, 51, 14, 95, 0, 160, 300, null, "집중", "아아…카린님…!"],
-        [0, "곽가린", null, 0, null, 67, 19, 97, 0, 160, 300, null, "신산"],
+        [0, "케이파", null, 0, null, 62, 14, 95, 0, 160, 300, null, "집중", "아아…카린님…!"],
+        [0, "곽가린", null, 0, null, 88, 19, 96, 0, 160, 300, null, "신산"],
         [0, "정욱후우", null, 0, null, 80, 35, 92, 0, 160, 300, null, null, "Zzzzz,,,,"],
         [0, "나기", null, 0, null, 80, 84, 53, 0, 160, 300, null, null],
         [0, "사와", null, 0, null, 83, 78, 63, 0, 160, 300, null, null],
@@ -291,22 +287,22 @@
         [0, "츄츄", null, 0, null, 64, 70, 30, 0, 160, 300, null, null],
         [0, "모모", null, 0, null, 78, 70, 75, 0, 160, 300, null, null],
         [0, "쥐선인", null, 0, null, 90, 43, 94, 0, 160, 300, null, "환술", "고양이들에게 속지마라..!"],
-        [0, "로리 로로나", null, 0, null, 86, 80, 78, 0, 160, 300, null, null, "토토리짱 나 모르겟어? 로로나야 로로나!"],
-        [0, "토토리", null, 0, null, 85, 86, 93, 0, 160, 300, null, null, "역시.. 키가 작으시네요 쿠데리아상"],
-        [0, "메루루", null, 0, null, 87, 75, 92, 0, 160, 300, null, null],
-        [0, "쿠데리아", null, 0, null, 75, 68, 79, 0, 160, 300, null, "상재", "그렇게 부르지 말랬지!!"],
-        [0, "스테르크", null, 0, null, 80, 102, 81, 0, 160, 300, null, "무쌍", "자 따라해봐 로.로.나"],
-        [0, "아스트리드", null, 0, null, 39, 78, 96, 0, 160, 300, "유지", null, "난 아스트리드 젝시드. 너의 스승의 스승의 스승이다."],
+        [0, "로리 로로나", null, 0, null, 85, 65, 70, 0, 160, 300, null, null, "토토리짱 나 모르겟어? 로로나야 로로나!"],
+        [0, "토토리", null, 0, null, 86, 86, 90, 0, 160, 300, null, null, "역시.. 키가 작으시네요 쿠데리아상"],
+        [0, "메루루", null, 0, null, 82, 75, 85, 0, 160, 300, null, null],
+        [0, "쿠데리아", null, 0, null, 75, 81, 79, 0, 160, 300, null, "상재", "그렇게 부르지 말랬지!!"],
+        [0, "스테르크", null, 0, null, 80, 104, 81, 0, 160, 300, null, "무쌍", "자 따라해봐 로.로.나"],
+        [0, "아스트리드", null, 0, null, 39, 75, 96, 0, 160, 300, "유지", null, "난 아스트리드 젝시드. 너의 스승의 스승의 스승이다."],
         [0, "미미", null, 0, null, 78, 82, 76, 0, 160, 300, null, null],
         [0, "지노 크나프", null, 0, null, 72, 84, 70, 0, 160, 300, null, null],
-        [0, "에스카", null, 0, null, 84, 75, 91, 0, 160, 300, null, null],
+        [0, "에스카", null, 0, null, 84, 75, 90, 0, 160, 300, null, null],
         [0, "로직스", null, 0, null, 80, 85, 79, 0, 160, 300, null, null],
-        [0, "소피", null, 0, null, 97, 82, 102, 0, 160, 300, null, "집중", "피리스, 연금술 해보지 않을래?"],
-        [0, "플라흐타", null, 0, null, 84, 72, 106, 0, 160, 300, null, "환술"],
-        [0, "피리스", null, 0, null, 86, 66, 87, 0, 160, 300, null, "반계", "소피선생님..! 플라흐타상!!"],
-        [0, "일메리아", null, 0, null, 90, 58, 85, 0, 160, 300, null, null],
-        [0, "리디", null, 0, null, 77, 79, 82, 0, 160, 300, null, null],
-        [0, "수르", null, 0, null, 79, 77, 84, 0, 160, 300, null, null],
+        [0, "소피", null, 0, null, 97, 82, 98, 0, 160, 300, null, "집중", "피리스, 연금술 해보지 않을래?"],
+        [0, "플라흐타", null, 0, null, 84, 72, 101, 0, 160, 300, null, "환술"],
+        [0, "피리스", null, 0, null, 86, 66, 85, 0, 160, 300, null, "반계", "소피선생님..! 플라흐타상!!"],
+        [0, "일메리아", null, 0, null, 88, 58, 87, 0, 160, 300, null, null],
+        [0, "리디", null, 0, null, 77, 76, 80, 0, 160, 300, null, null],
+        [0, "수르", null, 0, null, 79, 70, 84, 0, 160, 300, null, null],
         [0, "리아나", null, 0, null, 72, 78, 67, 0, 160, 300, null, null],
         [0, "이츠카시도", null, 0, null, 94, 82, 80, 0, 160, 300, null, "환술", "린~~~~네~~~!!!!!!!!!!!!!!!!!!!"],
         [0, "이츠카코토리", null, 0, null, 87, 91, 78, 0, 160, 300, null, null],
@@ -380,7 +376,7 @@
         [0, "큐어 하트", null, 0, null, 93, 90, 95, 0, 160, 300, null, "위압"],
         [0, "큐어 다이아몬드", null, 0, null, 86, 88, 90, 0, 160, 300, null, null],
         [0, "큐어 로제타", null, 0, null, 80, 80, 85, 0, 160, 300, null, "상재"],
-        [0, "큐어소드", null, 0, null, 79, 87, 82, 0, 160, 300, null, "착사"],
+        [0, "큐어소드", null, 0, null, 79, 87, 82, 0, 160, 300, null, "척사"],
         [0, "큐어에이스", null, 0, null, 75, 83, 77, 0, 160, 300, null, null],
         [0, "하세가와스바루", null, 0, null, 86, 77, 80, 0, 160, 300, null, null, "정말 초등학생은 최고야!!"],
         [0, "토모카", null, 0, null, 70, 64, 82, 0, 160, 300, null, null, "잘부탁 드려요 하세가와 코치님!"],
@@ -419,23 +415,23 @@
         [0, "메어리", null, 0, null, 70, 88, 78, 0, 160, 300, null, null],
         [0, "유우키유우나", null, 0, null, 88, 91, 78, 0, 160, 300, null, null, "유우키 유우나! 용자부소속이야!"],
         [0, "토고미모리", null, 0, null, 88, 92, 95, 0, 160, 300, null, null],
-        [0, "후우", null, 0, null, 85, 90, 80, 0, 160, 300, null, null],
-        [0, "이츠키", null, 0, null, 87, 80, 70, 0, 160, 300, null, null],
+        [0, "이누보자키 후우", null, 0, null, 85, 90, 80, 0, 160, 300, null, null],
+        [0, "이누보자키이츠키", null, 0, null, 87, 80, 70, 0, 160, 300, null, null],
         [0, "미요시카린", null, 0, null, 85, 88, 80, 0, 160, 300, null, null],
         [0, "노기소노코", null, 0, null, 81, 81, 78, 0, 160, 300, null, null],
         [0, "미노와긴", null, 0, null, 83, 87, 67, 0, 160, 300, null, null],
         [0, "아키선생님", null, 0, null, 85, 39, 88, 0, 160, 300, null, "귀모"],
-        [0, "신수", null, 0, null, 97, 69, 99, 0, 160, 300, null, "집증"],
+        [0, "신수", null, 0, null, 97, 69, 99, 0, 160, 300, null, "집중"],
         [0, "노기와카바", null, 0, null, 87, 85, 79, 0, 160, 300, null, null],
         [0, "우에사토히나타", null, 0, null, 80, 19, 85, 0, 160, 300, null, "귀모"],
-        [0, "이요지마안즈", null, 0, null, 76, 88, 86, 0, 160, 295, null, "저격"],
-        [0, "도이타마코", null, 0, null, 72, 89, 37, 0, 160, 300, null, "견고"],
+        [0, "이요지마 안즈", null, 0, null, 76, 88, 86, 0, 160, 295, null, "궁병"],
+        [0, "도이 타마코", null, 0, null, 72, 89, 37, 0, 160, 300, null, "견고"],
         [0, "코오리치카게", null, 0, null, 67, 90, 83, 0, 160, 300, null, null],
         [0, "타카시마유우나", null, 0, null, 72, 88, 75, 0, 160, 300, null, null, "군짱, 그러면 안되."],
-        [0, "우타노", null, 0, null, 71, 83, 67, 0, 160, 300, null, "농업"],
+        [0, "시라토리우타노", null, 0, null, 71, 83, 67, 0, 160, 300, null, "경작"],
         [0, "후지모리미토", null, 0, null, 70, 15, 81, 0, 160, 300, null, null],
         [0, "키리토", null, 0, null, 85, 91, 80, 0, 160, 300, null, "무쌍", "스타…버스트!!!...스트림!!!!!"],
-        [0, "아스나", null, 0, null, 94, 89, 87, 0, 160, 300, null, "무쌍", "내…이름…어떻게 안거야??"],
+        [0, "유우키아스나", null, 0, null, 94, 89, 87, 0, 160, 300, null, "무쌍", "내…이름…어떻게 안거야??"],
         [0, "린드", null, 0, null, 81, 72, 69, 0, 160, 300, null, null, "왜 디어벨 상을 죽게 내버려 뒀어!!"],
         [0, "키바오", null, 0, null, 88, 75, 80, 0, 160, 300, null, "통찰", "잠껀 기다려 보그레이!"],
         [0, "에길", null, 0, null, 75, 91, 73, 0, 160, 300, null, "상재", "싸게 사서 싸게 제공하는것이 우리가게의 모토지"],
@@ -491,21 +487,21 @@
         [0, "키라츠바사", null, 0, null, 87, 33, 72, 0, 160, 300, null, null],
         [0, "유우키안쥬", null, 0, null, 80, 35, 77, 0, 160, 300, null, null],
         [0, "토노에레나", null, 0, null, 78, 39, 84, 0, 160, 300, null, null],
-        [0, "타이요아카리", null, 0, null, 80, 80, 81, 0, 160, 300, null, null, "나 잊지 않을테니까! 후유나에대해 절대로 잊지 않을테니까!"],
+        [0, "타이요 아카리", null, 0, null, 80, 80, 81, 0, 160, 300, null, null, "나 잊지 않을테니까! 휴우대해 절대로 잊지 않을테니까!"],
         [0, "츠쿠요미루나", null, 0, null, 72, 53, 82, 0, 160, 300, null, null],
         [0, "시로카네긴카", null, 0, null, 76, 85, 81, 0, 160, 300, null, "상재"],
         [0, "호시카와세이라", null, 0, null, 83, 86, 75, 0, 160, 300, null, "저격"],
-        [0, "신자키휴우나", null, 0, null, 70, 90, 55, 0, 160, 300, null, "신중", "안녕 아카리. 아카리와 만나 행복했어…"],
-        [0, "에티아", null, 0, null, 80, 72, 71, 0, 160, 300, null, null],
-        [0, "아라벨", null, 0, null, 54, 60, 92, 0, 160, 300, null, null],
+        [0, "신자키 휴우나", null, 0, null, 84, 65, 89, 0, 160, 300, null, "신중", "안녕 아카리. 아카리와 만나 행복했어…"],
+        [0, "에티아 비스콘티", null, 0, null, 80, 72, 71, 0, 160, 300, null, null],
+        [0, "아라엘웨스트코트", null, 0, null, 54, 60, 92, 0, 160, 300, null, null],
         [0, "프리실라", null, 0, null, 76, 83, 56, 0, 160, 300, null, null],
         [0, "멜티나", null, 0, null, 71, 82, 65, 0, 160, 300, null, null],
         [0, "하나에", null, 0, null, 74, 80, 65, 0, 160, 300, null, null],
-        [0, "도레미", null, 0, null, 86, 75, 42, 0, 160, 300, null, null, "프리티 윗치 도레미치!"],
+        [0, "하루카제 도레미", null, 0, null, 86, 75, 42, 0, 160, 300, null, null, "프리티 윗치 도레미치!"],
         [0, "하즈키", null, 0, null, 78, 61, 80, 0, 160, 300, null, null, "프리티 윗치 하즈키치!"],
         [0, "아이코", null, 0, null, 78, 61, 75, 0, 160, 300, null, null, "프리티 윗치 아이코치!"],
-        [0, "폿프", null, 0, null, 70, 70, 79, 0, 160, 300, null, null, "프리티 윗치 폿프치!"],
-        [0, "세가와온푸", null, 0, null, 82, 60, 88, 0, 160, 300, null, null, "프리티 윗치 온푸치!"],
+        [0, "하루카제 폿프", null, 0, null, 70, 70, 79, 0, 160, 300, null, null, "프리티 윗치 폿프치!"],
+        [0, "세가와 온푸", null, 0, null, 82, 60, 88, 0, 160, 300, null, null, "프리티 윗치 온푸치!"],
         [0, "모모코", null, 0, null, 65, 75, 78, 0, 160, 300, null, null, "프리티 윗치 모모코치!"],
         [0, "마죠리카", null, 0, null, 86, 33, 83, 0, 160, 300, null, "상재"],
         [0, "유키선생님", null, 0, null, 86, 67, 89, 0, 160, 300, null, null],
@@ -523,7 +519,7 @@
         [1, "사토시", null, 0, null, 51, 95, 13, 0, 160, 300, null, null],
         [0, "타케시", null, 0, null, 80, 32, 92, 0, 160, 300, null, null],
         [1, "카스미", null, 0, null, 80, 44, 70, 0, 160, 300, null, null],
-        [0, "그린", null, 0, null, 76, 55, 82, 0, 160, 222, null, null],
+        [0, "그린", null, 0, null, 22, 22, 22, 0, 160, 222, null, null],
         [0, "관철", null, 0, null, 79, 33, 83, 0, 160, 300, null, null],
         [0, "오키드 박사", null, 0, null, 70, 31, 95, 0, 160, 300, null, null],
         [0, "하루카", null, 0, null, 87, 67, 81, 0, 160, 300, null, null],
@@ -540,9 +536,9 @@
         [0, "이즈미코시로", null, 0, null, 67, 39, 95, 0, 160, 300, null, null],
         [0, "타치카와미미", null, 0, null, 81, 62, 60, 0, 160, 300, null, null],
         [0, "키도죠", null, 0, null, 76, 50, 89, 0, 160, 300, null, "의술"],
-        [0, "타케루", null, 0, null, 87, 91, 75, 0, 160, 300, null, "위압", "파타몬~~~~!!!!!!!!"],
+        [0, "타케루", null, 0, null, 87, 91, 75, 0, 160, 300, null, null, "파타몬~~~~!!!!!!!!"],
         [0, "야가미히카리", null, 0, null, 84, 39, 89, 0, 160, 300, null, null],
-        [0, "반데몬", null, 0, null, 55, 80, 80, 0, 160, 300, null, null],
+        [0, "반데몬", null, 0, null, 52, 87, 80, 0, 160, 300, null, null],
         [0, "다이스케", null, 0, null, 74, 79, 65, 0, 160, 300, null, null],
         [0, "미야코", null, 0, null, 80, 60, 75, 0, 160, 300, null, null],
         [0, "히다 이오리", null, 0, null, 70, 64, 80, 0, 160, 300, null, null],
@@ -557,11 +553,11 @@
         [0, "타카이시유키", null, 0, null, 74, 72, 69, 0, 160, 300, null, null],
         [0, "미츠루", null, 0, null, 70, 69, 60, 0, 160, 300, null, null],
         [0, "코지로", null, 0, null, 76, 64, 79, 0, 160, 300, null, "상재"],
-        [0, "무사시", null, 0, null, 75, 80, 60, 0, 160, 300, null, "무쌍"],
+        [0, "무사시", null, 0, null, 75, 85, 60, 0, 160, 300, null, "무쌍"],
         [0, "에비스자와쿠루미", null, 0, null, 72, 88, 59, 0, 160, 300, null, "무쌍"],
-        [0, "타케야유키", null, 0, null, 73, 39, 29, 0, 160, 300, null, null],
+        [0, "타케야유키", null, 0, null, 73, 39, 29, 0, 160, 300, null, null, "학교생활부는 언제나 함께야!"],
         [0, "와카사유리", null, 0, null, 77, 33, 90, 0, 160, 300, null, null],
-        [0, "이케다미키", null, 0, null, 74, 66, 75, 0, 160, 300, null, null],
+        [0, "나오키 미키", null, 0, null, 74, 66, 75, 0, 160, 300, null, null],
         [0, "사쿠라메구미", null, 0, null, 77, 32, 80, 0, 160, 300, null, null, "언니가 아니라 사쿠라 선생님!"],
         [0, "다이몬마사루", null, 0, null, 56, 99, 42, 0, 160, 300, null, null],
         [0, "히나모리아무", null, 0, null, 83, 70, 67, 0, 160, 300, null, null, "네거티브 하트 록온! 오픈 하트!!"],
@@ -586,8 +582,8 @@
         [0, "마키노 루키", null, 0, null, 77, 63, 77, 0, 160, 300, null, null],
         [0, "리젠랴", null, 0, null, 72, 70, 77, 0, 160, 300, null, null],
         [0, "리슈촌", null, 0, null, 67, 43, 52, 0, 160, 300, null, null],
-        [0, "쿠도타이키", null, 0, null, 82, 55, 80, 0, 160, 300, null, null],
-        [0, "히노모토아카리", null, 0, null, 77, 50, 84, 0, 160, 300, null, null],
+        [0, "쿠도 타이키", null, 0, null, 82, 55, 80, 0, 160, 300, null, null, "정말 위험한 순간에 네가 근처에 있으면 네가 날 기다려 준다면 나는 무슨일이 있어도 내 곁으로 돌아올게."],
+        [0, "히노모토 아카리", null, 0, null, 77, 50, 84, 0, 160, 300, null, null, "먹은뒤에 양치질도 안하고 상처가 나도 침만 바르고 놔두거나 감기에 걸려도 금새 밖에 뛰어나가 놀거나…!! 그렇지만… 반드시..! 반드시…돌아와줘..!!"],
         [0, "유메노우타", null, 0, null, 83, 49, 80, 0, 160, 300, null, null, "코구레!!!(빡침)"],
         [0, "코구레카게루", null, 0, null, 80, 78, 60, 0, 160, 300, null, null, "널 좋아해 우타."],
         [0, "히이라기케이이치", null, 0, null, 86, 72, 88, 0, 160, 300, null, null],
@@ -622,18 +618,6 @@
         [0, "타카미치카", null, 0, null, 80, 40, 76, 0, 160, 300, null, null],
         [0, "사쿠라우치리코", null, 0, null, 80, 44, 84, 0, 160, 300, null, null],
         [0, "큐어에코", null, 0, null, 83, 62, 74, 0, 160, 300, null, null],
-        [0, "큐어러블리", null, 0, null, 80, 83, 47, 0, 160, 300, null, null],
-        [0, "큐어프린세스", null, 0, null, 76, 85, 55, 0, 160, 300, null, null],
-        [0, "큐어허니", null, 0, null, 83, 86, 67, 0, 160, 300, null, null],
-        [0, "큐어포춘", null, 0, null, 82, 90, 80, 0, 160, 300, null, null],
-        [0, "블루", null, 0, null, 41, 29, 17, 0, 160, 210, null, null],
-        [0, "큐어텐더", null, 0, null, 82, 94, 77, 0, 160, 300, null, null],
-        [0, "큐어플로라", null, 0, null, 81, 87, 69, 0, 160, 300, null, null],
-        [0, "큐어머메이드", null, 0, null, 88, 80, 93, 0, 160, 300, null, null],
-        [0, "큐어트윙클", null, 0, null, 88, 84, 80, 0, 160, 300, null, null],
-        [0, "큐어미라클", null, 0, null, 80, 86, 74, 0, 160, 300, null, null],
-        [0, "큐어매지컬", null, 0, null, 78, 83, 70, 0, 160, 300, null, null],
-        [0, "큐어펠리체", null, 0, null, 80, 77, 62, 0, 160, 300, null, null],
         [0, "키쿠오카세이지로", null, 0, null, 83, 42, 78, 0, 160, 300, null, null],
         [0, "히가타케루", null, 0, null, 70, 27, 90, 0, 160, 300, null, null],
         [0, "코지코린코", null, 0, null, 75, 40, 89, 0, 160, 300, null, null],
@@ -642,14 +626,10 @@
         [0, "크라미 첼", null, 0, null, 72, 42, 82, 0, 160, 300, null, null],
         [0, "필 닐바렌", null, 0, null, 75, 32, 90, 0, 160, 300, null, null],
         [0, "플럼스토커", null, 0, null, 78, 52, 89, 0, 160, 300, null, null],
-        [0, "테토", null, 0, null, 75, 39, 95, 0, 160, 300, null, null],
-        [0, "키리야마카즈오", null, 0, null, 92, 99, 97, 0, 160, 300, "패권", "위압", "앞이 나오면 너말대로 분교로가서 다죽이고 뒤가 나오면…. 이살인게임을 받아들이기로."],
-        [0, "스기무라히로키", null, 0, null, 85, 90, 50, 0, 160, 300, null, null, "코토히키…넌 내가 지킬거야…"],
-        [0, "미무라신지", null, 0, null, 89, 35, 93, 0, 160, 300, null, null],
-        [0, "카와다소교", null, 0, null, 72, 58, 85, 0, 160, 300, null, null, "이 게임은 아직 끝나지 않았어…"],
-        [0, "아마쿠사카나데", null, 0, null, 80, 20, 75, 0, 160, 300, null, null],
+        [0, "테토", null, 0, null, 75, 39, 95, 0, 160, 300, null, null, "제 10조! 모두들 사이좋게 플레이 합시다~"],
+        [0, "아마쿠사카나데", null, 0, null, 80, 20, 75, 0, 160, 300, null, null, "도라쿠짱 날아라~ 날아라~"],
         [0, "나레이션", null, 0, null, 50, 50, 50, 0, 160, 300, null, null, "에라베!"],
-        [0, "도라쿠우타케", null, 0, null, 79, 31, 85, 0, 160, 300, null, null],
+        [0, "도라쿠우타케", null, 0, null, 79, 31, 85, 0, 160, 300, null, null, "너도 참 고생이 많구나.,"],
         [0, "아마가미소라", null, 0, null, 67, 17, 92, 0, 160, 300, null, null],
         [0, "코우사카쿄우스케", null, 0, null, 70, 19, 30, 0, 160, 300, null, null],
         [0, "코우사카키리노", null, 0, null, 60, 60, 19, 0, 160, 300, null, null, "나한테 우리오빠 뺏긴 기분이 어떄?"],
@@ -672,7 +652,6 @@
         [0, "사카키바라요코", null, 0, null, 85, 35, 77, 0, 160, 300, null, null],
         [0, "혼다미카", null, 0, null, 83, 40, 80, 0, 160, 300, null, null],
         [0, "미도리카와리에", null, 0, null, 87, 33, 82, 0, 160, 300, null, null],
-        [0, "소마미츠코", null, 0, null, 85, 75, 80, 0, 160, 300, null, null, "뭐. 나도 살려둘 마음은 없었으니까."],
         [0, "코코", null, 0, null, 77, 19, 80, 0, 160, 300, null, null],
         [0, "너츠", null, 0, null, 77, 32, 85, 0, 160, 300, null, null],
         [0, "트리오더마이너", null, 0, null, 52, 84, 45, 0, 160, 300, null, null],
@@ -694,33 +673,29 @@
         [0, "큐어써니", null, 0, null, 80, 80, 72, 0, 160, 300, null, null],
         [0, "큐어마치", null, 0, null, 83, 82, 75, 0, 160, 300, null, null],
         [0, "큐어뷰티", null, 0, null, 80, 76, 82, 0, 160, 300, null, null],
-        [0, "큐어휩", null, 0, null, 82, 78, 50, 0, 160, 300, null, null],
-        [0, "큐어커스터드", null, 0, null, 74, 65, 83, 0, 160, 300, null, null],
-        [0, "큐어젤라토", null, 0, null, 82, 78, 83, 0, 160, 300, null, null],
-        [0, "큐어마카롱", null, 0, null, 83, 76, 89, 0, 160, 300, null, null],
-        [0, "큐어파르페", null, 0, null, 81, 80, 80, 0, 160, 300, null, null],
-        [0, "유메노코토", null, 0, null, 81, 39, 80, 0, 160, 300, null, null],
-        [0, "쿠로미", null, 0, null, 80, 49, 80, 0, 160, 300, null, null],
+        [0, "유메노코토", null, 0, null, 81, 39, 80, 0, 160, 300, null, null, "혼노~ 스코시~ 이지와루나~ 뎅와노 키리카타오~ 시타노~ 다앗테 큐우니 신켄~나오에데하나시 다스노~ 즈루이~ 스키타요토~ 이와세테아 게나이 다앗테 히카세테아게나이"],
+        [0, "쿠로미", null, 0, null, 80, 49, 80, 0, 160, 300, null, null, "쿠로미 사건일지 XXX호!!"],
         [0, "바쿠", null, 0, null, 55, 55, 50, 0, 160, 300, null, null],
         [0, "쿠로미파이브", null, 0, null, 59, 67, 60, 0, 160, 300, null, null],
-        [0, "나빛나", null, 0, null, 87, 49, 83, 0, 160, 300, null, null, "혼노~ 스코시~ 이지와루나~ 뎅와노 키리카타오~ 시타노~ 다앗테 큐우니 신켄~나오에데하나시 다스노~ 즈루이~ 스키타요토~ 이와세테아 게나이 다앗테 히카세테아게나이"],
-        [0, "아이리스", null, 0, null, 83, 50, 86, 0, 160, 300, null, null, "쿠로미 사건일지 XXX호!!"],
-        [0, "포켓몬 세레나", null, 0, null, 85, 50, 82, 0, 160, 300, null, null],
+        [0, "나빛나", null, 0, null, 87, 49, 83, 0, 160, 300, null, null, "xxx   멋지게~ 등장~!"],
+        [0, "아이리스", null, 0, null, 83, 50, 86, 0, 160, 300, null, null, "어서오세요 도전자여. 기다리고 있엇습니다."],
+        [0, "세레나", null, 0, null, 85, 50, 82, 0, 160, 300, null, null],
         [0, "시트론", null, 0, null, 79, 41, 92, 0, 160, 300, null, "발명"],
         [0, "난천", null, 0, null, 84, 53, 87, 0, 160, 300, null, null],
         [0, "루자미네", null, 0, null, 80, 40, 92, 0, 160, 300, null, null],
         [0, "릴리에", null, 0, null, 82, 64, 69, 0, 160, 300, null, null],
-        [0, "나카가와노리코", null, 0, null, 81, 19, 72, 0, 160, 300, null, null],
-        [0, "오다토시노리", null, 0, null, 56, 40, 81, 0, 160, 300, null, null],
-        [0, "나나하라슈야", null, 0, null, 85, 55, 74, 0, 160, 300, null, null],
         [0, "어른로로나", null, 0, null, 92, 89, 94, 0, 160, 300, null, null, "에… 여러분들은???"],
         [0, "푸크푹", null, 0, null, 92, 79, 80, 0, 160, 300, null, null, "어서와 섀도게일 언니."],
         [0, "그림하트", null, 0, null, 77, 51, 49, 0, 160, 300, null, null, "목을 쳐라.."],
-        [0, "마왕팜", null, 0, null, 72, 94, 50, 0, 160, 300, null, null],
-        [0, "피티프레데리카", null, 0, null, 84, 33, 86, 0, 160, 300, null, null],
-        [0, "웨딘", null, 0, null, 86, 40, 85, 0, 160, 300, null, null, "마법나라잖아요! 꿈과 판타지잖아요! 당신들, 바보 아녜요? 어떻게 일이 잘 안 풀린다고 남까지 말려들게 해서 몽땅 죽여 버리겠다는 결론을 낼 수 있죠?"]
-    ],
-    "general_ex":[
-        
+        [0, "마왕팜", null, 0, null, 72, 94, 50, 0, 160, 300, null, null, "무지개…? 어째서…."],
+        [0, "피티프레데리카", null, 0, null, 84, 33, 86, 0, 160, 300, null, null, "저같은건 믿을만한 상대가 아니랍니다 분명 불쾌한 기분이 들거에요."],
+        [0, "웨딘", null, 0, null, 86, 40, 85, 0, 160, 300, null, null, "마법나라잖아요! 꿈과 판타지잖아요! 당신들, 바보 아녜요? 어떻게 일이 잘 안 풀린다고 남까지 말려들게 해서 몽땅 죽여 버리겠다는 결론을 낼 수 있죠? 그런 걸 납득할 사람이 어"],
+        [0, "벨 크라넬", null, 0, null, 84, 85, 76, 0, 160, 300, null, null],
+        [0, "아이즈발렌슈타인", null, 0, null, 81, 90, 77, 0, 160, 300, null, null],
+        [0, "프레이 마이어", null, 0, null, 92, 101, 67, 0, 160, 300, null, "위압", "내기도….들어줬어… 내 친구야 내가 태어난 의미가 여기있어"],
+        [0, "앤 마이어", null, 0, null, 88, 90, 86, 0, 160, 300, null, null, "그런거 당연하잖아 이세상 그누구보다도 프레이를 좋아해…"],
+        [0, "릴리루카 아데", null, 0, null, 77, 65, 81, 0, 160, 300, null, null],
+        [0, "에테몽키", null, 0, null, 78, 51, 91, 0, 160, 300, null, null, "인간이란 정말 대단해 타이치도 그렇지만 항상 계산이상의 무언가를 만들어내지. 녀석들의 배틀은 솔직히 즐거웠어."],
+        [0, "에테몬", null, 0, null, 65, 81, 55, 0, 160, 300, null, null, "사라지고 싶지 않아!! 난 이세상의 스타라고! 스타는 영원한 거란 말이야~~~~~~~~~~~~~~~~~~~~~~~~~~~~"]
     ]
 }

hwe/scenario/scenario_2180.json

@@ -0,0 +1,781 @@
+{
+    "title": "【가상모드18】 고대무장 신대륙가다!",
+    "startYear": 180,
+    "history": [
+        "<C>●</>180년 1월:<L><b>【가상모드18】</b>고대무장 신대륙가다!</>",
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>춘추전국+초한지+삼국지+체삼모 모두 모였다! 근데 여긴 어디...?"
+    ],
+    "stat": {
+        "total": 265,
+        "min": 75,
+        "max": 95
+    },
+    "iconPath": ".",
+    "fiction": 1,
+    "nation":[
+        
+    ],
+    "map":{
+        "mapName":"ludo_rathowm",
+        "unitSet":"ludo_rathowm"
+    },
+    "diplomacy":[],
+    "general":[
+        [0, "아회남", null, 0, null, 65, 74, 26, 0, 160, 300, null, null],
+        [0, "이적", null, 0, null, 40, 24, 84, 0, 160, 300, null, null],
+        [0, "윤상", null, 0, null, 51, 44, 62, 0, 160, 300, null, null],
+        [0, "윤묵", null, 0, null, 26, 15, 66, 0, 160, 300, null, null],
+        [0, "우금", null, 0, null, 85, 78, 78, 0, 160, 300, null, null],
+        [0, "위관", null, 0, null, 69, 46, 79, 0, 160, 300, null, null],
+        [0, "원윤", null, 0, null, 32, 14, 39, 0, 160, 300, null, null],
+        [0, "원희", null, 0, null, 66, 51, 63, 0, 160, 300, null, null],
+        [0, "염행", null, 0, null, 79, 90, 61, 0, 160, 300, null, null],
+        [0, "염유", null, 0, null, 71, 57, 71, 0, 160, 300, null, null],
+        [0, "원술", null, 0, null, 76, 65, 75, 0, 160, 300, null, null],
+        [0, "원상", null, 0, null, 63, 75, 42, 0, 160, 300, null, null],
+        [0, "원소", null, 0, null, 89, 69, 78, 0, 160, 300, null, null, "사세삼공의 명문가 하북의 주인"],
+        [0, "염상", null, 0, null, 40, 27, 71, 0, 160, 300, null, null],
+        [0, "원담", null, 0, null, 60, 78, 30, 0, 160, 300, null, null],
+        [0, "염포", null, 0, null, 40, 25, 82, 0, 160, 300, null, null],
+        [0, "왕위", null, 0, null, 60, 70, 62, 0, 160, 300, null, null],
+        [0, "왕윤", null, 0, null, 26, 6, 68, 0, 160, 300, null, null],
+        [0, "왕항", null, 0, null, 76, 60, 61, 0, 160, 300, null, null],
+        [0, "왕찬", null, 0, null, 15, 3, 79, 0, 160, 300, null, null],
+        [0, "왕수", null, 0, null, 54, 27, 77, 0, 160, 300, null, null],
+        [0, "왕숙", null, 0, null, 36, 22, 76, 0, 160, 300, null, null],
+        [0, "왕준", null, 0, null, 85, 73, 80, 0, 160, 300, null, null],
+        [0, "왕쌍", null, 0, null, 67, 88, 19, 0, 160, 300, null, null],
+        [0, "왕창", null, 0, null, 74, 64, 79, 0, 160, 300, null, null],
+        [0, "왕평", null, 0, null, 86, 81, 76, 0, 160, 300, null, null],
+        [0, "왕보", null, 0, null, 62, 41, 79, 0, 160, 300, null, null],
+        [0, "왕문", null, 0, null, 65, 64, 31, 0, 160, 300, null, null],
+        [0, "왕릉", null, 0, null, 74, 64, 71, 0, 160, 300, null, null],
+        [0, "왕루", null, 0, null, 28, 30, 79, 0, 160, 300, null, null],
+        [0, "왕랑", null, 0, null, 47, 35, 79, 0, 160, 300, null, null],
+        [0, "온회", null, 0, null, 62, 36, 74, 0, 160, 300, null, null],
+        [0, "하안", null, 0, null, 15, 30, 72, 0, 160, 300, null, null],
+        [0, "괴월", null, 0, null, 50, 27, 85, 0, 160, 300, null, null],
+        [0, "괴량", null, 0, null, 68, 33, 88, 0, 160, 300, null, null],
+        [0, "가화", null, 0, null, 49, 65, 41, 0, 160, 300, null, null],
+        [0, "가규", null, 0, null, 78, 61, 84, 0, 160, 300, null, null],
+        [0, "하의", null, 0, null, 56, 69, 36, 0, 160, 300, null, null],
+        [0, "화흠", null, 0, null, 51, 33, 88, 0, 160, 300, null, null],
+        [0, "가후", null, 0, null, 71, 40, 98, 0, 160, 300, null, null, "이기기 위한 전략만 내드리겠습니다"],
+        [0, "곽가", null, 0, null, 70, 41, 97, 0, 160, 300, null, null, "조공을 위한 명이 조금만 더 남았다면..."],
+        [0, "악환", null, 0, null, 65, 82, 42, 0, 160, 300, null, null],
+        [0, "곽사", null, 0, null, 64, 76, 13, 0, 160, 300, null, null],
+        [0, "악취", null, 0, null, 53, 66, 61, 0, 160, 300, null, null],
+        [0, "곽준", null, 0, null, 73, 66, 73, 0, 160, 300, null, null],
+        [0, "학소", null, 0, null, 88, 79, 82, 0, 160, 300, null, null],
+        [0, "악진", null, 0, null, 80, 85, 56, 0, 160, 300, null, null],
+        [0, "곽도", null, 0, null, 62, 50, 82, 0, 160, 300, null, null],
+        [0, "학맹", null, 0, null, 62, 67, 42, 0, 160, 300, null, null],
+        [0, "곽유지", null, 0, null, 28, 9, 69, 0, 160, 300, null, null],
+        [0, "곽익", null, 0, null, 73, 69, 69, 0, 160, 300, null, null],
+        [0, "곽회", null, 0, null, 90, 78, 85, 0, 160, 300, null, null],
+        [0, "하후위", null, 0, null, 71, 73, 49, 0, 160, 300, null, null],
+        [0, "하후연", null, 0, null, 95, 91, 74, 0, 160, 300, null, null, "궁술로 날 당해낼 자가 있을까?"],
+        [0, "하후은", null, 0, null, 63, 72, 53, 0, 160, 300, null, null],
+        [0, "하후화", null, 0, null, 48, 51, 71, 0, 160, 300, null, null],
+        [0, "하후혜", null, 0, null, 50, 44, 76, 0, 160, 300, null, null],
+        [0, "하후현", null, 0, null, 54, 39, 76, 0, 160, 300, null, null],
+        [0, "하후상", null, 0, null, 79, 72, 75, 0, 160, 300, null, null],
+        [0, "하후덕", null, 0, null, 69, 73, 32, 0, 160, 300, null, null],
+        [0, "하후돈", null, 0, null, 92, 88, 68, 0, 160, 300, null, null, "여포 네이놈...! (꿀꺽)"],
+        [0, "하후패", null, 0, null, 79, 85, 77, 0, 160, 300, null, null],
+        [0, "하후무", null, 0, null, 20, 7, 4, 0, 160, 300, null, null],
+        [0, "가충", null, 0, null, 54, 31, 89, 0, 160, 300, null, null],
+        [0, "하진", null, 0, null, 68, 54, 75, 0, 160, 300, null, null],
+        [0, "화웅", null, 0, null, 78, 90, 55, 0, 160, 300, null, null],
+        [0, "한윤", null, 0, null, 26, 29, 65, 0, 160, 300, null, null],
+        [0, "관우", null, 0, null, 93, 99, 79, 0, 160, 300, null, null, "차가 식기 전에 적장의 목을 베어 오겠소!"],
+        [0, "환계", null, 0, null, 25, 26, 68, 0, 160, 300, null, null],
+        [0, "관해", null, 0, null, 70, 82, 10, 0, 160, 300, null, null],
+        [0, "관구검", null, 0, null, 84, 86, 62, 0, 160, 300, null, null],
+        [0, "한현", null, 0, null, 22, 33, 7, 0, 160, 300, null, null],
+        [0, "한호", null, 0, null, 73, 72, 84, 0, 160, 300, null, null],
+        [0, "관흥", null, 0, null, 76, 85, 67, 0, 160, 300, null, null],
+        [0, "관색", null, 0, null, 74, 86, 56, 0, 160, 300, null, null],
+        [0, "한수", null, 0, null, 78, 75, 79, 0, 160, 300, null, null],
+        [0, "한숭", null, 0, null, 25, 15, 71, 0, 160, 300, null, null],
+        [0, "관정", null, 0, null, 36, 52, 73, 0, 160, 300, null, null],
+        [0, "한섬", null, 0, null, 69, 66, 36, 0, 160, 300, null, null],
+        [0, "감택", null, 0, null, 51, 49, 83, 0, 160, 300, null, null],
+        [0, "한충", null, 0, null, 64, 67, 18, 0, 160, 300, null, null],
+        [0, "한당", null, 0, null, 76, 85, 61, 0, 160, 300, null, null],
+        [0, "한덕", null, 0, null, 63, 76, 25, 0, 160, 300, null, null],
+        [0, "감녕", null, 0, null, 92, 95, 76, 0, 160, 300, null, null],
+        [0, "한복", null, 0, null, 28, 3, 27, 0, 160, 300, null, null],
+        [0, "관평", null, 0, null, 78, 82, 72, 0, 160, 300, null, null],
+        [0, "간옹", null, 0, null, 20, 32, 75, 0, 160, 300, null, null],
+        [0, "안량", null, 0, null, 88, 96, 43, 0, 160, 300, null, null],
+        [0, "위연", null, 0, null, 91, 90, 78, 0, 160, 300, null, null],
+        [0, "국의", null, 0, null, 84, 78, 51, 0, 160, 300, null, null],
+        [0, "희지재", null, 0, null, 63, 35, 90, 0, 160, 300, null, null],
+        [0, "위속", null, 0, null, 67, 78, 31, 0, 160, 300, null, null],
+        [0, "위유", null, 0, null, 46, 29, 74, 0, 160, 300, null, null],
+        [0, "우금2", null, 0, null, 72, 79, 38, 0, 160, 300, null, null],
+        [0, "우보", null, 0, null, 38, 60, 21, 0, 160, 300, null, null],
+        [0, "강유", null, 0, null, 92, 88, 91, 0, 160, 300, null, null],
+        [0, "공지", null, 0, null, 43, 53, 62, 0, 160, 300, null, null],
+        [0, "교유", null, 0, null, 64, 69, 38, 0, 160, 300, null, null],
+        [0, "공도", null, 0, null, 59, 70, 23, 0, 160, 300, null, null],
+        [0, "허공", null, 0, null, 44, 66, 64, 0, 160, 300, null, null],
+        [0, "허정", null, 0, null, 23, 5, 68, 0, 160, 300, null, null],
+        [0, "허저", null, 0, null, 74, 97, 36, 0, 160, 300, null, null],
+        [0, "허유", null, 0, null, 36, 21, 80, 0, 160, 300, null, null],
+        [0, "기령", null, 0, null, 85, 84, 51, 0, 160, 300, null, null],
+        [0, "김의", null, 0, null, 32, 38, 65, 0, 160, 300, null, null],
+        [0, "김배삼결", null, 0, null, 64, 76, 19, 0, 160, 300, null, null],
+        [0, "김선", null, 0, null, 52, 68, 13, 0, 160, 300, null, null],
+        [0, "우번", null, 0, null, 46, 46, 87, 0, 160, 300, null, null],
+        [0, "형도영", null, 0, null, 69, 79, 41, 0, 160, 300, null, null],
+        [0, "엄안", null, 0, null, 82, 83, 72, 0, 160, 300, null, null],
+        [0, "엄망", null, 0, null, 68, 71, 40, 0, 160, 300, null, null],
+        [0, "엄준", null, 0, null, 41, 12, 71, 0, 160, 300, null, null],
+        [0, "엄정", null, 0, null, 50, 55, 39, 0, 160, 300, null, null],
+        [0, "엄백호", null, 0, null, 67, 70, 42, 0, 160, 300, null, null],
+        [0, "엄여", null, 0, null, 61, 78, 44, 0, 160, 300, null, null],
+        [0, "오의", null, 0, null, 79, 73, 70, 0, 160, 300, null, null],
+        [0, "황개", null, 0, null, 80, 86, 70, 0, 160, 300, null, null],
+        [0, "고간", null, 0, null, 74, 56, 48, 0, 160, 300, null, null],
+        [0, "황권", null, 0, null, 75, 59, 88, 0, 160, 300, null, null],
+        [0, "고유", null, 0, null, 57, 43, 72, 0, 160, 300, null, null],
+        [0, "고순", null, 0, null, 86, 89, 60, 0, 160, 300, null, null],
+        [0, "고상", null, 0, null, 68, 68, 53, 0, 160, 300, null, null],
+        [0, "고승", null, 0, null, 67, 73, 41, 0, 160, 300, null, null],
+        [0, "후성", null, 0, null, 74, 75, 68, 0, 160, 300, null, null],
+        [0, "후선", null, 0, null, 63, 66, 34, 0, 160, 300, null, null],
+        [0, "황조", null, 0, null, 81, 66, 62, 0, 160, 300, null, null],
+        [0, "공손월", null, 0, null, 74, 72, 47, 0, 160, 300, null, null],
+        [0, "공손연", null, 0, null, 65, 70, 60, 0, 160, 300, null, null],
+        [0, "공손공", null, 0, null, 39, 17, 69, 0, 160, 300, null, null],
+        [0, "공손강", null, 0, null, 72, 66, 65, 0, 160, 300, null, null],
+        [0, "공손찬", null, 0, null, 86, 82, 75, 0, 160, 300, null, null],
+        [0, "공손속", null, 0, null, 63, 68, 57, 0, 160, 300, null, null],
+        [0, "공손도", null, 0, null, 67, 71, 66, 0, 160, 300, null, null],
+        [0, "공손범", null, 0, null, 73, 69, 66, 0, 160, 300, null, null],
+        [0, "황충", null, 0, null, 88, 96, 65, 0, 160, 300, null, null],
+        [0, "고정", null, 0, null, 55, 63, 43, 0, 160, 300, null, null],
+        [0, "고패", null, 0, null, 66, 61, 69, 0, 160, 300, null, null],
+        [0, "황보숭", null, 0, null, 91, 61, 82, 0, 160, 300, null, null],
+        [0, "공융", null, 0, null, 30, 5, 73, 0, 160, 300, null, null],
+        [0, "고람", null, 0, null, 76, 82, 68, 0, 160, 300, null, null],
+        [0, "오경", null, 0, null, 69, 66, 52, 0, 160, 300, null, null],
+        [0, "호거아", null, 0, null, 70, 82, 41, 0, 160, 300, null, null],
+        [0, "호진", null, 0, null, 65, 74, 12, 0, 160, 300, null, null],
+        [0, "올돌골", null, 0, null, 79, 86, 11, 0, 160, 300, null, null],
+        [0, "호반", null, 0, null, 55, 55, 59, 0, 160, 300, null, null],
+        [0, "오반", null, 0, null, 74, 71, 59, 0, 160, 300, null, null],
+        [0, "고옹", null, 0, null, 52, 18, 81, 0, 160, 300, null, null],
+        [0, "오란", null, 0, null, 68, 80, 35, 0, 160, 300, null, null],
+        [0, "채화", null, 0, null, 39, 50, 1, 0, 160, 300, null, null],
+        [0, "채중", null, 0, null, 40, 54, 2, 0, 160, 300, null, null],
+        [0, "채모", null, 0, null, 70, 70, 77, 0, 160, 300, null, null],
+        [0, "착융", null, 0, null, 60, 69, 38, 0, 160, 300, null, null],
+        [0, "사마의", null, 0, null, 99, 63, 98, 0, 160, 300, null, null],
+        [0, "사마염", null, 0, null, 69, 59, 77, 0, 160, 300, null, null],
+        [0, "사마사", null, 0, null, 84, 64, 89, 0, 160, 300, null, null],
+        [0, "사마소", null, 0, null, 85, 57, 88, 0, 160, 300, null, null],
+        [0, "사마부", null, 0, null, 70, 37, 77, 0, 160, 300, null, null],
+        [0, "사마랑", null, 0, null, 20, 21, 72, 0, 160, 300, null, null],
+        [0, "사마가", null, 0, null, 66, 84, 25, 0, 160, 300, null, null],
+        [0, "주흔", null, 0, null, 65, 62, 73, 0, 160, 300, null, null],
+        [0, "주앙", null, 0, null, 74, 65, 65, 0, 160, 300, null, null],
+        [0, "주지", null, 0, null, 73, 85, 41, 0, 160, 300, null, null],
+        [0, "주창", null, 0, null, 68, 77, 42, 0, 160, 300, null, null],
+        [0, "주태", null, 0, null, 84, 91, 48, 0, 160, 300, null, null],
+        [0, "주방", null, 0, null, 52, 41, 80, 0, 160, 300, null, null],
+        [0, "주유", null, 0, null, 96, 75, 97, 0, 160, 300, null, null, "미주랑 주유 공근이 왔습니다"],
+        [0, "주환", null, 0, null, 87, 84, 77, 0, 160, 300, null, null],
+        [0, "주거", null, 0, null, 77, 57, 72, 0, 160, 300, null, null],
+        [0, "축융", null, 0, null, 72, 75, 35, 0, 160, 300, null, null],
+        [0, "주준", null, 0, null, 89, 65, 76, 0, 160, 300, null, null],
+        [0, "주연", null, 0, null, 86, 75, 74, 0, 160, 300, null, null],
+        [0, "주치", null, 0, null, 71, 56, 72, 0, 160, 300, null, null],
+        [0, "주포", null, 0, null, 68, 73, 34, 0, 160, 300, null, null],
+        [0, "주령", null, 0, null, 78, 73, 67, 0, 160, 300, null, null],
+        [0, "순욱", null, 0, null, 80, 38, 97, 0, 160, 300, null, null],
+        [0, "순우경", null, 0, null, 78, 66, 29, 0, 160, 300, null, null],
+        [0, "순심", null, 0, null, 45, 25, 78, 0, 160, 300, null, null],
+        [0, "순유", null, 0, null, 81, 35, 95, 0, 160, 300, null, null],
+        [0, "장완", null, 0, null, 78, 34, 89, 0, 160, 300, null, null],
+        [0, "종회", null, 0, null, 88, 62, 93, 0, 160, 300, null, null],
+        [0, "장간", null, 0, null, 19, 6, 66, 0, 160, 300, null, null],
+        [0, "장의거", null, 0, null, 71, 58, 59, 0, 160, 300, null, null],
+        [0, "장흠", null, 0, null, 78, 85, 54, 0, 160, 300, null, null],
+        [0, "위나라장제", null, 0, null, 62, 43, 85, 0, 160, 300, null, null],
+        [0, "초주", null, 0, null, 16, 3, 67, 0, 160, 300, null, null],
+        [0, "초촉", null, 0, null, 65, 76, 33, 0, 160, 300, null, null],
+        [0, "향총", null, 0, null, 76, 61, 77, 0, 160, 300, null, null],
+        [0, "종요", null, 0, null, 79, 24, 90, 0, 160, 300, null, null],
+        [0, "향랑", null, 0, null, 28, 18, 74, 0, 160, 300, null, null],
+        [0, "서영", null, 0, null, 92, 80, 62, 0, 160, 300, null, null],
+        [0, "제갈각", null, 0, null, 72, 47, 90, 0, 160, 300, null, null],
+        [0, "제갈근", null, 0, null, 75, 34, 85, 0, 160, 300, null, null],
+        [0, "제갈균", null, 0, null, 29, 25, 52, 0, 160, 300, null, null],
+        [0, "제갈탄", null, 0, null, 72, 72, 76, 0, 160, 300, null, null],
+        [0, "제갈량", null, 0, null, 98, 38, 100, 0, 160, 300, null, null],
+        [0, "서황", null, 0, null, 95, 94, 78, 0, 160, 300, null, null],
+        [0, "서서", null, 0, null, 85, 64, 93, 0, 160, 300, null, null],
+        [0, "서성", null, 0, null, 86, 81, 78, 0, 160, 300, null, null],
+        [0, "서막", null, 0, null, 55, 32, 68, 0, 160, 300, null, null],
+        [0, "신의", null, 0, null, 55, 59, 60, 0, 160, 300, null, null],
+        [0, "신탐", null, 0, null, 56, 62, 54, 0, 160, 300, null, null],
+        [0, "심배", null, 0, null, 80, 60, 84, 0, 160, 300, null, null],
+        [0, "신비", null, 0, null, 42, 24, 79, 0, 160, 300, null, null],
+        [0, "신평", null, 0, null, 69, 43, 77, 0, 160, 300, null, null],
+        [0, "진복", null, 0, null, 31, 7, 73, 0, 160, 300, null, null],
+        [0, "진랑", null, 0, null, 58, 70, 35, 0, 160, 300, null, null],
+        [0, "휴고", null, 0, null, 63, 71, 38, 0, 160, 300, null, null],
+        [0, "추단", null, 0, null, 61, 64, 34, 0, 160, 300, null, null],
+        [0, "성의", null, 0, null, 74, 72, 41, 0, 160, 300, null, null],
+        [0, "성공영", null, 0, null, 73, 71, 80, 0, 160, 300, null, null],
+        [0, "설종", null, 0, null, 34, 16, 73, 0, 160, 300, null, null],
+        [0, "단경", null, 0, null, 71, 68, 43, 0, 160, 300, null, null],
+        [0, "전종", null, 0, null, 78, 72, 75, 0, 160, 300, null, null],
+        [0, "조예", null, 0, null, 72, 52, 82, 0, 160, 300, null, null],
+        [0, "조휴", null, 0, null, 80, 78, 62, 0, 160, 300, null, null],
+        [0, "송헌", null, 0, null, 68, 77, 38, 0, 160, 300, null, null],
+        [0, "조앙", null, 0, null, 78, 67, 69, 0, 160, 300, null, null],
+        [0, "조홍", null, 0, null, 84, 77, 55, 0, 160, 300, null, null],
+        [0, "조순", null, 0, null, 85, 81, 63, 0, 160, 300, null, null],
+        [0, "조창", null, 0, null, 86, 91, 40, 0, 160, 300, null, null],
+        [0, "조식", null, 0, null, 45, 22, 86, 0, 160, 300, null, null],
+        [0, "조진", null, 0, null, 86, 74, 70, 0, 160, 300, null, null],
+        [0, "조인", null, 0, null, 94, 89, 72, 0, 160, 300, null, null],
+        [0, "조성", null, 0, null, 54, 74, 38, 0, 160, 300, null, null],
+        [0, "조조", null, 0, null, 100, 72, 94, 0, 160, 300, null, null, "미망인이 더 매력적이란 말이야... 후후"],
+        [0, "조충", null, 0, null, 43, 21, 74, 0, 160, 300, null, null],
+        [0, "장패", null, 0, null, 78, 86, 53, 0, 160, 300, null, null],
+        [0, "조비", null, 0, null, 75, 71, 87, 0, 160, 300, null, null, "새로운 왕조를 열겠다..."],
+        [0, "조표", null, 0, null, 54, 69, 32, 0, 160, 300, null, null],
+        [0, "저수", null, 0, null, 85, 46, 95, 0, 160, 300, null, null],
+        [0, "소비", null, 0, null, 69, 63, 66, 0, 160, 300, null, null],
+        [0, "조무", null, 0, null, 70, 71, 66, 0, 160, 300, null, null],
+        [0, "손환", null, 0, null, 82, 73, 76, 0, 160, 300, null, null],
+        [0, "손견", null, 0, null, 94, 95, 79, 0, 160, 300, null, null, "강동의 호랑이, 손문대다!"],
+        [0, "손건", null, 0, null, 44, 33, 79, 0, 160, 300, null, null],
+        [0, "손권", null, 0, null, 84, 73, 80, 0, 160, 300, null, null],
+        [0, "손교", null, 0, null, 77, 72, 67, 0, 160, 300, null, null],
+        [0, "손책", null, 0, null, 93, 94, 74, 0, 160, 300, null, null],
+        [0, "손소", null, 0, null, 82, 79, 76, 0, 160, 300, null, null],
+        [0, "손정", null, 0, null, 66, 53, 73, 0, 160, 300, null, null],
+        [0, "손중", null, 0, null, 62, 71, 36, 0, 160, 300, null, null],
+        [0, "손등", null, 0, null, 62, 37, 79, 0, 160, 300, null, null],
+        [0, "손유", null, 0, null, 77, 70, 68, 0, 160, 300, null, null],
+        [0, "손익", null, 0, null, 67, 83, 27, 0, 160, 300, null, null],
+        [0, "손례", null, 0, null, 78, 81, 67, 0, 160, 300, null, null],
+        [0, "태사자", null, 0, null, 93, 94, 72, 0, 160, 300, null, null],
+        [0, "대래동주", null, 0, null, 51, 53, 54, 0, 160, 300, null, null],
+        [0, "대릉", null, 0, null, 70, 75, 39, 0, 160, 300, null, null],
+        [0, "타사대왕", null, 0, null, 62, 59, 70, 0, 160, 300, null, null],
+        [0, "담웅", null, 0, null, 58, 73, 14, 0, 160, 300, null, null],
+        [0, "장윤", null, 0, null, 72, 67, 42, 0, 160, 300, null, null],
+        [0, "조운", null, 0, null, 89, 96, 75, 0, 160, 300, null, null, "상산의 조운 자룡, 길을 뚫겠다!"],
+        [0, "장위", null, 0, null, 74, 66, 45, 0, 160, 300, null, null],
+        [0, "장영", null, 0, null, 75, 74, 41, 0, 160, 300, null, null],
+        [0, "장연", null, 0, null, 76, 81, 57, 0, 160, 300, null, null],
+        [0, "장횡", null, 0, null, 59, 70, 23, 0, 160, 300, null, null],
+        [0, "장온", null, 0, null, 32, 10, 72, 0, 160, 300, null, null],
+        [0, "장개", null, 0, null, 34, 66, 8, 0, 160, 300, null, null],
+        [0, "장각", null, 0, null, 87, 35, 90, 0, 160, 300, null, null],
+        [0, "장기", null, 0, null, 74, 35, 76, 0, 160, 300, null, null],
+        [0, "장의", null, 0, null, 79, 72, 75, 0, 160, 300, null, null],
+        [0, "장훈", null, 0, null, 72, 68, 41, 0, 160, 300, null, null],
+        [0, "장굉", null, 0, null, 24, 22, 86, 0, 160, 300, null, null],
+        [0, "장합", null, 0, null, 92, 89, 73, 0, 160, 300, null, null],
+        [0, "조홍2", null, 0, null, 66, 72, 28, 0, 160, 300, null, null],
+        [0, "장제2", null, 0, null, 70, 66, 55, 0, 160, 300, null, null],
+        [0, "장수", null, 0, null, 80, 73, 64, 0, 160, 300, null, null],
+        [0, "장소", null, 0, null, 41, 13, 87, 0, 160, 300, null, null],
+        [0, "장송", null, 0, null, 40, 6, 85, 0, 160, 300, null, null],
+        [0, "장임", null, 0, null, 85, 84, 78, 0, 160, 300, null, null],
+        [0, "장제", null, 0, null, 67, 43, 80, 0, 160, 300, null, null],
+        [0, "장막", null, 0, null, 52, 53, 71, 0, 160, 300, null, null],
+        [0, "조범", null, 0, null, 28, 21, 32, 0, 160, 300, null, null],
+        [0, "장비", null, 0, null, 87, 98, 52, 0, 160, 300, null, null, "만인적 연인 장비가 왔다 목숨을 내놓거라!"],
+        [0, "장포", null, 0, null, 78, 84, 48, 0, 160, 300, null, null],
+        [0, "장보", null, 0, null, 83, 71, 81, 0, 160, 300, null, null],
+        [0, "장만성", null, 0, null, 75, 81, 45, 0, 160, 300, null, null],
+        [0, "장양", null, 0, null, 72, 70, 66, 0, 160, 300, null, null],
+        [0, "장익", null, 0, null, 75, 74, 76, 0, 160, 300, null, null],
+        [0, "장료", null, 0, null, 95, 94, 78, 0, 160, 300, null, null],
+        [0, "장량", null, 0, null, 78, 80, 74, 0, 160, 300, null, null],
+        [0, "조루", null, 0, null, 70, 43, 68, 0, 160, 300, null, null],
+        [0, "장로", null, 0, null, 65, 42, 81, 0, 160, 300, null, null],
+        [0, "진횡", null, 0, null, 64, 63, 26, 0, 160, 300, null, null],
+        [0, "진응", null, 0, null, 62, 72, 45, 0, 160, 300, null, null],
+        [0, "진기", null, 0, null, 58, 65, 43, 0, 160, 300, null, null],
+        [0, "진궁", null, 0, null, 84, 55, 90, 0, 160, 300, null, null],
+        [0, "진교", null, 0, null, 61, 27, 77, 0, 160, 300, null, null],
+        [0, "진군", null, 0, null, 32, 14, 75, 0, 160, 300, null, null],
+        [0, "진규", null, 0, null, 30, 4, 82, 0, 160, 300, null, null],
+        [0, "진식", null, 0, null, 70, 71, 25, 0, 160, 300, null, null],
+        [0, "진진", null, 0, null, 46, 46, 69, 0, 160, 300, null, null],
+        [0, "진태", null, 0, null, 86, 77, 89, 0, 160, 300, null, null],
+        [0, "진등", null, 0, null, 79, 64, 81, 0, 160, 300, null, null],
+        [0, "진도", null, 0, null, 82, 78, 67, 0, 160, 300, null, null],
+        [0, "진무", null, 0, null, 76, 87, 43, 0, 160, 300, null, null],
+        [0, "진란", null, 0, null, 66, 69, 40, 0, 160, 300, null, null],
+        [0, "진림", null, 0, null, 25, 9, 75, 0, 160, 300, null, null],
+        [0, "정욱", null, 0, null, 76, 49, 94, 0, 160, 300, null, null],
+        [0, "정원지", null, 0, null, 69, 74, 17, 0, 160, 300, null, null],
+        [0, "정은", null, 0, null, 69, 73, 40, 0, 160, 300, null, null],
+        [0, "정원", null, 0, null, 70, 76, 35, 0, 160, 300, null, null],
+        [0, "정보", null, 0, null, 84, 79, 79, 0, 160, 300, null, null],
+        [0, "정봉", null, 0, null, 81, 92, 75, 0, 160, 300, null, null],
+        [0, "전위", null, 0, null, 79, 98, 42, 0, 160, 300, null, null],
+        [0, "전해", null, 0, null, 68, 65, 58, 0, 160, 300, null, null],
+        [0, "전주", null, 0, null, 66, 66, 73, 0, 160, 300, null, null],
+        [0, "전풍", null, 0, null, 82, 43, 96, 0, 160, 300, null, null],
+        [0, "전예", null, 0, null, 90, 85, 86, 0, 160, 300, null, null],
+        [0, "동윤", null, 0, null, 47, 28, 79, 0, 160, 300, null, null],
+        [0, "동화", null, 0, null, 57, 34, 75, 0, 160, 300, null, null],
+        [0, "등애", null, 0, null, 93, 82, 92, 0, 160, 300, null, null],
+        [0, "도겸", null, 0, null, 51, 27, 64, 0, 160, 300, null, null],
+        [0, "등현", null, 0, null, 61, 73, 45, 0, 160, 300, null, null],
+        [0, "등지", null, 0, null, 73, 52, 81, 0, 160, 300, null, null],
+        [0, "동습", null, 0, null, 72, 85, 50, 0, 160, 300, null, null],
+        [0, "동승", null, 0, null, 56, 53, 65, 0, 160, 300, null, null],
+        [0, "동소", null, 0, null, 34, 25, 80, 0, 160, 300, null, null],
+        [0, "동탁", null, 0, null, 91, 87, 72, 0, 160, 300, null, null],
+        [0, "동도나", null, 0, null, 68, 73, 31, 0, 160, 300, null, null],
+        [0, "동민", null, 0, null, 49, 60, 25, 0, 160, 300, null, null],
+        [0, "등무", null, 0, null, 61, 75, 29, 0, 160, 300, null, null],
+        [0, "두기", null, 0, null, 74, 43, 78, 0, 160, 300, null, null],
+        [0, "두예", null, 0, null, 94, 63, 91, 0, 160, 300, null, null],
+        [0, "배원소", null, 0, null, 49, 65, 25, 0, 160, 300, null, null],
+        [0, "마완", null, 0, null, 71, 74, 16, 0, 160, 300, null, null],
+        [0, "마휴", null, 0, null, 68, 73, 48, 0, 160, 300, null, null],
+        [0, "파재", null, 0, null, 74, 74, 55, 0, 160, 300, null, null],
+        [0, "마준", null, 0, null, 38, 52, 31, 0, 160, 300, null, null],
+        [0, "마속", null, 0, null, 61, 67, 84, 0, 160, 300, null, null],
+        [0, "마대", null, 0, null, 79, 85, 62, 0, 160, 300, null, null],
+        [0, "마충", null, 0, null, 78, 72, 68, 0, 160, 300, null, null],
+        [0, "마초", null, 0, null, 86, 97, 44, 0, 160, 300, null, null, "서량의 금마초 나가신다!"],
+        [0, "마철", null, 0, null, 70, 62, 58, 0, 160, 300, null, null],
+        [0, "마등", null, 0, null, 85, 80, 52, 0, 160, 300, null, null],
+        [0, "마량", null, 0, null, 53, 23, 85, 0, 160, 300, null, null],
+        [0, "반준", null, 0, null, 61, 46, 82, 0, 160, 300, null, null],
+        [0, "반장", null, 0, null, 76, 80, 69, 0, 160, 300, null, null],
+        [0, "번조", null, 0, null, 66, 73, 31, 0, 160, 300, null, null],
+        [0, "번능", null, 0, null, 69, 61, 36, 0, 160, 300, null, null],
+        [0, "반봉", null, 0, null, 56, 77, 4, 0, 160, 300, null, null],
+        [0, "비의", null, 0, null, 82, 56, 88, 0, 160, 300, null, null],
+        [0, "비연", null, 0, null, 60, 66, 21, 0, 160, 300, null, null],
+        [0, "비시", null, 0, null, 18, 28, 65, 0, 160, 300, null, null],
+        [0, "미축", null, 0, null, 33, 29, 78, 0, 160, 300, null, null],
+        [0, "미방", null, 0, null, 54, 61, 32, 0, 160, 300, null, null],
+        [0, "비요", null, 0, null, 70, 66, 73, 0, 160, 300, null, null],
+        [0, "무안국", null, 0, null, 70, 79, 34, 0, 160, 300, null, null],
+        [0, "풍습", null, 0, null, 72, 71, 39, 0, 160, 300, null, null],
+        [0, "부사인", null, 0, null, 46, 63, 37, 0, 160, 300, null, null],
+        [0, "부첨", null, 0, null, 73, 85, 76, 0, 160, 300, null, null],
+        [0, "부손", null, 0, null, 29, 13, 70, 0, 160, 300, null, null],
+        [0, "문앙", null, 0, null, 76, 96, 65, 0, 160, 300, null, null],
+        [0, "문흠", null, 0, null, 74, 80, 43, 0, 160, 300, null, null],
+        [0, "문추", null, 0, null, 87, 95, 49, 0, 160, 300, null, null],
+        [0, "문빙", null, 0, null, 88, 85, 69, 0, 160, 300, null, null],
+        [0, "변희", null, 0, null, 56, 70, 62, 0, 160, 300, null, null],
+        [0, "망아장", null, 0, null, 45, 79, 3, 0, 160, 300, null, null],
+        [0, "봉기", null, 0, null, 56, 48, 84, 0, 160, 300, null, null],
+        [0, "방희", null, 0, null, 60, 38, 69, 0, 160, 300, null, null],
+        [0, "법정", null, 0, null, 82, 47, 94, 0, 160, 300, null, null],
+        [0, "방통", null, 0, null, 79, 34, 97, 0, 160, 300, null, null],
+        [0, "방덕", null, 0, null, 89, 94, 72, 0, 160, 300, null, null],
+        [0, "포륭", null, 0, null, 58, 76, 49, 0, 160, 300, null, null],
+        [0, "목순", null, 0, null, 52, 77, 11, 0, 160, 300, null, null],
+        [0, "목록대왕", null, 0, null, 65, 71, 39, 0, 160, 300, null, null],
+        [0, "보즐", null, 0, null, 83, 51, 84, 0, 160, 300, null, null],
+        [0, "만총", null, 0, null, 88, 64, 87, 0, 160, 300, null, null],
+        [0, "모개", null, 0, null, 63, 39, 60, 0, 160, 300, null, null],
+        [0, "맹획", null, 0, null, 81, 88, 42, 0, 160, 300, null, null],
+        [0, "맹체", null, 0, null, 75, 73, 75, 0, 160, 300, null, null],
+        [0, "맹우", null, 0, null, 50, 68, 22, 0, 160, 300, null, null],
+        [0, "유섭", null, 0, null, 62, 79, 24, 0, 160, 300, null, null],
+        [0, "양부", null, 0, null, 62, 68, 68, 0, 160, 300, null, null],
+        [0, "옹개", null, 0, null, 73, 75, 57, 0, 160, 300, null, null],
+        [0, "양의", null, 0, null, 68, 40, 82, 0, 160, 300, null, null],
+        [0, "양호", null, 0, null, 92, 69, 90, 0, 160, 300, null, null],
+        [0, "양홍", null, 0, null, 33, 15, 77, 0, 160, 300, null, null],
+        [0, "양앙", null, 0, null, 68, 72, 38, 0, 160, 300, null, null],
+        [0, "양추", null, 0, null, 52, 65, 40, 0, 160, 300, null, null],
+        [0, "양수", null, 0, null, 46, 23, 83, 0, 160, 300, null, null],
+        [0, "양추2", null, 0, null, 67, 64, 60, 0, 160, 300, null, null],
+        [0, "양송", null, 0, null, 17, 5, 28, 0, 160, 300, null, null],
+        [0, "양임", null, 0, null, 70, 78, 56, 0, 160, 300, null, null],
+        [0, "양조", null, 0, null, 53, 61, 36, 0, 160, 300, null, null],
+        [0, "양백", null, 0, null, 44, 45, 19, 0, 160, 300, null, null],
+        [0, "양부2", null, 0, null, 67, 50, 83, 0, 160, 300, null, null],
+        [0, "양봉", null, 0, null, 66, 65, 31, 0, 160, 300, null, null],
+        [0, "양봉2", null, 0, null, 54, 62, 53, 0, 160, 300, null, null],
+        [0, "뇌동", null, 0, null, 69, 78, 51, 0, 160, 300, null, null],
+        [0, "뇌박", null, 0, null, 62, 70, 36, 0, 160, 300, null, null],
+        [0, "이이", null, 0, null, 63, 77, 19, 0, 160, 300, null, null],
+        [0, "이회", null, 0, null, 79, 65, 79, 0, 160, 300, null, null],
+        [0, "이각", null, 0, null, 69, 72, 24, 0, 160, 300, null, null],
+        [0, "육항", null, 0, null, 93, 63, 92, 0, 160, 300, null, null],
+        [0, "육적", null, 0, null, 20, 7, 72, 0, 160, 300, null, null],
+        [0, "육손", null, 0, null, 95, 71, 96, 0, 160, 300, null, null],
+        [0, "이엄", null, 0, null, 83, 84, 76, 0, 160, 300, null, null],
+        [0, "이유", null, 0, null, 61, 26, 93, 0, 160, 300, null, null],
+        [0, "이숙", null, 0, null, 46, 69, 61, 0, 160, 300, null, null],
+        [0, "이통", null, 0, null, 73, 81, 62, 0, 160, 300, null, null],
+        [0, "이전", null, 0, null, 78, 80, 79, 0, 160, 300, null, null],
+        [0, "이풍", null, 0, null, 69, 74, 50, 0, 160, 300, null, null],
+        [0, "유언", null, 0, null, 61, 38, 80, 0, 160, 300, null, null],
+        [0, "유괴", null, 0, null, 71, 73, 67, 0, 160, 300, null, null],
+        [0, "유기", null, 0, null, 52, 12, 63, 0, 160, 300, null, null],
+        [0, "유우", null, 0, null, 62, 33, 75, 0, 160, 300, null, null],
+        [0, "유훈", null, 0, null, 47, 63, 35, 0, 160, 300, null, null],
+        [0, "유현", null, 0, null, 54, 66, 51, 0, 160, 300, null, null],
+        [0, "유순", null, 0, null, 63, 46, 41, 0, 160, 300, null, null],
+        [0, "유장", null, 0, null, 31, 5, 34, 0, 160, 300, null, null],
+        [0, "유심", null, 0, null, 60, 62, 70, 0, 160, 300, null, null],
+        [0, "유선", null, 0, null, 3, 5, 9, 0, 160, 300, null, null],
+        [0, "유종", null, 0, null, 24, 22, 65, 0, 160, 300, null, null],
+        [0, "유도", null, 0, null, 25, 23, 26, 0, 160, 300, null, null],
+        [0, "유파", null, 0, null, 29, 22, 75, 0, 160, 300, null, null],
+        [0, "유반", null, 0, null, 69, 76, 47, 0, 160, 300, null, null],
+        [0, "유비", null, 0, null, 87, 78, 75, 0, 160, 300, null, null, "한왕실은 중산정왕의 후손인 내가 이어받겠다...!"],
+        [0, "유표", null, 0, null, 48, 31, 72, 0, 160, 300, null, null],
+        [0, "유복", null, 0, null, 64, 49, 74, 0, 160, 300, null, null],
+        [0, "유벽", null, 0, null, 70, 72, 47, 0, 160, 300, null, null],
+        [0, "유봉", null, 0, null, 75, 79, 44, 0, 160, 300, null, null],
+        [0, "유엽", null, 0, null, 56, 32, 92, 0, 160, 300, null, null],
+        [0, "유요", null, 0, null, 62, 67, 46, 0, 160, 300, null, null],
+        [0, "여위황", null, 0, null, 58, 63, 29, 0, 160, 300, null, null],
+        [0, "요화", null, 0, null, 73, 76, 69, 0, 160, 300, null, null],
+        [0, "양흥", null, 0, null, 61, 65, 19, 0, 160, 300, null, null],
+        [0, "양습", null, 0, null, 73, 40, 74, 0, 160, 300, null, null],
+        [0, "양서", null, 0, null, 56, 62, 66, 0, 160, 300, null, null],
+        [0, "능조", null, 0, null, 75, 81, 42, 0, 160, 300, null, null],
+        [0, "능통", null, 0, null, 83, 89, 60, 0, 160, 300, null, null],
+        [0, "여개", null, 0, null, 53, 30, 67, 0, 160, 300, null, null],
+        [0, "여건", null, 0, null, 57, 70, 62, 0, 160, 300, null, null],
+        [0, "여광", null, 0, null, 56, 70, 13, 0, 160, 300, null, null],
+        [0, "여상", null, 0, null, 54, 71, 12, 0, 160, 300, null, null],
+        [0, "여대", null, 0, null, 80, 71, 70, 0, 160, 300, null, null],
+        [0, "여범", null, 0, null, 73, 63, 75, 0, 160, 300, null, null],
+        [0, "여포", null, 0, null, 88, 100, 36, 0, 160, 300, null, null, "다 덤비거라! 하하하하"],
+        [0, "여몽", null, 0, null, 91, 81, 90, 0, 160, 300, null, null],
+        [0, "윤직", null, 0, null, 46, 42, 73, 0, 160, 300, null, null],
+        [0, "냉포", null, 0, null, 71, 82, 61, 0, 160, 300, null, null],
+        [0, "누규", null, 0, null, 52, 13, 87, 0, 160, 300, null, null],
+        [0, "노숙", null, 0, null, 89, 56, 93, 0, 160, 300, null, null],
+        [0, "노식", null, 0, null, 86, 63, 82, 0, 160, 300, null, null],
+        [0, "범강", null, 0, null, 49, 50, 36, 0, 160, 300, null, null],
+        [0, "장달", null, 0, null, 43, 56, 34, 0, 160, 300, null, null],
+        [0, "규람", null, 0, null, 55, 70, 58, 0, 160, 300, null, null],
+        [0, "대원", null, 0, null, 38, 32, 68, 0, 160, 300, null, null],
+        [0, "왕기", null, 0, null, 81, 72, 86, 0, 160, 300, null, null],
+        [0, "왕상", null, 0, null, 23, 19, 68, 0, 160, 300, null, null],
+        [0, "왕돈", null, 0, null, 60, 66, 46, 0, 160, 300, null, null],
+        [0, "악침", null, 0, null, 73, 75, 43, 0, 160, 300, null, null],
+        [0, "하제", null, 0, null, 83, 70, 82, 0, 160, 300, null, null],
+        [0, "환범", null, 0, null, 40, 11, 78, 0, 160, 300, null, null],
+        [0, "견초", null, 0, null, 72, 79, 73, 0, 160, 300, null, null],
+        [0, "고당륭", null, 0, null, 35, 24, 76, 0, 160, 300, null, null],
+        [0, "오찬", null, 0, null, 68, 41, 78, 0, 160, 300, null, null],
+        [0, "호질", null, 0, null, 73, 46, 74, 0, 160, 300, null, null],
+        [0, "오질", null, 0, null, 16, 29, 68, 0, 160, 300, null, null],
+        [0, "호준", null, 0, null, 79, 76, 62, 0, 160, 300, null, null],
+        [0, "고담", null, 0, null, 53, 23, 77, 0, 160, 300, null, null],
+        [0, "최림", null, 0, null, 32, 22, 66, 0, 160, 300, null, null],
+        [0, "사마망", null, 0, null, 78, 58, 83, 0, 160, 300, null, null],
+        [0, "주이", null, 0, null, 70, 73, 61, 0, 160, 300, null, null],
+        [0, "전단", null, 0, null, 67, 64, 39, 0, 160, 300, null, null],
+        [0, "조우", null, 0, null, 50, 43, 37, 0, 160, 300, null, null],
+        [0, "조상", null, 0, null, 39, 33, 30, 0, 160, 300, null, null],
+        [0, "조방", null, 0, null, 20, 14, 27, 0, 160, 300, null, null],
+        [0, "태사향", null, 0, null, 57, 66, 48, 0, 160, 300, null, null],
+        [0, "장휴", null, 0, null, 63, 27, 74, 0, 160, 300, null, null],
+        [0, "장호", null, 0, null, 75, 74, 51, 0, 160, 300, null, null],
+        [0, "조광", null, 0, null, 67, 71, 53, 0, 160, 300, null, null],
+        [0, "장집", null, 0, null, 76, 29, 80, 0, 160, 300, null, null],
+        [0, "장승", null, 0, null, 77, 70, 75, 0, 160, 300, null, null],
+        [0, "장소2", null, 0, null, 23, 56, 31, 0, 160, 300, null, null],
+        [0, "조통", null, 0, null, 68, 67, 61, 0, 160, 300, null, null],
+        [0, "진표", null, 0, null, 66, 42, 74, 0, 160, 300, null, null],
+        [0, "정무", null, 0, null, 56, 35, 75, 0, 160, 300, null, null],
+        [0, "정봉2", null, 0, null, 66, 66, 53, 0, 160, 300, null, null],
+        [0, "전만", null, 0, null, 51, 73, 39, 0, 160, 300, null, null],
+        [0, "마균", null, 0, null, 22, 17, 71, 0, 160, 300, null, null],
+        [0, "방회", null, 0, null, 69, 75, 49, 0, 160, 300, null, null],
+        [0, "낙통", null, 0, null, 76, 58, 75, 0, 160, 300, null, null],
+        [0, "육개", null, 0, null, 65, 61, 79, 0, 160, 300, null, null],
+        [0, "유찬", null, 0, null, 78, 81, 64, 0, 160, 300, null, null],
+        [0, "유소", null, 0, null, 68, 53, 74, 0, 160, 300, null, null],
+        [0, "요립", null, 0, null, 32, 15, 76, 0, 160, 300, null, null],
+        [0, "여거", null, 0, null, 78, 69, 71, 0, 160, 300, null, null],
+        [0, "제갈첨", null, 0, null, 70, 57, 76, 0, 160, 300, null, null],
+        [0, "손휴", null, 0, null, 57, 42, 78, 0, 160, 300, null, null],
+        [0, "극정", null, 0, null, 42, 23, 68, 0, 160, 300, null, null],
+        [0, "호분", null, 0, null, 71, 76, 50, 0, 160, 300, null, null],
+        [0, "손량", null, 0, null, 32, 26, 70, 0, 160, 300, null, null],
+        [0, "마막", null, 0, null, 34, 12, 44, 0, 160, 300, null, null],
+        [0, "손호", null, 0, null, 41, 73, 71, 0, 160, 300, null, null],
+        [0, "조모", null, 0, null, 54, 61, 59, 0, 160, 300, null, null],
+        [0, "조환", null, 0, null, 30, 28, 30, 0, 160, 300, null, null],
+        [0, "사마유", null, 0, null, 71, 68, 75, 0, 160, 300, null, null],
+        [0, "제갈상", null, 0, null, 64, 79, 62, 0, 160, 300, null, null],
+        [0, "손화", null, 0, null, 31, 39, 68, 0, 160, 300, null, null],
+        [0, "염우", null, 0, null, 52, 61, 51, 0, 160, 300, null, null],
+        [0, "왕경", null, 0, null, 67, 63, 71, 0, 160, 300, null, null],
+        [0, "왕혼", null, 0, null, 74, 71, 63, 0, 160, 300, null, null],
+        [0, "곽혁", null, 0, null, 33, 29, 70, 0, 160, 300, null, null],
+        [0, "가범", null, 0, null, 60, 62, 73, 0, 160, 300, null, null],
+        [0, "서질", null, 0, null, 68, 83, 24, 0, 160, 300, null, null],
+        [0, "손준", null, 0, null, 64, 70, 65, 0, 160, 300, null, null],
+        [0, "손침", null, 0, null, 58, 55, 65, 0, 160, 300, null, null],
+        [0, "우사", null, 0, null, 61, 34, 74, 0, 160, 300, null, null],
+        [0, "진건", null, 0, null, 72, 71, 65, 0, 160, 300, null, null],
+        [0, "동궐", null, 0, null, 65, 59, 76, 0, 160, 300, null, null],
+        [0, "당자", null, 0, null, 61, 71, 50, 0, 160, 300, null, null],
+        [0, "등충", null, 0, null, 76, 80, 69, 0, 160, 300, null, null],
+        [0, "황숭", null, 0, null, 67, 63, 72, 0, 160, 300, null, null],
+        [0, "화핵", null, 0, null, 20, 24, 71, 0, 160, 300, null, null],
+        [0, "허의", null, 0, null, 51, 74, 15, 0, 160, 300, null, null],
+        [0, "송겸", null, 0, null, 66, 78, 42, 0, 160, 300, null, null],
+        [0, "호제", null, 0, null, 57, 39, 68, 0, 160, 300, null, null],
+        [0, "나헌", null, 0, null, 86, 70, 82, 0, 160, 300, null, null],
+        [0, "노숙2", null, 0, null, 73, 53, 74, 0, 160, 300, null, null],
+        [0, "구성", null, 0, null, 63, 70, 38, 0, 160, 300, null, null],
+        [0, "어부라", null, 0, null, 72, 68, 21, 0, 160, 300, null, null],
+        [0, "아하소과", null, 0, null, 61, 76, 13, 0, 160, 300, null, null],
+        [0, "가비능", null, 0, null, 77, 69, 52, 0, 160, 300, null, null],
+        [0, "구력거", null, 0, null, 80, 68, 56, 0, 160, 300, null, null],
+        [0, "강단", null, 0, null, 65, 83, 48, 0, 160, 300, null, null],
+        [0, "황란", null, 0, null, 63, 75, 44, 0, 160, 300, null, null],
+        [0, "호주천", null, 0, null, 70, 71, 40, 0, 160, 300, null, null],
+        [0, "종리목", null, 0, null, 84, 72, 82, 0, 160, 300, null, null],
+        [0, "제갈교", null, 0, null, 62, 27, 75, 0, 160, 300, null, null],
+        [0, "답돈", null, 0, null, 84, 82, 61, 0, 160, 300, null, null],
+        [0, "반임", null, 0, null, 66, 79, 38, 0, 160, 300, null, null],
+        [0, "보도근", null, 0, null, 64, 73, 50, 0, 160, 300, null, null],
+        [0, "미당대왕", null, 0, null, 59, 69, 21, 0, 160, 300, null, null],
+        [0, "유표2", null, 0, null, 73, 74, 48, 0, 160, 300, null, null],
+        [0, "루반", null, 0, null, 65, 76, 39, 0, 160, 300, null, null],
+        [0, "손관", null, 0, null, 72, 78, 51, 0, 160, 300, null, null],
+        [0, "곽석", null, 0, null, 59, 71, 48, 0, 160, 300, null, null],
+        [0, "주조", null, 0, null, 63, 68, 26, 0, 160, 300, null, null],
+        [0, "장거", null, 0, null, 79, 75, 56, 0, 160, 300, null, null],
+        [0, "장순", null, 0, null, 73, 81, 60, 0, 160, 300, null, null],
+        [0, "철리길", null, 0, null, 77, 70, 52, 0, 160, 300, null, null],
+        [0, "주삭", null, 0, null, 54, 60, 50, 0, 160, 300, null, null],
+        [0, "황월영", null, 0, null, 46, 33, 78, 0, 160, 300, null, null],
+        [0, "채염", null, 0, null, 42, 26, 82, 0, 160, 300, null, null],
+        [0, "소교", null, 0, null, 23, 15, 78, 0, 160, 300, null, null],
+        [0, "신헌영", null, 0, null, 65, 35, 90, 0, 160, 300, null, null, "내가 남자로 태어났더라면..."],
+        [0, "손상향", null, 0, null, 75, 79, 55, 0, 160, 300, null, null],
+        [0, "대교", null, 0, null, 22, 30, 78, 0, 160, 300, null, null],
+        [0, "초선", null, 0, null, 12, 22, 71, 0, 160, 300, null, null],
+        [0, "교모", null, 0, null, 54, 45, 69, 0, 160, 300, null, null],
+        [0, "관구수", null, 0, null, 58, 62, 33, 0, 160, 300, null, null],
+        [0, "관구전", null, 0, null, 63, 60, 69, 0, 160, 300, null, null],
+        [0, "원유", null, 0, null, 56, 40, 73, 0, 160, 300, null, null],
+        [0, "왕광", null, 0, null, 65, 55, 61, 0, 160, 300, null, null],
+        [0, "신창", null, 0, null, 50, 26, 42, 0, 160, 300, null, null],
+        [0, "사마주", null, 0, null, 61, 52, 61, 0, 160, 300, null, null],
+        [0, "양제", null, 0, null, 67, 68, 71, 0, 160, 300, null, null],
+        [0, "성만", null, 0, null, 61, 68, 66, 0, 160, 300, null, null],
+        [0, "오연", null, 0, null, 66, 73, 42, 0, 160, 300, null, null],
+        [0, "맹충", null, 0, null, 47, 28, 72, 0, 160, 300, null, null],
+        [0, "잠혼", null, 0, null, 1, 1, 22, 0, 160, 300, null, null],
+        [0, "사정", null, 0, null, 64, 76, 34, 0, 160, 300, null, null],
+        [0, "심영", null, 0, null, 70, 77, 61, 0, 160, 300, null, null],
+        [0, "도준", null, 0, null, 65, 66, 46, 0, 160, 300, null, null],
+        [0, "만욱", null, 0, null, 21, 25, 71, 0, 160, 300, null, null],
+        [0, "오언", null, 0, null, 76, 72, 77, 0, 160, 300, null, null],
+        [0, "위막", null, 0, null, 57, 62, 59, 0, 160, 300, null, null],
+        [0, "시삭", null, 0, null, 38, 65, 47, 0, 160, 300, null, null],
+        [0, "전속", null, 0, null, 47, 60, 55, 0, 160, 300, null, null],
+        [0, "장화", null, 0, null, 36, 27, 78, 0, 160, 300, null, null],
+        [0, "오거", null, 0, null, 49, 61, 23, 0, 160, 300, null, null],
+        [0, "추정", null, 0, null, 70, 64, 66, 0, 160, 300, null, null],
+        [0, "장특", null, 0, null, 73, 54, 75, 0, 160, 300, null, null],
+        [0, "곽마", null, 0, null, 68, 71, 47, 0, 160, 300, null, null],
+        [0, "석포", null, 0, null, 69, 71, 56, 0, 160, 300, null, null],
+        [0, "견홍", null, 0, null, 70, 74, 66, 0, 160, 300, null, null],
+        [0, "한거자", null, 0, null, 51, 59, 51, 0, 160, 300, null, null],
+        [0, "휴원진", null, 0, null, 52, 68, 45, 0, 160, 300, null, null],
+        [0, "곽원", null, 0, null, 66, 73, 36, 0, 160, 300, null, null],
+        [0, "계옹", null, 0, null, 63, 52, 41, 0, 160, 300, null, null],
+        [0, "이부", null, 0, null, 31, 36, 74, 0, 160, 300, null, null],
+        [0, "왕업", null, 0, null, 33, 6, 35, 0, 160, 300, null, null],
+        [0, "좌혁", null, 0, null, 62, 66, 51, 0, 160, 300, null, null],
+        [0, "화타", null, 0, null, 57, 25, 73, 0, 160, 300, null, null, "아픈 사람들 모두 내게 오시오~"],
+        [0, "사마휘", null, 0, null, 55, 26, 82, 0, 160, 300, null, null, "좋지 좋아~"],
+        [0, "우길", null, 0, null, 23, 15, 90, 0, 160, 300, null, null, "길조로다"],
+        [0, "헌제", null, 0, null, 22, 18, 68, 0, 160, 300, null, null, "한왕실은 정녕 여기서 끝이란 말인가.."],
+        [0, "백기", null, 0, null, 100, 88, 82, 0, 160, 300, null, null],
+        [0, "한신", null, 0, null, 100, 74, 94, 0, 160, 300, null, null],
+        [0, "악비", null, 0, null, 99, 91, 86, 0, 160, 300, null, null],
+        [0, "항적", null, 0, null, 98, 100, 65, 0, 160, 300, null, null, "내가 바로 초패왕 항우다!!"],
+        [0, "악의", null, 0, null, 98, 75, 93, 0, 160, 300, null, null],
+        [0, "영정", null, 0, null, 97, 55, 90, 0, 160, 300, null, null],
+        [0, "강상", null, 0, null, 95, 49, 100, 0, 160, 300, null, null],
+        [0, "제나라전단", null, 0, null, 96, 75, 95, 0, 160, 300, null, null],
+        [0, "이목", null, 0, null, 96, 78, 88, 0, 160, 300, null, null],
+        [0, "염파", null, 0, null, 95, 96, 75, 0, 160, 300, null, null],
+        [0, "왕전", null, 0, null, 94, 72, 83, 0, 160, 300, null, null],
+        [0, "오기", null, 0, null, 94, 66, 95, 0, 160, 300, null, null],
+        [0, "곽거병", null, 0, null, 93, 91, 53, 0, 160, 300, null, null],
+        [0, "영포", null, 0, null, 82, 91, 54, 0, 160, 300, null, null],
+        [0, "이신", null, 0, null, 81, 88, 63, 0, 160, 300, null, null],
+        [0, "몽념", null, 0, null, 87, 86, 71, 0, 160, 300, null, null],
+        [0, "제나라전기", null, 0, null, 80, 85, 44, 0, 160, 300, null, null],
+        [0, "극신", null, 0, null, 76, 83, 42, 0, 160, 300, null, null],
+        [0, "항연", null, 0, null, 89, 80, 77, 0, 160, 300, null, null],
+        [0, "인상여", null, 0, null, 69, 38, 96, 0, 160, 300, null, null],
+        [0, "장자방", null, 0, null, 72, 40, 100, 0, 160, 300, null, null],
+        [0, "관이오", null, 0, null, 85, 64, 99, 0, 160, 300, null, null],
+        [0, "손빈", null, 0, null, 83, 22, 98, 0, 160, 300, null, null],
+        [0, "소진", null, 0, null, 90, 47, 96, 0, 160, 300, null, null],
+        [0, "범증", null, 0, null, 68, 24, 94, 0, 160, 300, null, null],
+        [0, "위나라장의", null, 0, null, 75, 23, 93, 0, 160, 300, null, null],
+        [0, "공구", null, 0, null, 68, 70, 91, 0, 160, 300, null, null],
+        [0, "소하", null, 0, null, 56, 27, 97, 0, 160, 300, null, null],
+        [0, "한비", null, 0, null, 49, 18, 97, 0, 160, 300, null, null],
+        [0, "이사", null, 0, null, 48, 24, 95, 0, 160, 300, null, null],
+        [0, "전문", null, 0, null, 79, 67, 89, 0, 160, 300, null, null],
+        [0, "황헐", null, 0, null, 81, 68, 88, 0, 160, 300, null, null],
+        [0, "방난", null, 0, null, 88, 95, 66, 0, 160, 300, null, null],
+        [0, "개섭", null, 0, null, 43, 97, 54, 0, 160, 300, null, null],
+        [0, "형가", null, 0, null, 42, 89, 43, 0, 160, 300, null, null],
+        [0, "유방", null, 0, null, 90, 75, 85, 0, 160, 300, null, null, "나는 사람을 쓰는 재주로 천하를 얻었다"],
+        [0, "하리", null, 0, null, 99, 99, 89, 0, 160, 300, null, null, "내 업적을 따라올 사람이 있을까?"],
+        [0, "헹이", null, 0, null, 97, 72, 90, 0, 160, 300, null, null, "맛있다 'ㅅ'"],
+        [0, "나나", null, 0, null, 96, 71, 86, 0, 160, 300, null, null, "이번 전쟁을 계산해보면 말이죠..."],
+        [0, "장임2", null, 0, null, 90, 87, 85, 0, 160, 300, null, null, "으리!"],
+        [0, "하야미", null, 0, null, 94, 85, 92, 0, 160, 300, null, null, "흑막이 되어볼까요"],
+        [0, "이시리스", null, 0, null, 96, 80, 94, 0, 160, 300, null, null],
+        [0, "연채홍", null, 0, null, 90, 81, 88, 0, 160, 300, null, null, "엄마도 천통할수 있다!"],
+        [0, "임사영", null, 0, null, 75, 75, 75, 0, 160, 300, null, null, "일반인 양민입니다"],
+        [0, "장군보", null, 0, null, 84, 90, 68, 0, 160, 300, null, null],
+        [0, "크렌스", null, 0, null, 92, 80, 76, 0, 160, 300, null, null],
+        [0, "콘", null, 0, null, 88, 96, 85, 0, 160, 300, null, null],
+        [0, "리즈나", null, 0, null, 93, 65, 75, 0, 160, 300, null, null, "내가 다 했다"],
+        [0, "오티누스", null, 0, null, 92, 89, 88, 0, 160, 300, null, null],
+        [0, "네시", null, 0, null, 87, 85, 92, 0, 160, 300, null, null, "안 자고 싸우면 이겨요"]
+    ],
+    "general_ex":[
+        [0, "복양흥", null, 0, null, 37, 32, 70, 0, 160, 300, null, null],
+        [0, "왕충", null, 0, null, 39, 57, 21, 0, 160, 300, null, null],
+        [0, "구건", null, 0, null, 39, 52, 65, 0, 160, 300, null, null],
+        [0, "등윤", null, 0, null, 29, 41, 71, 0, 160, 300, null, null],
+        [0, "국연", null, 0, null, 50, 19, 71, 0, 160, 300, null, null],
+        [0, "양흔", null, 0, null, 61, 68, 61, 0, 160, 300, null, null],
+        [0, "이감", null, 0, null, 58, 69, 33, 0, 160, 300, null, null],
+        [0, "마운록", null, 0, null, 72, 78, 53, 0, 160, 300, null, null],
+        [0, "황호", null, 0, null, 1, 1, 19, 0, 160, 300, null, null],
+        [0, "왕융", null, 0, null, 57, 36, 72, 0, 160, 300, null, null],
+        [0, "설영", null, 0, null, 49, 18, 64, 0, 160, 300, null, null],
+        [0, "설후", null, 0, null, 17, 15, 68, 0, 160, 300, null, null],
+        [0, "정의", null, 0, null, 15, 5, 64, 0, 160, 300, null, null],
+        [0, "누현", null, 0, null, 23, 22, 67, 0, 160, 300, null, null],
+        [0, "당빈", null, 0, null, 67, 74, 59, 0, 160, 300, null, null],
+        [0, "위풍", null, 0, null, 52, 23, 72, 0, 160, 300, null, null],
+        [0, "초이", null, 0, null, 62, 69, 63, 0, 160, 300, null, null],
+        [0, "장반", null, 0, null, 63, 73, 62, 0, 160, 300, null, null],
+        [0, "장구", null, 0, null, 69, 72, 44, 0, 160, 300, null, null],
+        [0, "보협", null, 0, null, 71, 49, 69, 0, 160, 300, null, null],
+        [0, "보천", null, 0, null, 71, 60, 71, 0, 160, 300, null, null],
+        [0, "번건", null, 0, null, 41, 24, 71, 0, 160, 300, null, null],
+        [0, "부융", null, 0, null, 66, 72, 46, 0, 160, 300, null, null],
+        [0, "사찬", null, 0, null, 60, 72, 54, 0, 160, 300, null, null],
+        [0, "당균", null, 0, null, 33, 24, 77, 0, 160, 300, null, null],
+        [0, "공주", null, 0, null, 26, 16, 68, 0, 160, 300, null, null],
+        [0, "소유", null, 0, null, 50, 59, 49, 0, 160, 300, null, null],
+        [0, "오강", null, 0, null, 48, 38, 65, 0, 160, 300, null, null],
+        [0, "정병", null, 0, null, 16, 15, 71, 0, 160, 300, null, null],
+        [0, "원요", null, 0, null, 41, 50, 41, 0, 160, 300, null, null],
+        [0, "하만", null, 0, null, 66, 77, 12, 0, 160, 300, null, null],
+        [0, "장빈", null, 0, null, 27, 23, 64, 0, 160, 300, null, null],
+        [0, "손이", null, 0, null, 69, 71, 55, 0, 160, 300, null, null],
+        [0, "손수", null, 0, null, 55, 51, 53, 0, 160, 300, null, null],
+        [0, "우전", null, 0, null, 64, 76, 40, 0, 160, 300, null, null],
+        [0, "손광", null, 0, null, 52, 46, 44, 0, 160, 300, null, null],
+        [0, "위소", null, 0, null, 16, 19, 65, 0, 160, 300, null, null],
+        [0, "전역", null, 0, null, 60, 63, 38, 0, 160, 300, null, null],
+        [0, "손기", null, 0, null, 60, 67, 51, 0, 160, 300, null, null],
+        [0, "전기", null, 0, null, 49, 69, 61, 0, 160, 300, null, null],
+        [0, "전상", null, 0, null, 2, 4, 12, 0, 160, 300, null, null],
+        [0, "유성", null, 0, null, 45, 65, 33, 0, 160, 300, null, null],
+        [0, "이성", null, 0, null, 12, 22, 61, 0, 160, 300, null, null],
+        [0, "양강", null, 0, null, 60, 69, 40, 0, 160, 300, null, null],
+        [0, "양령", null, 0, null, 57, 61, 21, 0, 160, 300, null, null],
+        [0, "부하", null, 0, null, 44, 35, 81, 0, 160, 300, null, null],
+        [0, "유화", null, 0, null, 21, 16, 59, 0, 160, 300, null, null],
+        [0, "포신", null, 0, null, 77, 67, 81, 0, 160, 300, null, null],
+        [0, "유대", null, 0, null, 53, 65, 32, 0, 160, 300, null, null],
+        [0, "문호", null, 0, null, 66, 72, 45, 0, 160, 300, null, null],
+        [0, "방열", null, 0, null, 68, 78, 44, 0, 160, 300, null, null],
+        [0, "배수", null, 0, null, 8, 9, 70, 0, 160, 300, null, null],
+        [0, "여령기", null, 0, null, 67, 79, 55, 0, 160, 300, null, null],
+        [0, "성렴", null, 0, null, 79, 78, 40, 0, 160, 300, null, null],
+        [0, "구본", null, 0, null, 50, 40, 67, 0, 160, 300, null, null],
+        [0, "영수", null, 0, null, 67, 69, 72, 0, 160, 300, null, null],
+        [0, "호열", null, 0, null, 73, 67, 72, 0, 160, 300, null, null],
+        [0, "최염", null, 0, null, 42, 55, 70, 0, 160, 300, null, null],
+        [0, "차주", null, 0, null, 49, 49, 40, 0, 160, 300, null, null],
+        [0, "제갈정", null, 0, null, 58, 63, 66, 0, 160, 300, null, null],
+        [0, "제갈서", null, 0, null, 41, 40, 29, 0, 160, 300, null, null],
+        [0, "장서", null, 0, null, 55, 76, 35, 0, 160, 300, null, null],
+        [0, "유략", null, 0, null, 71, 66, 59, 0, 160, 300, null, null],
+        [0, "동조", null, 0, null, 17, 13, 56, 0, 160, 300, null, null],
+        [0, "유평", null, 0, null, 70, 71, 68, 0, 160, 300, null, null],
+        [0, "경무", null, 0, null, 21, 34, 53, 0, 160, 300, null, null],
+        [0, "민순", null, 0, null, 42, 41, 61, 0, 160, 300, null, null],
+        [0, "유준", null, 0, null, 65, 67, 42, 0, 160, 300, null, null],
+        [0, "마한", null, 0, null, 62, 69, 41, 0, 160, 300, null, null],
+        [0, "설례", null, 0, null, 31, 42, 71, 0, 160, 300, null, null],
+        [0, "우미", null, 0, null, 62, 61, 28, 0, 160, 300, null, null],
+        [0, "여공", null, 0, null, 74, 65, 38, 0, 160, 300, null, null],
+        [0, "진생", null, 0, null, 59, 55, 44, 0, 160, 300, null, null],
+        [0, "허사", null, 0, null, 27, 23, 78, 0, 160, 300, null, null],
+        [0, "왕해", null, 0, null, 22, 11, 75, 0, 160, 300, null, null],
+        [0, "양표", null, 0, null, 20, 17, 74, 0, 160, 300, null, null],
+        [0, "채옹", null, 0, null, 21, 16, 76, 0, 160, 300, null, null],
+        [0, "송과", null, 0, null, 61, 56, 48, 0, 160, 300, null, null],
+        [0, "왕방", null, 0, null, 62, 57, 41, 0, 160, 300, null, null],
+        [0, "이몽", null, 0, null, 58, 65, 47, 0, 160, 300, null, null],
+        [0, "최용", null, 0, null, 64, 67, 43, 0, 160, 300, null, null],
+        [0, "복호적아", null, 0, null, 61, 65, 36, 0, 160, 300, null, null],
+        [0, "동백", null, 0, null, 76, 55, 86, 0, 160, 300, null, null],
+        [0, "석도", null, 0, null, 62, 32, 82, 0, 160, 300, null, null],
+        [0, "맹건", null, 0, null, 73, 31, 80, 0, 160, 300, null, null],
+        [0, "공손수", null, 0, null, 66, 56, 47, 0, 160, 300, null, null],
+        [0, "유보", null, 0, null, 42, 32, 61, 0, 160, 300, null, null],
+        [0, "장환", null, 0, null, 81, 79, 44, 0, 160, 300, null, null],
+        [0, "이명", null, 0, null, 77, 74, 41, 0, 160, 300, null, null],
+        [0, "유식", null, 0, null, 42, 23, 72, 0, 160, 300, null, null],
+        [0, "이붕", null, 0, null, 62, 70, 38, 0, 160, 300, null, null],
+        [0, "전장", null, 0, null, 66, 64, 42, 0, 160, 300, null, null],
+        [0, "진준", null, 0, null, 67, 65, 69, 0, 160, 300, null, null],
+        [0, "황보개", null, 0, null, 62, 62, 70, 0, 160, 300, null, null],
+        [0, "장교", null, 0, null, 68, 65, 68, 0, 160, 300, null, null],
+        [0, "장상", null, 0, null, 62, 76, 42, 0, 160, 300, null, null],
+        [0, "이흠", null, 0, null, 65, 68, 49, 0, 160, 300, null, null],
+        [0, "충예", null, 0, null, 33, 36, 72, 0, 160, 300, null, null],
+        [0, "장엄", null, 0, null, 38, 27, 79, 0, 160, 300, null, null],
+        [0, "충리비", null, 0, null, 75, 77, 56, 0, 160, 300, null, null],
+        [0, "채공", null, 0, null, 67, 71, 52, 0, 160, 300, null, null],
+        [0, "호충", null, 0, null, 19, 17, 55, 0, 160, 300, null, null],
+        [0, "마연", null, 0, null, 71, 75, 43, 0, 160, 300, null, null],
+        [0, "윤해", null, 0, null, 62, 63, 37, 0, 160, 300, null, null],
+        [0, "원소조예", null, 0, null, 61, 63, 36, 0, 160, 300, null, null],
+        [0, "한맹", null, 0, null, 74, 78, 43, 0, 160, 300, null, null],
+        [0, "등룡", null, 0, null, 64, 67, 49, 0, 160, 300, null, null],
+        [0, "송충", null, 0, null, 23, 19, 51, 0, 160, 300, null, null],
+        [0, "이규", null, 0, null, 28, 24, 61, 0, 160, 300, null, null],
+        [0, "진취", null, 0, null, 62, 71, 45, 0, 160, 300, null, null],
+        [0, "육울생", null, 0, null, 22, 33, 71, 0, 160, 300, null, null],
+        [0, "장성채", null, 0, null, 26, 22, 67, 0, 160, 300, null, null],
+        [0, "충보", null, 0, null, 64, 69, 47, 0, 160, 300, null, null],
+        [0, "장선", null, 0, null, 72, 71, 48, 0, 160, 300, null, null],
+        [0, "뇌서", null, 0, null, 76, 74, 61, 0, 160, 300, null, null],
+        [0, "번궁", null, 0, null, 71, 67, 58, 0, 160, 300, null, null]
+    ]
+}

hwe/sql/schema.sql

@@ -323,6 +323,7 @@ CREATE TABLE `board` (
 	`date` DATETIME NOT NULL,
 	`general_no` INT(11) NOT NULL,
 	`author` VARCHAR(32) NOT NULL,
+	`author_icon` VARCHAR(128) NULL DEFAULT NULL,
 	`title` TEXT NOT NULL,
 	`text` TEXT NOT NULL,
 	PRIMARY KEY (`no`),
@@ -565,7 +566,7 @@ CREATE TABLE `ng_diplomacy` (
 	`src_nation_id` INT(11) NOT NULL,
 	`dest_nation_id` INT(11) NOT NULL,
 	`prev_no` INT(11) NULL DEFAULT NULL,
-	`state` ENUM('proposed','activated','cancelled') NOT NULL DEFAULT 'proposed',
+	`state` ENUM('proposed','activated','cancelled','replaced') NOT NULL DEFAULT 'proposed',
 	`text_brief` TEXT NOT NULL,
 	`text_detail` TEXT NOT NULL,
 	`date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,

hwe/t_board.php

@@ -33,7 +33,7 @@ else if ($isSecretBoard && $permission < 2) {
     die();
 }
 
-$boardName = $isSecretBoard?'회의실':'기밀실';
+$boardName = $isSecretBoard?'기밀실':'회의실';
 
 ?>
 <!DOCTYPE html>
@@ -63,46 +63,64 @@ var isSecretBoard = <?=($isSecretBoard?'true':'false')?>; //
 </head>
 <body>
 
-<div id='newArticle'>
-<div><span class='articleTitle'>제목</span><input class='titleInput' type='text' maxlength='250'></input></div>
-<div class='boardArticle'>
-<textarea class="contentInput" rows="10" cols="50"></textarea>
+
+<div style='width:1000px;margin:auto;' class='tb_layout bg0'>
+    <?=$boardName?><br>
+    <?=backButton()?>
 </div>
+
+
+<table id='newArticle' class='bg0'>
+<thead>
+        <tr><td colspan='2' class='newArticleHeader bg2'>새 게시물 작성</td>
+    </thead>
+<tbody>
+<tr><th class='bg1' style='width:66px;'><span class='articleTitle'>제목</span></th><td><input class='titleInput' type='text' maxlength='250' placeholder='제목'></input></td></tr>
+<tr><th class='bg1'>내용</th><td class='boardArticle'>
+<textarea class="contentInput autosize" placeholder='내용'></textarea>
+</td></tr>
+</tbody>
+<tfoot>
+<tr><td colspan="2">
 <button type='button' id='submitArticle'>등록</button>
-</div>
+</td></tr>
+</tfoot>
+</table>
 
 <div id="board">
 </div>
 
-<template id='articleTemplate'>
-<div class='articleFrame'>
-<div><span class='articleTitle'></span></div>
-<div class='authorPlate'><span class='authorIcon'></span><span class='authorName'><span><span class='date'></span></div>    
-<div class='boardArticle'>
+<!-- 설계미스. template와 shadowdom으로 변경 -->
+<div id='articleTemplate' style='display:none;'>
+<table class='articleFrame bg0'>
+<thead>
+<tr class='bg1'>
+<th class='authorName'></th><th class='articleTitle'></th><th class='date'></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><img class='authorIcon generalIcon' width='64' height='64'></td>
+<td class='text' colspan='2'></td> 
+</tr>
+</tbody>
+<tbody class='commentList'>
+</tbody>
+<tfoot>
+<tr><td class='bg2 inputCommentHeader'>댓글 달기</td><td><input class='commentText' type='text' maxlength='250' placeholder='새 댓글 내용'></td><td><button type='button' class='submitComment'>등록</button></td></tr>
+</tfoot>
+</table>
+</div>
 
-</div>
-</div>
-<div class='commentFrame'>
-    <ul class='commentList'>
-
-    </ul>
-    <div>
-        <input class='commentText' type='text' maxlength='250'></input>
-        <button type='button' class='submitComment'>등록</button>
-    </div>
-</div>
-</div>
+<template id='commentTemplate' style='display:none;'>
+<tr class='comment'>
+<th class='author'></th>
+<td class='text'></td>
+<td class='date'></td>
+</tr>
 </template>
 
-<template id='commentTemplate'>
-<li class='comment'>
-<span class='author'></span>
-<span class='text'></span>
-<span class='date'></span>
-</li>
-</template>
-
-<div style='width=1000px;' class='tb_layout bg0'>
+<div style='width:1000px;margin:auto;' class='tb_layout bg0'>
     <?=backButton()?><br>
     <?=banner()?>
 </div>

hwe/t_diplomacy.php

@@ -36,6 +36,8 @@ if ($permission < 1) {
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+<?=WebUtil::printCSS('../e_lib/select2/select2.min.css')?>
+<?=WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css')?>
 <!--<?=WebUtil::printCSS('../e_lib/tui.editor/tui-editor.min.css')?>-->
 <!--<?=WebUtil::printCSS('../e_lib/tui.editor/tui-editor-contents.min.css')?>-->
 <?=WebUtil::printCSS('../d_shared/common.css')?>
@@ -48,27 +50,77 @@ var permissionLevel = <?=$permission?>; //
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
 <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('../e_lib/select2/select2.full.min.js')?>
 <!--<?=WebUtil::printJS('../e_lib/tui.editor/tui-editor-Editor-all.min.js')?>-->
 <?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('js/board.js')?>
+<?=WebUtil::printJS('js/diplomacy.js')?>
 
 </head>
 <body>
+<table style='width:1000px;margin:auto;' class='tb_layout bg0'>
+    <tr><td style='text-align:left;'>외 교 부<br><?=backButton()?></td></tr>
+</table>
 
-<template id='diplomacyTemplate'>
-<div class='diplomacyFrame'>
-<div><span class='articleTitle'></span></div>
-<div class='authorPlate'><span class='authorIcon'></span><span class='authorName'><span><span class='date'></span></div>    
-<div class='boardArticle'>
+<table id='newLetter' class='bg0' style='display:none;'>
+    <thead>
+        <tr><td colspan='2' class='newLetterHeader'>새 외교문서 작성</td>
+    </thead>
+    <tbody>
+        <tr><th class='bg1'>이전 문서</th><td><select id='inputPrevNo'></select></td></tr>
+        <tr><th class='bg1'>대상 국가</th><td><select id='inputDestNation'></select></td></tr>
+        <tr><th class='bg1'>내용(국가 내 공개)</th><td><textarea id='inputBrief' class='autosize'></textarea></td></tr>
+        <tr><th class='bg1'>내용(외교권자 전용)</th><td><textarea id='inputDetail' class='autosize'></textarea></td></tr>
+    </tbody>
+    <tfoot>
+        <tr class='letterActionPlate'><th class='bg1'>동작</th><td>
+            <button type='button' id='btnSend'>전송</button>
+        </td></tr>
+    </tfoot>
+</table>
 
-</div>
-</div>
-</div>
-</template>
+<div id='letters'></div>
 
-<div style='width=1000px;' class='tb_layout bg0'>
+<!-- 설계미스. template와 shadowdom으로 변경 -->
+<div id='letterTemplate' style='display:none;'>
+    <table class='letterFrame bg0'>
+        <thead>
+            <tr><td colspan='2' class='letterHeader'><span class='letterNationName'></span>국과의 외교 문서<span class='letterDate'>2099-12-31 23:59:59</span></td>
+        </thead>
+        <tbody>
+            <tr><th class='bg1'>문서 번호</th><td><span class='letterNo'></span></td></tr>
+            <tr><th class='bg1'>이전 문서</th><td><span class='letterPrevNo'></span></td></tr>
+            <tr><th class='bg1'>상태</th><td><span class='letterStatus'></span><span class='letterStatusOpt'></span></td></tr>
+            <tr><th class='bg1'>내용(국가 내 공개)</th><td><div class='letterBrief'></div></td></tr>
+            <tr><th class='bg1'>내용(외교권자 전용)</th><td><div class='letterDetail'></div></td></tr>
+        </tbody>
+        <tfoot>
+            <tr><th class='bg1'>서명인</th><td class='letterSignerPlate'>
+                <div class='letterSrc'>
+                    <div class="signerImg"><img class='generalIcon' width='64px' height='64px'></div>
+                    <div class="signerNation">&nbsp;</div>
+                    <div class="signerName">&nbsp;</div>
+                </div><div class='letterDest'>
+                    <div class="signerImg"><img class='generalIcon' width='64px' height='64px'></div>
+                    <div class="signerNation">&nbsp;</div>
+                    <div class="signerName">&nbsp;</div>
+                </div>
+            </td></tr>
+            <tr class='letterActionPlate' style='display:none;'><th class='bg1'>동작</th><td>
+                <button type='button' class='btnAgree' style='display:none;'>승인</button>
+                <button type='button' class='btnDisagree' style='display:none;'>거부</button>
+                <button type='button' class='btnRollback' style='display:none;'>회수</button>
+                <button type='button' class='btnDestroy' style='display:none;'>파기</button>
+                <button type='button' class='btnRenew'>추가 문서 작성</button>
+            </td></tr>
+        </tfoot>
+    </table>
+</div>
+
+<table style='width:1000px;margin:auto;' class='tb_layout bg0'>
+<tr><td style='text-align:left;'>
     <?=backButton()?><br>
     <?=banner()?>
-</div>
+</td></tr>
+</table>
 </body>
 </html>

hwe/templates/commandButton.php

@@ -1,9 +1,9 @@
 <div class='buttonPlate bg2'>
     <div>
     <a href='t_board.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>회 의 실</button></a>
-    <a href='t_board.php?isSecret=true'><button class='commandButton' <?=$meLevel>=5?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>기 밀 실</button></a>
+    <a href='t_board.php?isSecret=true'><button class='commandButton' <?=$permission>=2?'':'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='t_diplomacy.php'><button class='commandButton' <?=$meLevel>=1?'':'disabled'?> style='background-color:<?=$bgColor?>;color:<?=$fgColor?>;'>외 교 부</button></a>
+    <a href='t_diplomacy.php'><button class='commandButton' <?=$showSecret?'':'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>

src/conv_general_stat.py

@@ -184,6 +184,8 @@ def extractGeneralList(generalSheet, nationList={}, nationChiefInfo={}):
         if len(row) < 13:
             row.append('')
         row[12] = row[12].strip()
+        if len(row[12]) > 99:
+            row[12] = row[12][:99]
         if row[12] == '':
             row.pop()