메시지함 높이 고정을 최소 높이로 변경

메시지함 사라지는 버그 수정?
도움 주신 분 임시 삭제. 나중에 Credit으로 되살리기로
2018-07-11 23:49:57 +09:00 · 2018-07-11 23:04:38 +09:00 · 2018-07-11 22:37:36 +09:00 · 2018-07-11 22:18:08 +09:00 · 2018-07-11 22:17:03 +09:00 · 2018-07-11 22:04:20 +09:00
52 changed files with 462 additions and 196 deletions
@@ -15,6 +15,7 @@ require(__dir__.'/../vendor/autoload.php');
    <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
    <?=WebUtil::printJS('../e_lib/jquery.validate.min.js')?>
    <?=WebUtil::printJS('../e_lib/sha512.min.js')?>
+    <?=WebUtil::printJS('../js/common.js')?>
    <?=WebUtil::printJS('../js/install.js')?>
    <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
    <?=WebUtil::printCSS('../css/install.css')?>
@@ -30,7 +30,7 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();

-list($turntime, $tnmt_time) = $gameStor->getValuesAsArray(['turntime','tnmt_time']);
+[$turntime, $tnmt_time] = $gameStor->getValuesAsArray(['turntime','tnmt_time']);

 $query = "select plock from plock";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -58,7 +58,7 @@ $db = DB::db();
 <?php

 echo "
-            <select name=genlist[] size=20 multiple style=color:white;background-color:black;font-size:13>";
+            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:13px'>";
 $generalList = $db->query('SELECT `no`, `name`, npc, `block` FROM general ORDER BY npc, binary(`name`)');

 foreach($generalList as $general){
@@ -76,7 +76,7 @@ echo "
        </td>
        <td width=100 align=center>아이템 지급</td>
        <td width=504>
-            <select name=weap size=1 style=color:white;background-color:black;font-size:13>";
+            <select name=weap size=1 style='color:white;background-color:black;font-size:13px'>";
 for($i=0; $i < 27; $i++) {
    echo "
                <option value={$i}>{$i}</option>";
@@ -99,7 +99,7 @@ switch($btn) {
        ], '`no` IN %li', $genlist);
        break;
    case "특기 부여":
-        list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
+        [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
        $text = "특기 부여!";

        foreach($db->query("SELECT `no`,leader,power,intel,dex0,dex10,dex20,dex30,dex40 FROM general WHERE `no` IN %li", $genlist) as $general){    
@@ -55,7 +55,7 @@ $conlimit = $gameStor->conlimit;
 <?php

 echo "
-            <select name=genlist[] size=20 multiple style=color:white;background-color:black;font-size:13>";
+            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:13px'>";

 foreach($db->query('SELECT no,name,npc,block,con from general where ip!=\'\' order by npc,ip') as $general){
    $style = "style=;";
@@ -26,9 +26,14 @@ increaseRefresh("명장일람", 1);
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1136" />
 <title><?=UniqueConst::$serverName?>: 명장일람</title>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/hallOfFame.css')?>
+
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
 </head>

 <body>
@@ -213,7 +218,7 @@ $itemTypes = [
    ["명 마", 'horse', function($v){return getHorseName($v);}, 7, 26, []],
    ["명 검", 'weap', function($v){return getWeapName($v);}, 7, 26, []],
    ["명 서", 'book', function($v){return getBookName($v);}, 7, 26, []],
-    ["도 구", 'item', function($v){return getItemName($v);}, 7, 26, []],
+    ["도 구", 'item', function($v){return displayItemInfo($v);}, 7, 26, []],
 ];

 $simpleItemTypes = array_map(function($itemType){return $itemType[1];}, $itemTypes);
@@ -41,10 +41,13 @@ if ($type <= 0 || $type > 15) {
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 장수일람</title>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('js/common.js')?>

 </head>

@@ -167,8 +170,8 @@ for ($j=0; $j < $gencount; $j++) {
        <td align=center><img width='64' height='64' src={$imageTemp}/{$general['picture']}></img></td>
        <td align=center>$name</td>
        <td align=center>{$general['age']}세</td>
-        <td align=center>".getGenChar($general['personal'])."</td>
-        <td align=center>".getGenSpecial($general['special'])." / ".getGenSpecial($general['special2'])."</td>
+        <td align=center>".displayCharInfo($general['personal'])."</td>
+        <td align=center>".displaySpecialInfo($general['special'])." / ".displaySpecialInfo($general['special2'])."</td>
        <td align=center>Lv ".getExpLevel($general['experience'])."</td>
        <td align=center>{$nation}</td>
        <td align=center>".getHonor($general['experience'])."</td>
@@ -36,11 +36,15 @@ else{
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1136" />
 <title><?=UniqueConst::$serverName?>: 명예의 전당</title>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/hallOfFame.css')?>
+
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
 <?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printJs('js/hallOfFame.js')?>
 </head>

@@ -29,9 +29,14 @@ $sel[$type] = "selected";
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 빙의일람</title>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>

+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+
 </head>

 <body>
@@ -106,8 +111,8 @@ for ($j=0; $j < $gencount; $j++) {
        <td align=center>{$general['name2']}</td>
        <td align=center>Lv {$general['explevel']}</td>
        <td align=center>{$nation}</td>
-        <td align=center>".getGenChar($general['personal'])."</td>
-        <td align=center>".getGenSpecial($general['special'])." / ".getGenSpecial($general['special2'])."</td>
+        <td align=center>".displayCharInfo($general['personal'])."</td>
+        <td align=center>".displaySpecialInfo($general['special'])." / ".displaySpecialInfo($general['special2'])."</td>
        <td align=center>{$general['sum']}</td>
        <td align=center>{$general['leader']}</td>
        <td align=center>{$general['power']}</td>
@@ -21,9 +21,7 @@ $query = "select no,nation,level,city from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);

-$query = "select nation,level,spy from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$myNation = MYDB_fetch_array($result);
+$myNation = $db->queryFirstRow('SELECT nation,level,spy FROM nation WHERE nation=%i', $me['nation']);

 $templates = new \League\Plates\Engine('templates');

@@ -121,27 +119,34 @@ if($me['level'] == 0) {

 if($myNation['level'] > 0) {
    // 첩보도시도 목록에 추가
-    $where = 'city=0';
-    $cities = array_map('intval',explode("|", $myNation['spy']));
-    foreach($cities as $citySpy) {
-        $city = intdiv($citySpy, 10);
-        $where .= " or city='{$city}'";
+
+    $rawSpy = $myNation['spy'];
+
+    if($rawSpy == ''){
+        $spyCities = [];
+    }
+    else if(strpos($rawSpy, '|') !== false || is_numeric($rawSpy)){
+        //TODO: 0.8 버전 이후에는 삭제할 것. 이후 버전은 json으로 변경됨.
+        $spyCities = array_map(function($val){
+            $val = intval($val);
+            return intdiv($val, 10);
+        }, 'intval',explode('|', $myNation['spy']));
+    }
+    else{
+        $spyCities = array_keys(Json::decode($rawSpy));
    }

-    $query = "select city,name,nation from city where {$where}";
-    $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $citycount = MYDB_num_rows($cityresult);

-    for($i=0; $i < $citycount; $i++) {
-        $city = MYDB_fetch_array($cityresult);
-        echo "
-                        <option value={$city['city']}";
-        if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
-        echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
-        if($city['nation'] == 0) echo "공백지";
-        elseif($me['nation'] == $city['nation']) echo "본국==";
-        else echo "타국==";
-        echo "============================================</option>";
+    if($spyCities){
+        foreach ($db->query('SELECT city,name,nation FROM city WHERE city in %li', $spyCities) as $city) {
+            echo "<option value={$city['city']}";
+            if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
+            echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
+            if($city['nation'] == 0) echo "공백지";
+            elseif($me['nation'] == $city['nation']) echo "본국==";
+            else echo "타국==";
+            echo "============================================</option>";
+        }
    }

 }
@@ -48,6 +48,10 @@ if ($me['level'] >= 5) {
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 내무부</title>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
+
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>

@@ -45,11 +45,11 @@ for($i=0; $i < $nationcount; $i++) {
 }

 $realConflict = [];
-foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE conflict!=%s', '{}') as list(
+foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE conflict!=%s', '{}') as [
    $cityID, 
    $cityName, 
    $rawConflict
-))
+])
 {
    $conflict = Json::decode($rawConflict);
    if (count($conflict)<2) {
@@ -54,9 +54,12 @@ $sel[$type] = "selected";
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 암행부</title>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
 </head>

 <body>
@@ -40,8 +40,12 @@ $sel = [$type => "selected"];
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 세력장수</title>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>

 </head>

@@ -181,8 +185,8 @@ for($j=0; $j < $gencount; $j++) {
        <td align=center>$intel</td>
        <td align=center>{$general['gold']}</td>
        <td align=center>{$general['rice']}</td>
-        <td align=center>".getGenChar($general['personal'])."</td>
-        <td align=center>".getGenSpecial($general['special'])." / ".getGenSpecial($general['special2'])."</td>
+        <td align=center>".displayCharInfo($general['personal'])."</td>
+        <td align=center>".displaySpecialInfo($general['special'])." / ".displaySpecialInfo($general['special2'])."</td>
        <td align=center>{$general['belong']}</td>
        <td align=center>{$general['connect']}"; echo "<br>(".getConnect($general['connect']).")</td>
    </tr>";
@@ -126,11 +126,11 @@ for($i=0; $i < $troopcount; $i++) {
        </td>
    </tr>
    <tr><td align=center><font size=2>【턴】".substr($turntime, 14)."</font></td><td align=center><font size=1>$name</font></td></tr>
-    <tr><td colspan=5>";
+    <tr><td colspan=5></td></tr>";
    }
 }
 echo "</tbody>
-<tfoot>";
+<tfoot><tr><td>";
 if ($troopcount == 0) {
 }
 else if($me['troop'] == 0) {
@@ -188,38 +188,10 @@ div.bar_out div.bar_in{
 }

 .tooltip{
-    position: relative;
+    font-size:12px;
+    font-family: '맑은 고딕';
 }

-.tooltip .tooltiptext {
-    visibility: hidden;
-    width: 120px;
-    background-color: #555;
-    color: #fff;
-    text-align: center;
-    border-radius: 6px;
-    padding: 5px 0;
-    position: absolute;
-    z-index: 1;
-    bottom: 125%;
-    left: 50%;
-    margin-left: -60px;
-    opacity: 0;
-    transition: opacity 0.3s;
+.tooltiptext {
+    display: none;
 }
-
-.tooltip .tooltiptext::after {
-    content: "";
-    position: absolute;
-    top: 100%;
-    left: 50%;
-    margin-left: -5px;
-    border-width: 5px;
-    border-style: solid;
-    border-color: #555 transparent transparent transparent;
-}
-
-.tooltip:hover .tooltiptext {
-    visibility: visible;
-    opacity: 1;
-}
@@ -63,8 +63,8 @@

 .world_map.map_detail .city_filler{
    position:absolute;
-    width:100%;
-    height:100%;
+    width:calc(100% + 2px);
+    height:calc(100% + 2px);
    left:-1px;
    top:-1px;
    background:transparent;
@@ -17,15 +17,14 @@
 #message_board section{
    overflow-y:auto;
    overflow-x:hidden;
-    max-width:498px;
 }

 .msg_plate{
    width:100%;
-    border-bottom:solid 1px gray;
-    border-left:solid 1px gray;
-    border-right:solid 1px gray;
-    height:64px;
+    outline-style:solid;
+    outline-width:1px;
+    outline-color: gray;
+    min-height:64px;
    font-size:12px;
    word-break:break-all;
    color:white;
@@ -96,7 +95,8 @@
    font-size:12px;
    width:715px;
    margin:0 2px;
-    height:15px;
+    height:20px;
+    border:solid 1px gray;
 }

 #msg_submit{
@@ -116,17 +116,19 @@

 .board_header{
    color:white;
-    border:solid 1px gray;
+    outline-style:solid;
+    outline-width:1px;
+    outline-color: gray;
 }

 .board_side{
    position:absolute;
    height:1370px;
-    width:498px;
+    width:50%;
    overflow-y: hidden;
-    border-left:solid 1px;
-    border-right:solid 1px;
-    border-bottom:solid 1px;
+    outline-style:solid;
+    outline-width:1px;
+    outline-color: gray;
 }

 .msg_body{
@@ -490,7 +490,7 @@ function commandTable() {
    $develcostE = Util::round($develcostE);

    echo "
-<select name=commandtype size=1 style=width:260px;color:white;background-color:black;font-size:12px;>";
+<select name=commandtype size=1 style='height:20px;width:260px;color:white;background-color:black;font-size:12px;'>";
    addCommand("휴 식", 0);
    addCommand("요 양", 50);
    commandGroup("========= 내 정 ==========");
@@ -699,7 +699,7 @@ function CoreCommandTable() {
    if($city['supply'] == 0) { $valid = 0; }

    echo "
-<select name=commandtype size=1 style=color:white;background-color:black;font-size:13>";
+<select name=commandtype size=1 style='height:20px;color:white;background-color:black;font-size:13px;>";
    addCommand("휴 식", 99);
    commandGroup("", 1);
    commandGroup("====== 인 사 ======");
@@ -821,7 +821,7 @@ function generalInfo($no) {
    $weapname = getWeapName($general['weap']);
    $bookname = getBookName($general['book']);
    $horsename = getHorseName($general['horse']);
-    $itemname = getItemName($general['item']);
+    $itemname = displayItemInfo($general['item']);
    if($general['injury'] > 0) {
        $leader = intdiv($general['leader'] * (100 - $general['injury']), 100);
        $power = intdiv($general['power'] * (100 - $general['injury']), 100);
@@ -847,8 +847,8 @@ function generalInfo($no) {
    else                  { $general['age'] = "<font color=red>{$general['age']} 세</font>"; }

    $general['connect'] = Util::round($general['connect'] / 10) * 10;
-    $special = $general['special'] == 0 ? "{$general['specage']}세" : "<font color=limegreen>".getGenSpecial($general['special'])."</font>";
-    $special2 = $general['special2'] == 0 ? "{$general['specage2']}세" : "<font color=limegreen>".getGenSpecial($general['special2'])."</font>";
+    $special = $general['special'] == 0 ? "{$general['specage']}세" : "<font color=limegreen>".displaySpecialInfo($general['special'])."</font>";
+    $special2 = $general['special2'] == 0 ? "{$general['specage2']}세" : "<font color=limegreen>".displaySpecialInfo($general['special2'])."</font>";

    switch($general['personal']) {
        case  2:    case  4:
@@ -913,7 +913,7 @@ function generalInfo($no) {
        <td style='text-align:center;' class='bg1'><b>병사</b></td>
        <td style='text-align:center;' colspan=2>{$general['crew']}</td>
        <td style='text-align:center;' class='bg1'><b>성격</b></td>
-        <td style='text-align:center;' colspan=2>".getGenChar($general['personal'])."</td>
+        <td style='text-align:center;' colspan=2>".displayCharInfo($general['personal'])."</td>
    </tr>
    <tr>
        <td style='text-align:center;' class='bg1'><b>훈련</b></td>
@@ -1128,7 +1128,7 @@ function msgprint($msg, $name, $picture, $imgsvr, $when, $num, $type) {
    $db = DB::db();
    $connect=$db->get();

-    $message = explode("|", $msg);
+    $message = explode('|', $msg);
    $count = (count($message) - 2)/2;
    $message[0] = Tag2Code($message[0]);
    $message[1] = Tag2Code($message[1]);
@@ -1180,11 +1180,10 @@ function msgprint($msg, $name, $picture, $imgsvr, $when, $num, $type) {
 function banner() {

    return sprintf(
-        '<font size=2>%s %s / %s <br> %s</font>',
+        '<font size=2>%s %s / %s</font>',
        GameConst::$title,
        VersionGit::$version,
-        GameConst::$banner,
-        GameConst::$helper);
+        GameConst::$banner);
 }

 function addTurn($date, int $turnterm, int $turn=1) {
@@ -135,6 +135,28 @@ function getGenChar($type) {
    return $call;
 }

+function getCharInfo(?int $type):?string {
+    if($type === null){
+        return null;
+    }
+
+    $infoText = [
+        10=>['은둔', '명성 -10%, 계급 -10%, 사기 -5, 훈련 -5, 단련 성공률 +10%'],
+        9=>['안전', '사기 -5, 징·모병 비용 -20%'],
+        8=>['유지', '훈련 -5, 징·모병 비용 -20%'],
+        7=>['재간', '명성 -10%, 징·모병 비용 -20%'],
+        6=>['출세', '명성 +10%, 징·모병 비용 +20%'],
+        5=>['할거', '명성 -10%, 훈련 +5'],
+        4=>['정복', '명성 -10%, 사기 +5'],
+        3=>['패권', '훈련 +5, 징·모병 비용 +20%'],
+        2=>['의협', '사기 +5, 징·모병 비용 +20%'],
+        1=>['대의', '명성 +10%, 훈련 -5'],
+        0=>['왕좌', '명성 +10%, 사기 -5'],
+    ];
+
+    return $infoText[$type][1]??null;
+}
+
 function getGenSpecial($type) {
    switch($type) {
        case  0: $call = '-'; break;
@@ -179,6 +201,55 @@ function getGenSpecial($type) {
    return $call;
 }

+function getSpecialInfo(?int $type):?string{
+    if($type === null){
+        return null;
+    }
+
+    //앞칸은 '설명을 위해' '그냥' 적어둠
+    $infoText = [
+        0 => ['-', null],
+        1 => ['경작', '[내정] 농지 개간 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+        2 => ['상재', '[내정] 상업 투자 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+        3 => ['발명', '[내정] 기술 연구 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+
+        10 => ['축성', '[내정] 성벽 보수 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+        11 => ['수비', '[내정] 수비 강화 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+        12 => ['통찰', '[내정] 치안 강화 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+
+        20 => ['인덕', '[내정] 주민 선정·정착 장려 : 기본 보정 +10%, 성공률 +10%p, 비용 -20%'],
+
+        30 => ['거상', '이것 저것'],
+        31 => ['귀모', '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p'],
+
+        40 => ['귀병', '[군사] 귀병 계통 징·모병비 -10%<br>[전투] 계략 성공 확률 +20%p'],
+        41 => ['신산', '[계략] 화계·탈취·파괴·선동 : 성공률 +10%p<br>[전투] 계략 시도 확률 +20%p, 계략 성공 확률 +20%p '],
+        42 => ['환술', '[전투] 계략 성공 확률 +10%p, 계략 성공 시 대미지 +30%'],
+        43 => ['집중', '[전투] 계략 성공 시 대미지 +50%'],
+        44 => ['신중', '[전투] 계략 성공 확률 100%'],
+        45 => ['반계', '[전투] 상대의 계략을 30% 확률로 되돌림, 반목 성공시 대미지 추가(+60% → +100%)'],
+
+        50 => ['보병', '[군사] 보병 계통 징·모병비 -10%<br>[전투] 공격 시 아군 피해 -10%, 수비 시 아군 피해 -20%'],
+        51 => ['궁병', '[군사] 궁병 계통 징·모병비 -10%<br>[전투] 회피 확률 +20%p'],
+        52 => ['기병', '[군사] 기병 계통 징·모병비 -10%<br>[전투] 수비 시 대미지 +10%, 공격 시 대미지 +20%'],
+        53 => ['공성', '[군사] 차병 계통 징·모병비 -10%<br>[전투] 성벽 공격 시 대미지 +100%'],
+
+        60 => ['돌격', '[전투] 상대 회피 불가, 공격 시 전투 페이즈 +1, 공격 시 대미지 +10%'],
+        61 => ['무쌍', '[전투] 대미지 +10%, 공격 시 필살 확률 +10%p'],
+        62 => ['견고', '[전투] 수비 시 대미지 +10%, 공격 시 아군 피해 -10%'],
+        63 => ['위압', '[전투] 훈련/사기≥90, 병력≥1,000 일 때 첫 페이즈 위압 발동(적 공격 불가)'],
+
+        70 => ['저격', '[전투] 전투 개시 시 1/3 확률로 저격 발동'],
+        71 => ['필살', '[전투] 필살 확률 +20%p'],
+        72 => ['징병', '[군사] 징·모병비 -50%'],
+        73 => ['의술', '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 20% 확률로 치료 발동(아군 피해 1/3 감소)'],
+        74 => ['격노', '[전투] 상대방 필살 및 회피 시도시 일정 확률로 격노(필살) 발동, 공격 시 일정 확률로 진노(1페이즈 추가)'],
+        75 => ['척사', '[전투] 지역·도시 병종 상대로 대미지 +10%, 아군 피해 -10%']
+    ];
+
+    return $infoText[$type][1]??null;
+}
+
 function getNationType($type) {
    switch($type) {
        case 13: $call = '명 가'; break;
@@ -727,7 +798,7 @@ function getHorseEff($horse) : int {
    return $horse;
 }

-function getItemName($item) : string {
+function getItemName($item) : ?string {
    switch($item) {
        case  0: $itemname = '-'; break;
        case  1: $itemname = '환약(치료)'; break;
@@ -757,10 +828,45 @@ function getItemName($item) : string {
        case 24: $itemname = '태평청령(의술)'; break;
        case 25: $itemname = '태평요술(회피)'; break;
        case 26: $itemname = '둔갑천서(회피)'; break;
+        default: $itemname = null;
    }
    return $itemname;
 }

+function getItemInfo(?int $item):?string{
+    $itemInfo = [
+        1=>['환약(치료)', '[군사] 턴 실행 전 부상 회복. 1회용'],
+        2=>['수극(저격)', '[전투] 전투 개시 전 20% 확률로 저격 시도. 1회용'],
+        3=>['탁주(사기)', '[전투] 사기 보정 +3. 1회용'],
+        4=>['청주(훈련)', '[전투] 훈련 보정 +3. 1회용'],
+        5=>['이추(계략)', '[계략] 화계·탈취·파괴·선동 : 성공률 +10%p. 1회용'],
+        6=>['향낭(계략)', '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p. 1회용'],
+        
+        7=>['오석산(치료)', '[군사] 턴 실행 전 부상 회복.'],
+        8=>['무후행군(치료)', '[군사] 턴 실행 전 부상 회복.'],
+        9=>['도소연명(치료)', '[군사] 턴 실행 전 부상 회복.'],
+        10=>['칠엽청점(치료)', '[군사] 턴 실행 전 부상 회복.'],
+        11=>['정력견혈(치료)', '[군사] 턴 실행 전 부상 회복.'],
+        12=>['과실주(훈련)', '[전투] 훈련 보정 +5'],
+        13=>['이강주(훈련)', '[전투] 훈련 보정 +5'],
+        14=>['의적주(사기)', '[전투] 사기 보정 +5'],
+        15=>['두강주(사기)', '[전투] 사기 보정 +5'],
+        16=>['보령압주(사기)', '[전투] 사기 보정 +5'],
+        17=>['철벽서(훈련)', '[전투] 훈련 보정 +7'],
+        18=>['단결도(훈련)', '[전투] 훈련 보정 +7'],
+        19=>['춘화첩(사기)', '[전투] 사기 보정 +7'],
+        20=>['초선화(사기)', '[전투] 사기 보정 +7'],
+        21=>['육도(계략)', '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p'],
+        22=>['삼략(계략)', '[계략] 화계·탈취·파괴·선동 : 성공률 +20%p'],
+        23=>['청낭서(의술)', '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 20% 확률로 치료 발동(아군 피해 1/3 감소)'],
+        24=>['태평청령(의술)', '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 20% 확률로 치료 발동(아군 피해 1/3 감소)'],
+        25=>['태평요술(회피)', '[전투] 회피 확률 +20%p'],
+        26=>['둔갑천서(회피)', '[전투] 회피 확률 +20%p'],
+    ];
+
+    return $itemInfo[$item][1]??null;
+}
+
 function getItemCost2($weap) : int {
    switch($weap) {
        case  0: $weapcost = 0; break;
@@ -395,23 +395,33 @@ function preUpdateMonthly() {
    }

    //첩보-1
-    $query = "select nation,spy from nation where spy!=''";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nationCount = MYDB_num_rows($result);
-    for($i=0; $i < $nationCount; $i++) {
-        $nation = MYDB_fetch_array($result);
-        $spy = "";  $k = 0; 
-        $cities = [];
-        if($nation['spy'] != "") { $cities = explode("|", (string)$nation['spy']); }
-        while(count($cities)) {
-            $cities[$k]--;
-            if($cities[$k]%10 != 0) { $spy .= (string)$cities[$k]; }
-            $k++;
-            if($k >= count($cities)) { break; }
-            if($cities[$k-1]%10 != 0) { $spy .= "|"; }
+    foreach($db->queryAllLists("SELECT nation, spy FROM nation WHERE spy!='' AND spy!='{}'") as [$nationNo, $rawSpy]){
+        if (strpos($rawSpy, '|') !== false || is_numeric($rawSpy)) {
+           //TODO: 0.8 버전 이후에는 삭제할 것. 이후 버전은 json으로 변경됨.
+           $spyInfo = [];
+           foreach(explode('|', $rawSpy) as $value){
+               $value = intval($value);
+               $cityNo = intdiv($value, 10);
+               $remainMonth = $value % 10;
+               $spyInfo[$cityNo] = $remainMonth;
+           }
        }
-        $query = "update nation set spy='$spy' where nation='{$nation['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        else{
+            $spyInfo = Json::decode($rawSpy);
+        }
+
+        foreach($spyInfo as $cityNo => $remainMonth){
+            if($remainMonth <= 1){
+                unset($spyInfo[$cityNo]);
+            }
+            else{
+                $spyInfo[$cityNo] -= 1;
+            }
+        }
+
+        $db->update('nation', [
+            'spy'=>Json::encode($spyInfo, Json::EMPTY_ARRAY_IS_DICT)
+        ], 'nation=%i', $nationNo);
    }
    
    return true;
@@ -31,7 +31,7 @@ function bar($per, $h=7) {

    $per = round($per, 1);
    
-    $str = "<div class='bar_out' style='height:{$h2}px;'>
+    $str = "<div class='bar_out' style='height:{$h}px;'>
    <div class='bar_in' style='background:url(".ServConfig::$gameImagePath."/pr{$h2}.gif)'></div>
    <div style='width:{$per}%;background:url(".ServConfig::$gameImagePath."/pb{$h2}.gif)'></div>
    </div>";
@@ -94,19 +94,29 @@ function getWorldMap($req){
        $myNation = null;
    }

+    $spyInfo = (object)null;
+
    if($myNation){
-        $spyList = $db->queryFirstField('select `spy` from `nation` where `nation`=%i', 
+        $rawSpy = $db->queryFirstField('select `spy` from `nation` where `nation`=%i', 
            $myNation);
-        if($spyList){
-            $spyList = array_map('\sammo\Util::toInt', explode("|", $spyList));
+
+        if(strpos($rawSpy, '|') !== false || is_numeric($rawSpy)){
+            //NOTE: 0.8 이전 데이터가 남아있으므로, 0.8버전으로 마이그레이션 이후에도 이곳은 삭제하면 안됨
+            $spyInfo = [];
+            foreach(explode('|', $rawSpy) as $value){
+                $value = intval($value);
+                $cityNo = intdiv($value, 10);
+                $remainMonth = $value % 10;
+                $spyInfo[$cityNo] = $remainMonth;
+            }
        }
-        else{
-            $spyList = [];
+        else if($rawSpy != ''){
+            $spyInfo = Json::decode($rawSpy);
        }
-        
    }
-    else{
-        $spyList = [];
+
+    if(!$spyInfo){
+        $spyInfo = (object)null;
    }

    $nationList = [];
@@ -142,7 +152,7 @@ function getWorldMap($req){
        'month' => $month,
        'cityList' => $cityList,
        'nationList' => $nationList,
-        'spyList' => $spyList,
+        'spyList' => $spyInfo,
        'shownByGeneralList' => $shownByGeneralList,
        'myCity' => $myCity,
        'myNation' => $myNation,
@@ -361,7 +361,7 @@ function processAI($no) {
            }
            break;
        case 2: //이동 20%
-            $paths = explode("|", $city['path']);
+            $paths = explode('|', $city['path']);
            $command = EncodeCommand(0, 0, $paths[rand()%count($paths)], 21);
            break;
        default:
@@ -429,7 +429,7 @@ function processAI($no) {
                return;
            } elseif(rand()%4 > 0) {
                //이동
-                $paths = explode("|", $city['path']);
+                $paths = explode('|', $city['path']);
                $command = EncodeCommand(0, 0, $paths[rand()%count($paths)], 21);
                $query = "update general set turn0='$command' where no='{$general['no']}'";
                MYDB_query($query, $connect) or Error("processAI09 ".MYDB_error($connect),"");
@@ -600,7 +600,7 @@ function processAI($no) {
                //현도시가 전방이면 공격 가능성 체크
                if($city['front'] > 0) {
                    //주변도시 체크
-                    $paths = explode("|", $city['path']);
+                    $paths = explode('|', $city['path']);
                    for($i=0; $i < count($paths); $i++) {
                        $query = "select city,nation from city where city='$paths[$i]'";
                        $result = MYDB_query($query, $connect) or Error("processAI20 ".MYDB_error($connect),"");
@@ -766,7 +766,7 @@ function processAI($no) {
                $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1);   // 준비는 됐으나 아직 선포중이면 내정, 조달
            } else {
                //공격 & 내정
-                $paths = explode("|", $city['path']);
+                $paths = explode('|', $city['path']);
                for($i=0; $i < count($paths); $i++) {
                    $query = "select city,nation from city where city='$paths[$i]'";
                    $result = MYDB_query($query, $connect) or Error("processAI21 ".MYDB_error($connect),"");
@@ -898,7 +898,7 @@ function process_11(&$general, $type) {
    if(intdiv($armtype, 10) == 1 && $general['special2'] == 51) { $cost *= 0.9; }
    if(intdiv($armtype, 10) == 2 && $general['special2'] == 52) { $cost *= 0.9; }
    if(intdiv($armtype, 10) == 3 && $general['special2'] == 40) { $cost *= 0.9; }
-    if(intdiv($armtype, 10) == 4 && $general['special2'] == 43) { $cost *= 0.9; }
+    if(intdiv($armtype, 10) == 4 && $general['special2'] == 53) { $cost *= 0.9; }
    if($general['special2'] == 72) { $cost *= 0.5; }

    if($type == 1) { $dtype = "징병"; }
@@ -1743,32 +1743,32 @@ function process_31(&$general) {
        $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

-        $query = "select spy from nation where nation='{$general['nation']}'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $nation = MYDB_fetch_array($result);
-        if($nation['spy'] != "") 
-        { 
-            $cities = array_map('intval', explode("|", $nation['spy'])); 
+
+
+        $rawSpy = $db->queryFirstField('SELECT spy FROM nation WHERE nation = %i', $general['nation']);
+        
+        if($rawSpy == ''){
+            $spyInfo = [];
        }
-        else{
-            $cities = [];
-        }
-        $exist = 0;
-        for($i=0; $i < count($cities); $i++) {
-            if(intdiv($cities[$i], 10) == $destination) {
-                $exist = 1;
-                break;
+        else if(strpos($rawSpy, '|') !== false || is_numeric($rawSpy)){
+            //TODO: 0.8 버전 이후에는 삭제할 것. 이후 버전은 json으로 변경됨.
+            $spyInfo = [];
+            foreach(explode('|', $rawSpy) as $value){
+                $value = intval($value);
+                $cityNo = intdiv($value, 10);
+                $remainMonth = $value % 10;
+                $spyInfo[$cityNo] = $remainMonth;
            }
        }
-        // 기존 첩보 목록에 없으면 새로 등록, 있으면 갱신
-        if($exist == 0) {
-            $cities[] = $destination * 10 + 3;
-        } else {
-            $cities[$i] = $destination * 10 + 3;
+        else{
+            $spyInfo = Json::decode($rawSpy);
        }
-        $spy = implode("|", $cities);
-        $query = "update nation set spy='$spy' where nation='{$general['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+        $spyInfo[$destination] = 3;
+
+        $db->update('nation', [
+            'spy'=>Json::encode($spyInfo, Json::EMPTY_ARRAY_IS_DICT)
+        ], 'nation=%i', $general['nation']);

        $log = checkAbility($general, $log);
    }
@@ -64,6 +64,42 @@ function CoreTurnTable() {
 ";
 }

+function displayCharInfo(?int $type):string{
+    $info = getCharInfo($type);
+    $text = getGenChar($type);
+
+    $templates = new \League\Plates\Engine(__dir__.'/templates');
+
+    return $templates->render('tooltip', [
+        'text'=>$text,
+        'info'=>$info,
+    ]);
+}
+
+function displaySpecialInfo(?int $type):string{
+    $info = getSpecialInfo($type);
+    $text = getGenSpecial($type);
+
+    $templates = new \League\Plates\Engine(__dir__.'/templates');
+
+    return $templates->render('tooltip', [
+        'text'=>$text,
+        'info'=>$info,
+    ]);
+}
+
+function displayItemInfo(?int $type):string{
+    $info = getItemInfo($type);
+    $text = getItemName($type);
+
+    $templates = new \League\Plates\Engine(__dir__.'/templates');
+
+    return $templates->render('tooltip', [
+        'text'=>$text,
+        'info'=>$info,
+    ]);
+}
+

 function allButton() {
    $db = DB::db();
@@ -87,6 +87,7 @@ $color = "cyan";
 <meta name="viewport" content="width=1024" />
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
 <?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printJS('js/main.js')?>
@@ -104,7 +105,7 @@ $(function(){
    }, 10000);
 });
 </script>
-<?=WebUtil::printCSS('css/normalize.css')?>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/main.css')?>
@@ -287,7 +288,7 @@ else if($session->userGrade == 4){
 <div class="message_input_form bg0">
    <select id="mailbox_list" size="1">

-            <select name="genlist" size="1" style="color:white;background-color:black;font-size:13">
+            <select name="genlist" size="1" style="color:white;background-color:black;font-size:13px">



@@ -14,6 +14,7 @@ $defaultPost = [
    'showMe' => true
 ];
 $post = Json::decode(Util::getReq('data', 'string', '{}'));
+$post += $defaultPost;

 if(!$session->isGameLoggedIn()){
    $post['neutralView'] = true;
@@ -38,11 +38,24 @@ $connect=$db->get();
 var defaultStatTotal = <?=GameConst::$defaultStatTotal?>;
 var defaultStatMin = <?=GameConst::$defaultStatMin?>;
 var defaultStatMax = <?=GameConst::$defaultStatMax?>;
+
+var charInfoText = <?php
+
+$charInfoText = [];
+for($i=0;$i<=9;$i++){
+    //XXX:하드코딩 금지!
+    $charInfoText[$i] = getCharInfo($i);
+}
+echo Json::encode((object)$charInfoText);
+?>;
 </script>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printJS('js/join.js')?>

 </head>
@@ -106,7 +119,7 @@ if ($admin['show_img_level'] >= 1 && $member['grade'] >= 1 && $member['picture']
        <tr>
            <td width=498 align=right id=bg1>성격</td>
            <td colspan=2>
-                <select name=character size=1 maxlength=15 style=color:white;background-color:black;>
+                <select id="selChar" name=character size=1 maxlength=15 style=color:white;background-color:black;>
                    <option selected value=11>????</option>
 <!--
                    <option value=10>은둔</option>
@@ -121,7 +134,7 @@ if ($admin['show_img_level'] >= 1 && $member['grade'] >= 1 && $member['picture']
                    <option value=2>의협</option>
                    <option value=1>대의</option>
                    <option value=0>왕좌</option>
-                </select> ※보정은 도움말 참고
+                </select> <span id="charInfoText"></span>
            </td>
        </tr>
        <tr>
@@ -128,4 +128,13 @@ function getIconPath(imgsvr,  picture){
    else{
        return pathConfig.root+'/d_pic/'+picture;
    }
-}
+}
+
+jQuery(function($){
+    $('.obj_tooltip').tooltip({
+        title:function(){
+            return $.trim($(this).find('.tooltiptext').html());
+        },
+        html:true
+    });
+});
@@ -564,7 +564,7 @@ $(function() {
                var $name = $this.children('.i_name');
                $name.addClass('nameplate');

-				var name = $name.find('.t_name').html();
+				var name = $name.find('.t_name').text();
                                
                var $work = $this.children('.i_action');
                
@@ -150,4 +150,17 @@ jQuery(function($){
    window.abilityLeadpow = abilityLeadpow;
    window.abilityLeadint = abilityLeadint;
    window.abilityPowint = abilityPowint;
-    });
+
+    var $charInfoText = $('#charInfoText');
+    var $selChar = $('#selChar');
+    $selChar.change(function(){
+        var $this = $(this);
+        var char = $this.val();
+        if(char in charInfoText){
+            $charInfoText.html(charInfoText[char]);
+        }
+        else{
+            $charInfoText.html('');
+        }
+    });
+});
@@ -119,23 +119,11 @@ function reloadWorldMap(option){
            };
        }

-        function convertSpyList(arr){
-            var result = [];
-            arr.forEach(function(v){
-                var cityId = (v / 10) | 0;
-                var spy = v % 10;
-                result[cityId] = spy;
-            });
-            return result;
-        }
-
-        
-
        var cityList = obj.cityList.map(toCityObj);
        var nationList = obj.nationList.map(toNationObj);
        nationList = convertDictById(nationList); //array of object -> dict

-        var spyList = convertSpyList(obj.spyList);//Array -> Dict
+        var spyList = obj.spyList;
        var shownByGeneralList = convertSet(obj.shownByGeneralList);//Array -> Set

        var myCity = obj.myCity;
@@ -128,7 +128,7 @@ function redrawMsg(deferred){
            var $msgs = msgSource.map(function(msg){

                var contactTarget = (msg.src.id != myGeneralID) ? msg.src.id : msg.dest.id;
-                if(needRefreshLastContact && contactTarget != myGeneralID)
+                if(needRefreshLastContact && contactTarget != myGeneralID && contactTarget in generalList)
                {
                    needRefreshLastContact = false;
                    $('#last_contact').val(contactTarget).html(generalList[contactTarget].textName).show();
@@ -3,11 +3,19 @@ var templateGeneralCard =
    <h4 class="bg1 with_border"><%name%></h4>\
    <h4><img src="<%iconPath%>" height=64 width=64></h4>\
    <p><%leader%> / <%power%> / <%intel%><br>\
-    <%special%> / <%special2%></p>\
+    <%specialText%> / <%special2Text%></p>\
    <button type="subject" class="with_skin with_border select_btn" value="<%no%>" name="pick">빙의하기</button>\
    <label><input <%keepCnt?"":disabled="disabled"%> type="checkbox" value="<%no%>" name="keep[]" class="keep_select">보관(<%keepCnt%>회)</label>\
 </div>';

+var templateSpecial = 
+'<span class="obj_tooltip" data-toggle="tooltip" data-placement="top"><%text%>\
+    <span class="tooltiptext">\
+        <%info%>\
+    </span>\
+</span>\
+';
+
 function pickGeneral(){
    $btn = $(this);

@@ -85,12 +93,38 @@ function printGenerals(value){
    
    $.each(pick, function(idx, cardData){
        cardData.iconPath = getIconPath(cardData.imgsvr, cardData.picture);
+        if(cardData.special in specialInfo){
+            cardData.specialText = TemplateEngine(templateSpecial, {
+                text:cardData.special,
+                info:specialInfo[cardData.special]
+            });
+        }
+        else{
+            cardData.specialText = cardData.special;
+        }
+
+        if(cardData.special2 in specialInfo){
+            cardData.special2Text = TemplateEngine(templateSpecial, {
+                text:cardData.special2,
+                info:specialInfo[cardData.special2]
+            });
+        }
+        else{
+            cardData.special2Text = cardData.special2;
+        }
+        

        var $card = $(TemplateEngine(templateGeneralCard, cardData));
        console.log($card);

        $('.card_holder').append($card);
        $card.find('.select_btn').click(pickGeneral);
+        $card.find('.obj_tooltip').tooltip({
+            title:function(){
+                return $.trim($(this).find('.tooltiptext').html());
+            },
+            html:true
+        });
    });

    updatePickMoreTimer();
@@ -1,5 +1,5 @@
 <div 
-    class="msg_plate msg_plate_<%msgType%> msg_plate_<%nationType%>""
+    class="msg_plate msg_plate_<%msgType%> msg_plate_<%nationType%>"
    id="msg_<%id%>"
    data-id="<%id%>"
 >
@@ -125,6 +125,7 @@ function starter($name, $type=0) {
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printJS('js/base_map.js')?>
@@ -144,7 +145,7 @@ $(function(){
    });
 });
 </script>
-<?=WebUtil::printCSS('css/normalize.css')?>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/main.css')?>
@@ -186,7 +186,7 @@ class CityConst{
        }

        foreach(static::$initCity as $rawCity){
-            list(
+            [
                $id,
                $name,
                $level,
@@ -198,7 +198,7 @@ class CityConst{
                $wall,
                $region,
                $path
-            ) = $rawCity;
+            ] = $rawCity;

            $level = static::$levelMap[$level];
            $population *= 100;
@@ -300,7 +300,7 @@ class Diplomacy{
        $chk = $this->checkValidNation();
        $chk = $this->checkNonAggressionTreaty($chk);

-        list($result, $reason) = $chk;
+        [$result, $reason] = $chk;
        if($result !== DiplomaticMessage::ACCEPTED){
            return $chk;
        }
@@ -322,7 +322,7 @@ class Diplomacy{
        $chk = $this->checkValidNation();
        $chk = $this->checkInWar($chk);

-        list($result, $reason) = $chk;
+        [$result, $reason] = $chk;
        if($result !== DiplomaticMessage::ACCEPTED){
            return $chk;
        }
@@ -37,12 +37,12 @@ class Personnel{
        $this->nation = $nation;
        $this->valid = true;

-        list(
+        [
            $this->startYear,
            $this->year, 
            $this->month, 
            $this->killturn
-        ) = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'killturn']);
+        ] = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'killturn']);

    }

@@ -154,7 +154,7 @@ class ResetHelper{
            $year = $startyear;
        } else {
            // 현재 시간과 동기화
-            list($starttime, $yearPulled, $month) = cutDay($turntime, $turnterm);
+            [$starttime, $yearPulled, $month] = cutDay($turntime, $turnterm);
            if($yearPulled){
                $year = $startyear-1;
            }
@@ -27,15 +27,36 @@ $nationList = $db->query('SELECT nation,`name`,color,scout,scoutmsg FROM nation
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
-<?=WebUtil::printCSS('css/normalize.css')?>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('../css/config.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/select_npc.css')?>

+<script>
+var specialInfo = 
+<?php
+$specialAll = [];
+foreach (SpecialityConst::DOMESTIC as $id=>$values) {
+   $name = $values[0];
+   $text = getSpecialInfo($id);
+   $specialAll[$name] = $text;
+}
+foreach (SpecialityConst::WAR as $id=>$values) {
+    $name = $values[0];
+    $text = getSpecialInfo($id);
+    $specialAll[$name] = $text;
+}
+$specialAll['-'] = '없음';
+echo Json::encode($specialAll);
+?>
+;    
+</script>
+
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../js/common.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printJS('js/select_npc.js')?>

 </head>
@@ -199,7 +199,7 @@ CREATE TABLE `nation` (
 	`tech` INT(8) NULL DEFAULT '0',
 	`totaltech` INT(8) NULL DEFAULT '0',
 	`power` INT(8) NULL DEFAULT '0',
-	`spy` CHAR(255) NULL DEFAULT '',
+	`spy` CHAR(255) NOT NULL DEFAULT '{}',
 	`level` INT(1) NULL DEFAULT '0',
 	`type` INT(2) NULL DEFAULT '0',
 	`rule` TEXT NULL DEFAULT '',
@@ -1,4 +1,4 @@
-<div class="rankView bg0" style="border:1px solid gray;">
+<div class="rankView bg0" style="outline-style:solid;outline-width:1px;outline-color: gray;">
 <h3 class="rankType bg1"><?=$typeName?></h3>
 <ul>
 <?php foreach($generals as $rank=>$general): ?><li class='<?=(key_exists("rankName", $general))?'no_value':''?> <?=(key_exists("serverName", $general))?'has_server':''?>'>
@@ -7,7 +7,7 @@
    </div>
    <div class="hall_img"><img width="64" height="64" src="<?=$general['pictureFullPath']?>"></div>
    <?php if(key_exists("serverName",$general)): ?>
-    <div class="hall_server tooltip"><?=$general['serverName']?><?=$general['serverIdx']?>기
+    <div class="hall_server obj_tooltip" data-toggle="tooltip" data-placement="top"><?=$general['serverName']?><?=$general['serverIdx']?>기
        <span class="tooltiptext">
            <?=$general['scenarioName']?><br>
            <?=substr($general['startTime'], 0, 10)?> ~ <?=substr($general['unitedTime'], 0, 10)?>
@@ -0,0 +1,5 @@
+<span class="obj_tooltip" data-toggle="tooltip" data-placement="top"><?=$text??''?>
+    <span class="tooltiptext">
+        <?=$info??''?>
+    </span>
+</span>
@@ -3,10 +3,11 @@ namespace sammo;

 class Json
 {
-    const PRETTY = 1;
-    const DELETE_NULL = 2;
-    const NO_CACHE = 4;
-    const PASS_THROUGH = 8;
+    const PRETTY = 1 << 0;
+    const DELETE_NULL = 1 << 1;
+    const NO_CACHE = 1 << 2;
+    const PASS_THROUGH = 1 << 3;
+    const EMPTY_ARRAY_IS_DICT = 1 << 4;

    public static function encode($value, $flag = 0)
    {
@@ -17,6 +18,10 @@ class Json
        if ($flag & static::DELETE_NULL) {
            $value = Util::eraseNullValue($value);
        }
+
+        if(($flag & static::EMPTY_ARRAY_IS_DICT) && $value === []){
+            $value = (object)null;
+        }
        return json_encode($value, $rawFlag);
    }

@@ -25,6 +30,12 @@ class Json
        return json_decode($value, true);
    }

+    public static function decodeObj($value){
+        //NOTE: 구 코드가 모두 '배열'을 가정하기 때문에 decode는 연관배열로 반환하였으나, 
+        //호환을 위해서는object로 반환하는 것이 더 나을것
+        return json_decode($value);
+    }
+
    public static function die($value, $flag = self::NO_CACHE)
    {
        //NOTE: REST 형식에 맞게, ok(), fail()로 쪼개는게 낫지 않을까 생각해봄.
@@ -160,6 +160,9 @@ class Util extends \utilphp\util
            if ($val == null) {
                return null;
            }
+            if ($val == ''){
+                return null;
+            }
            return intval($val);
        }
        throw new \InvalidArgumentException('올바르지 않은 타입형 :'.$val);
Author	SHA1	Message	Date
Hide_D	f2a3bc4626	메시지함 높이 고정을 최소 높이로 변경	2018-07-11 23:49:57 +09:00
Hide_D	e8ffa44544	메시지함 사라지는 버그 수정?	2018-07-11 23:04:38 +09:00
Hide_D	bc09287666	도움 주신 분 임시 삭제. 나중에 Credit으로 되살리기로	2018-07-11 22:37:36 +09:00
Hide_D	392d9055fe	td tr 되돌려놓음	2018-07-11 22:18:08 +09:00
Hide_D	0ee833d7ae	list 일부 수정. tfoot 안에 tr td없는거 수정	2018-07-11 22:17:03 +09:00
Hide_D	3074bc00d7	지도 표기에서 box 표기 문제로 일부 수정	2018-07-11 22:04:20 +09:00
Hide_D	cb6fb590c4	귀병, 환술 설명 수정	2018-07-11 21:53:13 +09:00
Hide_D	a7270b2cd2	장수 성격, 아이템 설명 툴팁 추가	2018-07-11 21:50:01 +09:00
Hide_D	0d925af065	tooltip html trim 추가	2018-07-11 20:52:46 +09:00
Hide_D	7c7991e8ae	특기 없을 때 텍스트 수정	2018-07-11 20:51:13 +09:00
Hide_D	54461b6ea4	특기가 없는 경우에도 tooltip 띄우도록	2018-07-11 17:03:47 +09:00
Hide_D	6a17497fbd	빙의 시에도 전특 표기	2018-07-11 03:27:27 +09:00
Hide_D	84f18aa4b6	특기 전 페이지에 반영	2018-07-11 03:03:52 +09:00
Hide_D	73ab38563f	특기 마우스 오버 1차 적용	2018-07-11 02:47:31 +09:00
Hide_D	1f2b40e4d4	message form box sizing 변경. 메인 페이지에 bootstrap css 적용	2018-07-11 01:31:59 +09:00
Hide_D	1d920c5935	darkly 적용	2018-07-11 01:19:24 +09:00
Hide_D	037a1e9c0c	툴팁 준비	2018-07-11 01:15:22 +09:00
Hide_D	87e324d4d9	bootstrap 최신 버전으로	2018-07-11 01:15:02 +09:00
Hide_D	d1e9b489e3	공성 전특 버그 수정. 전특 설명을 위한 텍스트 추가	2018-07-11 00:53:10 +09:00
Hide_D	34f1d538d1	세력도시에서 n장, m장 임명이 불가능한 버그 수정	2018-07-07 05:13:22 +09:00
Hide_D	fb8d2a2e01	구버전 첩보 마이그레이션시 지도 표기 버그 수정	2018-07-07 04:58:19 +09:00
Hide_D	837db5183e	첩보를 join '\|' 에서 json dict로 변경	2018-07-07 04:39:44 +09:00