kvstorage 버그 수정

KVStorage를 전역으로 이동

composer.json

@@ -16,7 +16,8 @@
         "firephp/firephp-core": "^0.4.0",
         "vlucas/valitron": "^1.4",
         "php-extended/php-tail": "^2.1",
-        "pguardiario/phpuri": "^1.0"
+        "pguardiario/phpuri": "^1.0",
+        "symfony/lock": "^3.4"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "1753c2c2ad9fe40ecc5c6ae541dd2e78",
+    "content-hash": "a329d39be5161c87438d41f9adf4417b",
     "packages": [
         {
             "name": "brandonwamboldt/utilphp",
@@ -454,6 +454,54 @@
             ],
             "time": "2017-06-19T01:22:40+00:00"
         },
+        {
+            "name": "paragonie/random_compat",
+            "version": "v2.0.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/random_compat.git",
+                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
+                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*|5.*"
+            },
+            "suggest": {
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/random.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
+            ],
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "keywords": [
+                "csprng",
+                "pseudorandom",
+                "random"
+            ],
+            "time": "2018-04-04T21:24:14+00:00"
+        },
         {
             "name": "pguardiario/phpuri",
             "version": "1.0",
@@ -702,6 +750,127 @@
             ],
             "time": "2014-06-16T22:40:22+00:00"
         },
+        {
+            "name": "symfony/lock",
+            "version": "v3.4.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/lock.git",
+                "reference": "3a707193326d31603824706e34a95af899a59788"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/3a707193326d31603824706e34a95af899a59788",
+                "reference": "3a707193326d31603824706e34a95af899a59788",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "psr/log": "~1.0",
+                "symfony/polyfill-php70": "~1.0"
+            },
+            "require-dev": {
+                "predis/predis": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Lock\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                },
+                {
+                    "name": "Jérémy Derussé",
+                    "email": "jeremy@derusse.com"
+                }
+            ],
+            "description": "Symfony Lock Component",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "cas",
+                "flock",
+                "locking",
+                "mutex",
+                "redlock",
+                "semaphore"
+            ],
+            "time": "2018-04-29T14:44:26+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php70",
+            "version": "v1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/77454693d8f10dd23bb24955cffd2d82db1007a6",
+                "reference": "77454693d8f10dd23bb24955cffd2d82db1007a6",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": "~1.0|~2.0",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php70\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2018-04-26T10:06:28+00:00"
+        },
         {
             "name": "vlucas/valitron",
             "version": "v1.4.2",

f_install/install.php

@@ -10,13 +10,13 @@ require(__dir__.'/../vendor/autoload.php');
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>설치</title>
-    <script src="../e_lib/jquery-3.2.1.min.js"></script>
-    <script src="../e_lib/bootstrap.bundle.min.js"></script>
-    <script src="../e_lib/jquery.validate.min.js"></script>
-    <script src="../e_lib/sha512.min.js"></script>
-    <script src="../js/install.js"></script>
-    <link type="text/css" rel="stylesheet" href="../e_lib/bootstrap.min.css">
-    <link type="text/css" rel="stylesheet" href="../css/install.css">
+    <?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+    <?=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/install.js')?>
+    <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+    <?=WebUtil::printCSS('../css/install.css')?>
 </head>
 <body>
     <div class="container">

f_install/sql/common_schema.sql

@@ -2,7 +2,6 @@
 DROP TABLE IF EXISTS `system`;
 DROP TABLE IF EXISTS `member`;
 DROP TABLE IF EXISTS `member_log`;
-DROP TABLE IF EXISTS `config`;
 
 -- 시스템 테이블
 -- TODO:장기적으로는 key-value(json) storage 형태로 바꾸는게 나을 듯.
@@ -57,11 +56,16 @@ CREATE TABLE `member_log` (
 )
 ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
-CREATE TABLE `config` (
+###################
+# KV storage
+###################
+CREATE TABLE `storage` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`key` VARCHAR(50) NOT NULL,
-	`value` VARCHAR(100) NULL DEFAULT NULL,
+	`namespace` VARCHAR(40) NOT NULL,
+	`key` VARCHAR(40) NOT NULL,
+	`value` TEXT NOT NULL,
 	PRIMARY KEY (`id`),
-	UNIQUE INDEX `key` (`key`)
+	UNIQUE INDEX `key` (`namespace`, `key`)
 )
-ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+COLLATE='utf8mb4_general_ci'
+ENGINE=MyISAM

hwe/_119.php

@@ -6,14 +6,14 @@ include "func.php";
 
 $session = Session::requireGameLogin()->setReadOnly();
 if($session->userGrade < 4) {
-    ?><!DOCTYPE html>
+?>
 <!DOCTYPE html>
 <html>
 <head>
 <title>관리메뉴</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
 관리자가 아닙니다.<br>
@@ -25,11 +25,10 @@ if($session->userGrade < 4) {
 }
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
-$query = "select turntime,tnmt_time from game";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
+list($turntime, $tnmt_time) = $gameStor->getValuesAsArray(['turntime','tnmt_time']);
 
 $query = "select plock from plock";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -40,13 +39,13 @@ $plock = MYDB_fetch_array($result);
 <head>
 <title>삼국지 모의전투 HiDCHe</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
     <form action=_119_b.php method=post>
-    시간조정 : <input type=text size=3 name=minute><input type=submit name=btn value='분당김'><input type=submit name=btn value='분지연'> 최종갱신 : <?=$admin['turntime']?><br>
-    시간조정 : <input type=text size=3 name=minute2><input type=submit name=btn value='토너분당김'><input type=submit name=btn value='토너분지연'> 토너먼트 : <?=$admin['tnmt_time']?><br>
+    시간조정 : <input type=text size=3 name=minute><input type=submit name=btn value='분당김'><input type=submit name=btn value='분지연'> 최종갱신 : <?=$turntime?><br>
+    시간조정 : <input type=text size=3 name=minute2><input type=submit name=btn value='토너분당김'><input type=submit name=btn value='토너분지연'> 토너먼트 : <?=$tnmt_time?><br>
     봉급지급 : <input type=submit name=btn value='금지급'><input type=submit name=btn value='쌀지급'><br>
     락 풀 기 : <input type=submit name=btn value='락걸기'><input type=submit name=btn value='락풀기'> 현재 : <?=$plock['plock']>0?"동결중":"가동중"?><br>
     </form>

hwe/_119_b.php

@@ -27,32 +27,51 @@ $minute2 = Util::getReq('minute2', 'int');
 extractMissingPostToGlobals();
 
 $db = DB::db();
-$connect=$db->get();
-
+$gameStor = KVStorage::getStorage($db, 'game_env');
 switch($btn) {
 case "분당김":
-    $query = "update game set turntime=DATE_SUB(turntime, INTERVAL $minute MINUTE),starttime=DATE_SUB(starttime, INTERVAL $minute MINUTE),tnmt_time=DATE_SUB(tnmt_time, INTERVAL $minute MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $query = "update general set turntime=DATE_SUB(turntime, INTERVAL $minute MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $query = "update auction set expire=DATE_SUB(expire, INTERVAL $minute MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->cacheValues('turntime', 'starttime', 'tnmt_time');
+    $turntime = (new \DateTimeImmutable($gameStor->turntime))->sub(new \DateInterval("PT{$minute}M"));
+    $starttime = (new \DateTimeImmutable($gameStor->starttime))->sub(new \DateInterval("PT{$minute}M"));
+    $tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->sub(new \DateInterval("PT{$minute}M"));
+
+    $gameStor->turntime = $turntime->format('Y-m-d H:i:s');
+    $gameStor->starttime = $starttime->format('Y-m-d H:i:s');
+    $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
+
+    $db->update('general', [
+        'turntime'=>$db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
+    ], true);
+    $db->update('auction', [
+        'expire'=>$db->sqleval('DATE_ADD(expire, INTERVAL %i MINUTE)', $minute)
+    ], true);
     break;
 case "분지연":
-    $query = "update game set turntime=DATE_ADD(turntime, INTERVAL $minute MINUTE),starttime=DATE_ADD(starttime, INTERVAL $minute MINUTE),tnmt_time=DATE_ADD(tnmt_time, INTERVAL $minute MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $query = "update general set turntime=DATE_ADD(turntime, INTERVAL $minute MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $query = "update auction set expire=DATE_ADD(expire, INTERVAL $minute MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->cacheValues('turntime', 'starttime', 'tnmt_time');
+    $turntime = (new \DateTimeImmutable($gameStor->turntime))->add(new \DateInterval("PT{$minute}M"));
+    $starttime = (new \DateTimeImmutable($gameStor->starttime))->add(new \DateInterval("PT{$minute}M"));
+    $tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->add(new \DateInterval("PT{$minute}M"));
+
+    $gameStor->turntime = $turntime->format('Y-m-d H:i:s');
+    $gameStor->starttime = $starttime->format('Y-m-d H:i:s');
+    $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
+
+    $db->update('general', [
+        'turntime'=>$db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
+    ], true);
+    $db->update('auction', [
+        'expire'=>$db->sqleval('DATE_ADD(expire, INTERVAL %i MINUTE)', $minute)
+    ], true);
     break;
 case "토너분당김":
-    $query = "update game set tnmt_time=DATE_SUB(tnmt_time, INTERVAL $minute2 MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $tnmt_time = new \DateTime($gameStor->tnmt_time);
+    $tnmt_time->sub(new \DateInterval("PT{$minute2}M"));
+    $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
     break;
 case "토너분지연":
-    $query = "update game set tnmt_time=DATE_ADD(tnmt_time, INTERVAL $minute2 MINUTE)";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $tnmt_time = new \DateTimeImmutable($gameStor->tnmt_time);
+    $tnmt_time->add(new \DateInterval("PT{$minute2}M"));
+    $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
     break;
 case "금지급":
     processGoldIncome();
@@ -61,12 +80,10 @@ case "쌀지급":
     processRiceIncome();
     break;
 case "락걸기":
-    $query = "update plock set plock=1";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('plock', ['plock'=>1], true);
     break;
 case "락풀기":
-    $query = "update plock set plock=0";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('plock', ['plock'=>0], true);
     break;
 }
 

hwe/_admin1.php

@@ -7,22 +7,21 @@ include "func.php";
 $session = Session::requireGameLogin()->setReadOnly();
 
 if($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
+?>
+<!DOCTYPE html>
 <html>
 <head>
 <title>관리메뉴</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
 관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
+    <?=banner()?>
 </body>
-</html>";
-
+</html>
+<?php
     exit();
 }
 
@@ -36,15 +35,15 @@ $admin = getAdmin();
 <head>
 <title>게임관리</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class="tb_layout bg0">
     <tr><td>게 임 관 리<br><?=backButton()?></td></tr>
 </table>
 <form name=form1 method=post action=_admin1_submit.php>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class="tb_layout bg0">
     <tr><td width=110 align=right>운영자메세지</td>
         <td colspan=3><input type=textarea size=90 style=color:white;background-color:black; name=msg value='<?=$admin['msg']?>'><input type=submit name=btn value=변경></td></td>
     </tr>
@@ -81,7 +80,7 @@ $admin = getAdmin();
     </tr>
 </table>
 </form>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/_admin1_submit.php

@@ -33,15 +33,14 @@ $startyear = Util::getReq('startyear', 'int', GameConst::$defaultStartYear);
 extractMissingPostToGlobals();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 $admin = getAdmin();
 
 switch ($btn) {
     case "변경":
-        $msg = addslashes(SQ2DQ($msg));
-        $query = "update game set msg='$msg'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+        $gameStor->msg = $msg;
         break;
     case "로그쓰기":
         $lognum = $admin['historyindex'] + 1;
@@ -51,20 +50,16 @@ switch ($btn) {
         pushWorldHistory(["<R>★</><S>{$log}</>"]);
         break;
     case "변경1":
-        $query = "update game set starttime='$starttime'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+        $gameStor->starttime = (new \DateTime($starttime))->format('Y-m-d H:i:s');
         break;
     case "변경2":
-        $query = "update game set maxgeneral='$maxgeneral'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+        $gameStor->maxgeneral = $maxgeneral;
         break;
     case "변경3":
-        $query = "update game set maxnation='$maxnation'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+        $gameStor->maxnation = $maxnation;
         break;
     case "변경4":
-        $query = "update game set startyear='$startyear'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+        $gameStor->startyear = $startyear;
         break;
     case "1분턴":
     case "2분턴":
@@ -88,8 +83,8 @@ switch ($btn) {
         $turn = ($admin['year'] - $admin['startyear']) * 12 + $admin['month'] - 1;
         $starttime = date("Y-m-d H:i:s", strtotime($admin['turntime']) - $turn * $unit);
         $starttime = cutTurn($starttime, $turnterm);
-        $query = "update game set turnterm='$turnterm',starttime='$starttime'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+        $gameStor->turnterm = $turnterm;
+        $gameStor->starttime = $starttime;
         // 턴시간이 길어지는 경우 랜덤턴 배정
         if ($turnterm < $admin['turnterm']) {
             $query = "select no from general";

hwe/_admin2.php

@@ -7,52 +7,47 @@ include "func.php";
 $session = Session::requireGameLogin()->setReadOnly();
 
 if($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
+?>
+<!DOCTYPE html>
 <html>
 <head>
 <title>관리메뉴</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
 관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
+    <?=banner()?>
 </body>
-</html>";
-
+</html>
+<?php
     exit();
 }
 
 $db = DB::db();
-$connect=$db->get();
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
 ?>
 <!DOCTYPE html>
 <html>
 <head>
 <title>회원관리</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>회 원 관 리<br><?=backButton()?></td></tr>
 </table>
 <form name=form1 method=post action=_admin2_submit.php>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td width=80 align=center>접속제한</td>
         <td width=713 align=center><input type=submit name=btn value='전체 접속허용'><input type=submit name=btn value='전체 접속제한'></td>
     </tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td width=80 align=center rowspan=12>회원선택<br><br><font color=cyan>NPC</font><br><font color=skyblue>NPC유저</font><br><font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b></td>
         <td width=105 rowspan=12>
@@ -60,13 +55,9 @@ $admin = MYDB_fetch_array($result);
 
 echo "
             <select name=genlist[] size=20 multiple style=color:white;background-color:black;font-size:13>";
+$generalList = $db->query('SELECT `no`, `name`, npc, `block` FROM general ORDER BY npc, binary(`name`)');
 
-$query = "select no,name,npc,block from general order by npc,binary(name)";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($result);
-
-for($i=0; $i < $gencount; $i++) {
-    $general = MYDB_fetch_array($result);
+foreach($generalList as $general){
     $style = "style=;";
     if($general['block']         > 0) { $style .= "background-color:red;"; }
     if($general['npc']          >= 2) { $style .= "color:cyan;"; }
@@ -131,7 +122,7 @@ for($i=0; $i < 27; $i++) {
     </tr>
 </table>
 </form>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/_admin2_submit.php

@@ -22,6 +22,7 @@ if(!$generalID){
 }
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 $src = MessageTarget::buildQuick($session->generalID);
@@ -97,7 +98,7 @@ switch($btn) {
         ], '`no` IN %li', $genlist);
         break;
     case "특기 부여":
-        list($year, $month) = $db->queryFirstList('select `year`, `month` from `game` where `no`=1');
+        list($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){    
@@ -326,7 +327,7 @@ switch($btn) {
         ], '`no` IN %li', $genlist);
         break;
     case "00턴":
-        $turnterm = $db->queryFirstField('SELECT turnterm FROM game LIMIT 1');
+        $turnterm = $gameStor->turnterm;
 
         foreach($genlist as $generalID){
             $turntime = getRandTurn($turnterm);

hwe/_admin4.php

@@ -7,46 +7,44 @@ include "func.php";
 $session = Session::requireGameLogin()->setReadOnly();
 
 if($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
+?>
+<!DOCTYPE html>
 <html>
 <head>
 <title>관리메뉴</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
 관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
+    <?=banner()?>
 </body>
-</html>";
-
+</html>
+<?php
     exit();
 }
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
+$conlimit = $gameStor->conlimit;
 ?>
 <!DOCTYPE html>
 <html>
 <head>
 <title>멀티관리</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>멀 티 관 리<br><?=backButton()?></td></tr>
 </table>
 <form name=form1 method=post action=_admin4_submit.php>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td width=80 align=center rowspan=3>회원선택<br><br><font color=cyan>NPC</font><br><font color=skyblue>NPC유저</font><br><font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b></td>
         <td width=105 rowspan=3>
@@ -65,7 +63,7 @@ for($i=0; $i < $gencount; $i++) {
     if($general['block']         > 0) { $style .= "background-color:red;"; }
     if($general['npc']          >= 2) { $style .= "color:cyan;"; }
     elseif($general['npc']      == 1) { $style .= "color:skyblue;"; }
-    if($general['con'] > $admin['conlimit']) { $style .= "color:red;"; }
+    if($general['con'] > $conlimit) { $style .= "color:red;"; }
 
     echo "
                 <option value={$general['no']} $style>{$general['name']}</option>";
@@ -90,7 +88,7 @@ echo "
         <td><input type=textarea size=60 maxlength=255 name=msg style=background-color:black;color:white;><input type=submit name=btn value='메세지 전달'></td>
     </tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td align=center width=100>장수명</td>
         <td align=center width=180>최근로그인</td>
@@ -137,7 +135,7 @@ echo "
 //NOTE: password의 md5 해시가 같은지 확인하는 방식으로는 앞으로 잡아낼 수 없다. 폐기
 ?>
 </form>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/_admin5.php

@@ -20,22 +20,21 @@ extractMissingPostToGlobals();
 $session = Session::requireGameLogin()->setReadOnly();
 
 if($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
+?>
+<!DOCTYPE html>
 <html>
 <head>
 <title>관리메뉴</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
 관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
+    <?=banner()?>
 </body>
-</html>";
-
+</html>
+<?php
     exit();
 }
 
@@ -47,20 +46,17 @@ $sel2 = [];
 $sel[$type] = "selected";
 $sel2[$type2] = "selected";
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
 ?>
 <!DOCTYPE html>
 <html>
 <head>
 <title>일제정보</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>일 제 정 보<br><?=closeButton()?></td></tr>
     <tr><td>
         <form name=form1 method=post>정렬순서 :
@@ -115,7 +111,7 @@ for($i=1; $i <= $count; $i++) {
     </td></tr>
 </table>
 
-<table align=center width=1600 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px; id=bg0>
+<table align=center width=1600 class="tb_layout bg0">
     <tr id=bg1>
         <td align=center>국명</td>
         <td align=center>접률</td>
@@ -262,11 +258,11 @@ for($i=0; $i < $nationCount; $i++) {
 
 ?>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=getSabotageLogRecent(20)?></td></tr>
 </table>
 
-<table align=center width=1760 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px; id=bg0>
+<table align=center width=1760 class="tb_layout bg0">
     <tr id=bg1>
         <td width=30 align=center>년</td>
         <td width=30 align=center>월</td>
@@ -317,7 +313,7 @@ for($i=0; $i < $count; $i++) {
 ?>
 </table>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/_admin6.php

@@ -14,22 +14,21 @@ extractMissingPostToGlobals();
 $session = Session::requireGameLogin()->setReadOnly();
 
 if($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
+?>
+<!DOCTYPE html>
 <html>
 <head>
 <title>관리메뉴</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
 관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
+    <?=banner()?>
 </body>
-</html>";
-
+</html>
+<?php
     exit();
 }
 
@@ -44,11 +43,11 @@ $sel[$type] = "selected";
 <head>
 <title>접속정보</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>접 속 정 보<br><?=closeButton()?></td></tr>
     <tr><td><form name=form1 method=post>정렬순서 :
         <select name=type size=1>
@@ -61,7 +60,7 @@ $sel[$type] = "selected";
         <input type=submit value='정렬하기'></form>
     </td></tr>
 </table>
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center class='tb_layout bg0'>
     <tr id=bg1>
         <td align=center width=120>장수명</td>
         <td align=center width=50>접속률</td>
@@ -100,7 +99,7 @@ for($i=0; $i < $gencount; $i++) {
 
 ?>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/_admin7.php

@@ -18,22 +18,21 @@ extractMissingPostToGlobals();
 $session = Session::requireGameLogin()->setReadOnly();
 
 if($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
+?>
+<!DOCTYPE html>
 <html>
 <head>
 <title>관리메뉴</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
 관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
+    <?=banner()?>
 </body>
-</html>";
-
+</html>
+<?php
     exit();
 }
 
@@ -51,11 +50,11 @@ $sel[$type] = "selected";
 <head>
 <title>로그정보</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>로 그 정 보<br><?=closeButton()?></td></tr>
     <tr><td>
         <form name=form1 method=post>
@@ -99,7 +98,7 @@ for($i=0; $i < $gencount; $i++) {
         </form>
     </td></tr>
 </table>
-<table width=1000 align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table width=1000 align=center class='tb_layout bg0'>
     <tr>
         <td width=50% align=center id=bg1><font color=skyblue size=3>장 수 정 보</font></td>
         <td width=50% align=center id=bg1><font color=orange size=3>-</font></td>
@@ -136,7 +135,7 @@ for($i=0; $i < $gencount; $i++) {
         </td>
     </tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/_admin8.php

@@ -14,22 +14,21 @@ extractMissingPostToGlobals();
 $session = Session::requireGameLogin()->setReadOnly();
 
 if ($session->userGrade < 5) {
-    echo "<!DOCTYPE html>
+?>
+<!DOCTYPE html>
 <html>
 <head>
 <title>관리메뉴</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
 관리자가 아닙니다.<br>
-";
-    echo banner();
-    echo "
+    <?=banner()?>
 </body>
-</html>";
-
+</html>
+<?php
     exit();
 }
 
@@ -47,11 +46,11 @@ $sel[$type] = "selected";
 <head>
 <title>외교정보</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>외 교 정 보<br><?=closeButton()?></td></tr>
     <tr><td>
         <form name=form1 method=post>
@@ -63,7 +62,7 @@ $sel[$type] = "selected";
         </form>
     </td></tr>
 </table>
-<table width=1000 align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table width=1000 align=center class='tb_layout bg0'>
     <tr><td colspan=9 align=center bgcolor=blue>외 교 관 계</td></tr>
     <tr>
         <td width=100 align=center id=bg1>국 가 명</td>
@@ -155,7 +154,7 @@ for ($i=0; $i < $dipcount; $i++) {
 }
 ?>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/_simul.php

@@ -74,6 +74,7 @@ $dec = 0;
 $rice = 0;
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 increaseRefresh("시뮬", 2);
 
@@ -81,11 +82,9 @@ $query = "select no,tournament,con,turntime from general where owner='{$userID}'
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
 
-$query = "select * from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$game = MYDB_fetch_array($result);
+$game_env = $gameStor->getAll();
 
-$con = checkLimit($me['con'], $game['conlimit']);
+$con = checkLimit($me['con']);
 if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 
 if($session->userGrade < 3) {
@@ -173,7 +172,7 @@ if($isgen == "장수공격" || $isgen == "성벽공격" || $isgen == "장수평
             $opposecount = 0;
         }
 
-        $warphase = getRate($game, $general['crewtype'], "spd");   //병종간 페이즈 수 얻기
+        $warphase = getRate($game_env, $general['crewtype'], "spd");   //병종간 페이즈 수 얻기
 
         // 우선 스케일링
         $city['def'] *= 10;
@@ -301,7 +300,7 @@ if($isgen == "장수공격" || $isgen == "성벽공격" || $isgen == "장수평
                     }
                     //회피
                     $ratio = rand() % 100; // 0 ~ 99
-                    $ratio2 = getRate($game, $general['crewtype'], "avd");   //회피율
+                    $ratio2 = getRate($game_env, $general['crewtype'], "avd");   //회피율
                     if($ratio < $ratio2 && $avoid == 1) {
                         $msg .= "<C>●</><C>회피</>했다!</><br>";
                         $myCrew /= 10; // 10%만 소모
@@ -665,7 +664,7 @@ if($isgen == "장수공격" || $isgen == "성벽공격" || $isgen == "장수평
                     }
                     //회피
                     $ratio = rand() % 100; // 0 ~ 99
-                    $ratio2 = getRate($game, $general['crewtype'], "avd");   //회피율
+                    $ratio2 = getRate($game_env, $general['crewtype'], "avd");   //회피율
                     if($ratio < $ratio2 && $myAvoid == 1) {
                         $msg .= "<C>●</><C>회피</>했다!</><br>";
                         $myCrew /= 10; // 10%만 소모
@@ -673,7 +672,7 @@ if($isgen == "장수공격" || $isgen == "성벽공격" || $isgen == "장수평
                     }
                     //회피
                     $ratio = rand() % 100; // 0 ~ 99
-                    $ratio2 = getRate($game, $oppose['crewtype'], "avd");   //회피율
+                    $ratio2 = getRate($game_env, $oppose['crewtype'], "avd");   //회피율
                     if($ratio < $ratio2 && $opAvoid == 1) {
                         $msg .= "<C>●</>상대가 <R>회피</>했다!</><br>";
                         $opCrew /= 10; // 10%만 소모
@@ -802,8 +801,8 @@ if($isgen == "장수공격" || $isgen == "성벽공격" || $isgen == "장수평
 
     $def = 7000;
     $wall = 7000;
-    $train3 = $game['city_rate'];
-    $atmos3 = $game['city_rate'];
+    $train3 = $game_env['city_rate'];
+    $atmos3 = $game_env['city_rate'];
 }
 
 switch($level1) {
@@ -1140,8 +1139,8 @@ switch($dex240) {
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title>전투시뮬레이션</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 <style type="text/css">
 select { background-color:black;color:white; }
 input { background-color:black;color:white; }
@@ -1151,7 +1150,7 @@ input { background-color:black;color:white; }
 
 <body>
 <form method=post action=_simul.php>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr id=bg1>
         <td>공격장수</td>
         <td>상대장수</td>
@@ -1584,7 +1583,7 @@ if($isgen == "장수공격" || $isgen == "성벽공격") {
 ?>
     </td></tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr id=bg1>
         <td align=right></td>
         <td align=center>공격</td>
@@ -1598,31 +1597,31 @@ if($isgen == "장수공격" || $isgen == "성벽공격") {
 
 <?php
     for($i=0; $i <= 5; $i++) {
-        printSimul($game, $i);
+        printSimul($game_env, $i);
     }
     echo "
     <tr><td height=5 colspan=8 id=bg1></td></tr>";
 
     for($i=10; $i <= 14; $i++) {
-        printSimul($game, $i);
+        printSimul($game_env, $i);
     }
     echo "
     <tr><td height=5 colspan=8 id=bg1></td></tr>";
 
     for($i=20; $i <= 27; $i++) {
-        printSimul($game, $i);
+        printSimul($game_env, $i);
     }
     echo "
     <tr><td height=5 colspan=8 id=bg1></td></tr>";
 
     for($i=30; $i <= 38; $i++) {
-        printSimul($game, $i);
+        printSimul($game_env, $i);
     }
     echo "
     <tr><td height=5 colspan=8 id=bg1></td></tr>";
 
     for($i=40; $i <= 43; $i++) {
-        printSimul($game, $i);
+        printSimul($game_env, $i);
     }
     echo "
     <tr><td height=5 colspan=8 id=bg1></td></tr>";
@@ -1633,13 +1632,13 @@ if($isgen == "장수공격" || $isgen == "성벽공격") {
 </html>
 <?php
 
-function printSimul($game, $i) {
-    $att = $game["att{$i}"];
-    $def = $game["def{$i}"];
-    $spd = $game["spd{$i}"];
-    $avd = $game["avd{$i}"];
-    $cst = $game["cst{$i}"];
-    $ric = $game["ric{$i}"];
+function printSimul($game_env, $i) {
+    $att = $game_env["att{$i}"];
+    $def = $game_env["def{$i}"];
+    $spd = $game_env["spd{$i}"];
+    $avd = $game_env["avd{$i}"];
+    $cst = $game_env["cst{$i}"];
+    $ric = $game_env["ric{$i}"];
     echo "
     <tr>
         <td align=right>".GameUnitConst::byId($i)->name."</td>

hwe/a_bestGeneral.php

@@ -13,19 +13,16 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("명장일람", 2);
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
 $query = "select con,turntime from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
@@ -37,16 +34,16 @@ if ($con >= 2) {
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 명장일람</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>명 장 일 람<br><?=closeButton()?></td></tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
 <form name=form1 action=a_bestGeneral.php method=post>
     <tr><td align=center>
         <input type=submit name=btn value='유저 보기'>
@@ -54,7 +51,7 @@ if ($con >= 2) {
     </td></tr>
 </form>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
 <?php
 if (isset($btn) && $btn == "NPC 보기") {
     //FIXME: query가 너무 적나라.
@@ -101,6 +98,7 @@ for ($i=0; $i < 21; $i++) {
     $color = [];
     $pic = [];
 
+    //FIXME: 쿼리에 index를 사용할 수 없는 녀석들이 있다. 그냥 모두 받아서 일괄 처리하는게 더 나을 수도 있음.
     switch ($i) {
     case  0: $query = "select nation,no,name,picture,imgsvr,experience as data from general where $sel order by data desc limit 0,10"; break;
     case  1: $query = "select nation,no,name,picture,imgsvr,dedication as data from general where $sel order by data desc limit 0,10"; break;
@@ -202,7 +200,7 @@ for ($i=0; $i < 21; $i++) {
 echo "
 </table>
 <br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
 ";
 
 $type = array(
@@ -340,7 +338,7 @@ for ($i=0; $i < 4; $i++) {
 
 ?>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/a_emperior.php

@@ -19,13 +19,13 @@ increaseRefresh("왕조일람", 2);
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 왕조일람</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style="font-size:13px;word-break:break-all;color:white;background-color:black" id=bg0>
+<table align=center width=1000 class="tb_layout bg0">
     <tr><td>역 대 왕 조<br>
         <input type=button value='창 닫기' onclick=window.close()><br>
     </td></tr>
@@ -43,7 +43,7 @@ if ($select == 0) {
 
         echo "
 <form action=a_emperior.php method=post>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style='font-size:13px;word-break:break-all;color:white;' id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td bgcolor=skyblue align=center colspan=8>
             <font size=5>{$emperior['phase']}</font>
@@ -85,7 +85,7 @@ if ($select == 0) {
     $emperior = MYDB_fetch_array($result);
 
     echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style='font-size:13px;word-break:break-all;color:white;' id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td bgcolor=skyblue align=center colspan=6>
             <font size=5>{$emperior['phase']}</font>
@@ -197,7 +197,7 @@ if ($select == 0) {
 }
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all;color:white; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/a_emperior2.php

@@ -19,13 +19,13 @@ increaseRefresh("왕조일람", 2);
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 왕조일람</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>역 대 왕 조<br>
         <input type=button value='창 닫기' onclick=window.close()><br>
     </td></tr>
@@ -43,7 +43,7 @@ if ($select == 0) {
 
         echo "
 <form action=a_emperior2.php method=post>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td bgcolor=skyblue align=center colspan=8>
             <font size=5>{$emperior['phase']}</font>
@@ -86,7 +86,7 @@ if ($select == 0) {
 
     echo "
 <form action=a_emperior2.php method=post>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td bgcolor=skyblue align=center colspan=6>
             <font size=5>{$emperior['phase']}</font>
@@ -198,7 +198,7 @@ if ($select == 0) {
 }
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/a_genList.php

@@ -13,19 +13,16 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("장수일람", 2);
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
 $query = "select con,turntime from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
@@ -42,14 +39,15 @@ if ($type <= 0 || $type > 15) {
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 장수일람</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-<script type="text/javascript" src="../e_lib/jquery-3.2.1.min.js"></script>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>장 수 일 람<br><?=closeButton()?></td></tr>
     <tr><td><form name=form1 method=post>정렬순서 :
         <select id='viewType' name='type' size=1>
@@ -103,7 +101,7 @@ $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect)
 $gencount = MYDB_num_rows($genresult);
 
 echo"
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td width=64  align=center id=bg1>얼 굴</td>
         <td width=100 align=center id=bg1>이 름</td>
@@ -190,7 +188,7 @@ echo "
 
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/a_hallOfFame.php

@@ -15,16 +15,16 @@ increaseRefresh("명예의전당", 2);
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 명예의 전당</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=Font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>명 예 의 전 당<br><?=closeButton()?></td></tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
 <?php
 $type = array(
     "명 성",
@@ -114,7 +114,7 @@ for ($i=0; $i < 21; $i++) {
 }
 ?>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/a_history.php

@@ -13,19 +13,18 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("연감", 2);
 
-$query = "select startyear,year,month,conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['startyear','year','month']);
 
 $query = "select con,turntime from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
@@ -78,20 +77,20 @@ if ($month <= 0) {
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 연감</title>
-<script src="../e_lib/jquery-3.2.1.min.js"></script>
-<script src="../d_shared/common_path.js"></script>
-<script src="js/common.js"></script>
-<script src="js/base_map.js"></script>
-<script src="js/map.js"></script>
+<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS('js/map.js')?>
 
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-<link href="css/map.css" rel="stylesheet">
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printCSS('css/map.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>연 감<br><?=closeButton()?></td></tr>
     <tr><td>
         <form name=form1 method=post>
@@ -124,7 +123,7 @@ $history = MYDB_fetch_array($result);
         </form>
     </td></tr>
 </table>
-<table align=center width=1000 height=520 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 height=520 class='tb_layout bg0'>
     <tr><td colspan=5 align=center id=bg1>중 원 지 도</td></tr>
     <tr height=520>
         <td width=698>
@@ -148,7 +147,7 @@ $history = MYDB_fetch_array($result);
         </td>
     </tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/a_kingdomList.php

@@ -8,19 +8,16 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("세력일람", 2);
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
-
 $query = "select con,turntime from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 ?>
 <!DOCTYPE html>
@@ -29,13 +26,13 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 세력일람</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>세 력 일 람<br><?=closeButton()?></td></tr>
 </table>
 <?php
@@ -127,7 +124,7 @@ for($i=1; $i <= $count; $i++) {
     else { $l5 = $level5['name']; }
 
     echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
+<table align=center width=1000 class='tb_layout bg2'>
     <tr>
         <td colspan=8 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>【 {$nation['name']} 】</td>
     </tr>
@@ -209,7 +206,7 @@ $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect
 $citycount = MYDB_num_rows($cityresult);
 
 echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
+<table align=center width=1000 class='tb_layout bg2'>
     <tr>
         <td colspan=5 align=center>【 재 야 】</td>
     </tr>
@@ -244,7 +241,7 @@ echo"
 
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/a_npcList.php

@@ -27,13 +27,13 @@ $sel[$type] = "selected";
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 빙의일람</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>빙 의 일 람<br><?=closeButton()?></td></tr>
     <tr><td><form name=form1 method=post>정렬순서 :
         <select name=type size=1>
@@ -71,7 +71,7 @@ $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect)
 $gencount = MYDB_num_rows($genresult);
 
 echo"
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td width=102  align=center id=bg1>희생된 장수</td>
         <td width=102  align=center id=bg1>악령 이름</td>
@@ -120,7 +120,7 @@ echo "
 
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/a_status.php

@@ -8,20 +8,17 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("세력도", 2);
 checkTurn();
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
-
 $query = "select con,turntime from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 ?>
 <!DOCTYPE html>
@@ -30,11 +27,11 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <title><?=UniqueConst::$serverName?>: 세력도</title>
-<script src="../e_lib/jquery-3.2.1.min.js"></script>
-<script src="../d_shared/common_path.js"></script>
-<script src="js/common.js"></script>
-<script src="js/base_map.js"></script>
-<script src="js/map.js"></script>
+<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS('js/map.js')?>
 <script>
 $(function(){
 
@@ -45,18 +42,18 @@ $(function(){
 
 });
 </script>
-<link href="../d_shared/common.css" rel="stylesheet">
-<link href="css/normalize.css" rel="stylesheet">
-<link href="css/common.css" rel="stylesheet">
-<link href="css/map.css" rel="stylesheet">
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/normalize.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printCSS('css/map.css')?>
 
 </head>
 
 <body>
-<table align=center width=1200 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1200 class='tb_layout bg0'>
     <tr><td>세 력 도<br><?=closeButton()?></td></tr>
 </table>
-<table align=center width=1200 height=520 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1200 height=520 class='tb_layout bg0'>
     <tr height=520>
         <td width=498 valign=top>
             <?=getGeneralPublicRecordRecent(34)?>
@@ -71,7 +68,7 @@ $(function(){
         </td>
     </tr>
 </table>
-<table align=center width=1200 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1200 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/a_traffic.php

@@ -5,13 +5,12 @@ include "lib.php";
 include "func.php";
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("갱신정보", 2);
 
-$query = "select year,month,refresh,maxrefresh,maxonline from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$game = MYDB_fetch_array($result);
+$game_env = $gameStor->getValues(['year','month','refresh','maxrefresh','maxonline']);
 
 $log = getRawFileLogRecent(__dir__.'/logs/_traffic.txt', 11, 100);
 
@@ -30,18 +29,21 @@ foreach($log as $i=>$value){
     $refresh[$i] = $parse[3];
     $online[$i]  = $parse[4];
 }
+$year[] = $game_env['year'];
+$month[] = $game_env['month'];
+$date[] = date('Y-m-d H:i:s');
 
-if ($game['maxrefresh'] == 0) {
-    $game['maxrefresh'] = 1;
+if ($game_env['maxrefresh'] == 0) {
+    $game_env['maxrefresh'] = 1;
 }
-if ($game['maxrefresh'] < $game['refresh']) {
-    $game['maxrefresh'] = $game['refresh'];
+if ($game_env['maxrefresh'] < $game_env['refresh']) {
+    $game_env['maxrefresh'] = $game_env['refresh'];
 }
-if ($game['maxonline'] == 0) {
-    $game['maxonline'] = 1;
+if ($game_env['maxonline'] == 0) {
+    $game_env['maxonline'] = 1;
 }
-if ($game['maxonline'] < $curonline) {
-    $game['maxonline'] = $curonline;
+if ($game_env['maxonline'] < $curonline) {
+    $game_env['maxonline'] = $curonline;
 }
 ?>
 <!DOCTYPE html>
@@ -49,218 +51,141 @@ if ($game['maxonline'] < $curonline) {
 <head>
 <title><?=UniqueConst::$serverName?>: 트래픽정보</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<style>
+.big_bar{
+    float:left;
+    position:relative;
+    height:30px;
+}
+.big_bar span{
+    float:right;
+    padding:0;
+    margin:0;
+    line-height:30px;
+    padding-right:1ch;
+}
 
+.little_bar{
+    float:left;
+    position:relative;
+    height:17px;
+}
+
+span.out_bar{
+    line-height:30px;
+    margin-left:1ch;
+}
+</style>
 </head>
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>트 래 픽 정 보<br><?=closeButton()?></td></tr>
 </table>
 <br>
-<table align=center width=1016 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all;>
+<table align=center width=1016>
     <tr><td align=left>
-        <table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+        <table align=center class='tb_layout bg0'>
             <tr><td colspan=4 align=center id=bg2><font size=5>접 속 량</font></td></tr>
 <?php
-foreach($log as $i=>$value){
-    $w = round($refresh[$i] / $game['maxrefresh'] * 100, 1);
-    if ($w >= 100) {
-        $w -= 0.1;
-    }
-    if ($refresh[$i] < 10 && $w < 3) {
-        $w = 3;
-    } elseif ($refresh[$i] < 100 && $w < 6) {
-        $w = 6;
-    } elseif ($refresh[$i] < 1000 && $w < 9) {
-        $w = 9;
-    }
-    $w2 = round(100 - $w, 1);
+$refresh[] = $game_env['refresh'];
+foreach($refresh as $i=>$value){
+    $w = round($value / $game_env['maxrefresh'] * 100, 1);
     $color = getTrafficColor($w);
     $dt = substr($date[$i], 11, 5); ?>
             <tr height=30>
                 <td width=100 align=center><?=$year[$i]?>년 <?=$month[$i]?>월</td>
                 <td width=60 align=center id=bg2><?=$dt?></td>
                 <td width=2 align=center id=bg1></td>
-                <td width=320 align=center>
-                    <table align=center width=100% height=30 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                        <tr>
-                            <td width=<?=$w?>% bgcolor=<?=$color?> align=right><?=$refresh[$i]?>&nbsp;</td>
-                            <td width=<?=$w2?>% id=bg0><font size=1>&nbsp;</font></td>
-                        </tr>
-                    </table>
+                <td width=320>
+                    <?php if($w == 0): ?>
+                        <span class="out_bar"><?=$value?></span>
+                    <?php elseif($w < 10): ?>
+                        <div class='big_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'></div><span class="out_bar"><?=$value?></span>
+                    <?php else:?>
+                        <div class='big_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'><span><?=$value?></span></div>
+                    <?php endif;?>
+                    
                 </td>
             </tr>
 <?php
 }
-$w = round($game['refresh'] / $game['maxrefresh'] * 100, 1);
-if ($w >= 100) {
-    $w -= 0.1;
-}
-if ($game['refresh'] < 10 && $w < 3) {
-    $w = 3;
-} elseif ($game['refresh'] < 100 && $w < 6) {
-    $w = 6;
-} elseif ($game['refresh'] < 1000 && $w < 9) {
-    $w = 9;
-}
-$w2 = round(100 - $w, 1);
-$color = getTrafficColor($w);
-$dt = date('H:i');
 ?>
-            <tr height=30>
-                <td width=100 align=center><?=$game['year']?>년 <?=$game['month']?>월</td>
-                <td width=60 align=center id=bg2><?=$dt?></td>
-                <td width=2 align=center id=bg1></td>
-                <td width=320 align=center>
-                    <table align=center width=100% height=30 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                        <tr>
-                            <td width=<?=$w?>% bgcolor=<?=$color?> align=right><?=$game['refresh']?>&nbsp;</td>
-                            <td width=<?=$w2?>% id=bg0><font size=1>&nbsp;</font></td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
             <tr><td colspan=4 height=5 align=center id=bg1></td></tr>
             <tr>
-                <td colspan=4 height=30 align=center id=bg0>최고기록: <?=$game['maxrefresh']?></td>
+                <td colspan=4 height=30 align=center id=bg0>최고기록: <?=$game_env['maxrefresh']?></td>
             </tr>
 
 
         </table>
     </td>
     <td align=right>
-        <table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+        <table align=center class='tb_layout bg0'>
             <tr><td colspan=4 align=center id=bg2><font size=5>접 속 자</font></td></tr>
 <?php
-foreach($log as $i=>$value){
-    $w = round($online[$i] / $game['maxonline'] * 100, 1);
-    if ($w >= 100) {
-        $w -= 0.1;
-    }
-    if ($online[$i] < 10 && $w < 3) {
-        $w = 3;
-    } elseif ($online[$i] < 100 && $w < 6) {
-        $w = 6;
-    } elseif ($online[$i] < 1000 && $w < 9) {
-        $w = 9;
-    }
-    $w2 = round(100 - $w, 1);
+$online[] = $curonline;
+foreach($online as $i=>$value){
+    $w = round($value / $game_env['maxonline'] * 100, 1);
     $color = getTrafficColor($w);
     $dt = substr($date[$i], 11, 5); ?>
             <tr height=30>
                 <td width=100 align=center><?=$year[$i]?>년 <?=$month[$i]?>월</td>
                 <td width=60 align=center id=bg2><?=$dt?></td>
                 <td width=2 align=center id=bg1></td>
-                <td width=320 align=center>
-                    <table align=center width=100% height=30 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                        <tr>
-                            <td width=<?=$w?>% bgcolor=<?=$color?> align=right><?=$online[$i]?>&nbsp;</td>
-                            <td width=<?=$w2?>% id=bg0><font size=1>&nbsp;</font></td>
-                        </tr>
-                    </table>
+                <td width=320>
+                    <?php if($w == 0): ?>
+                        <span class="out_bar"><?=$value?></span>
+                    <?php elseif($w < 10): ?>
+                        <div class='big_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'></div><span class="out_bar"><?=$value?></span>
+                    <?php else:?>
+                        <div class='big_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'><span><?=$value?></span></div>
+                    <?php endif;?>
+                    
                 </td>
             </tr>
 <?php
 }
-$w = round($curonline / $game['maxonline'] * 100, 1);
-if ($w >= 100) {
-    $w -= 0.1;
-}
-if ($curonline < 10 && $w < 3) {
-    $w = 3;
-} elseif ($curonline < 100 && $w < 6) {
-    $w = 6;
-} elseif ($curonline < 1000 && $w < 9) {
-    $w = 9;
-}
-$w2 = round(100 - $w, 1);
-$color = getTrafficColor($w);
-$dt = date('H:i');
-echo "
-            <tr height=30>
-                <td width=100 align=center>{$game['year']}년 {$game['month']}월</td>
-                <td width=60 align=center id=bg2>{$dt}</td>
-                <td width=2 align=center id=bg1></td>
-                <td width=320 align=center>
-                    <table align=center width=100% height=30 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                        <tr>
-                            <td width={$w}% bgcolor={$color} align=right>{$curonline}&nbsp;</td>
-                            <td width={$w2}% id=bg0><font size=1>&nbsp;</font></td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
+?>
             <tr><td colspan=4 height=5 align=center id=bg1></td></tr>
             <tr>
-                <td colspan=4 height=30 align=center id=bg0>최고기록: {$game['maxonline']}</td>
+                <td colspan=4 height=30 align=center id=bg0>최고기록: <?=$game_env['maxonline']?></td>
             </tr>
-";
-?>
         </table>
     </td></tr>
 </table>
 <br>
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center class='tb_layout bg0'>
     <tr><td colspan=3 align=center id=bg2><font size=5>주 의 대 상 자 (순간과도갱신)</font></td></tr>
 <?php
-$query = "select sum(refresh) as refresh,sum(connect) as connect from general";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$user = MYDB_fetch_array($result);
-$user['connect'] = round($user['connect'], 1);
-$maxrefresh = $user['refresh'];
+$max_refresh = $db->queryFirstRow('SELECT sum(refresh) as refresh, sum(`connect`) as `connect` from general');
+$max_refresh['name'] = '접속자 총합';
 
-$w = round($maxrefresh / $maxrefresh * 100, 1);
-$w2 = round(100 - $w, 1);
-$color = getTrafficColor($w);
-echo "
-    <tr id=bg2>
-        <td width=98  align=center>주의대상자</td>
-        <td width=98  align=center>벌점(순간갱신)</td>
-        <td width=798 align=center>전체 대비</td>
-    </tr>
-    <tr>
-        <td align=center>접속자 총합</td>
-        <td align=center>{$user['connect']}({$maxrefresh})</td>
-        <td align=center>
-            <table align=center width=100% height=100% border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                <tr>
-                    <td width={$w}% bgcolor={$color}>&nbsp;</td>
-                    <td width={$w2}%>&nbsp;</td>
-                </tr>
-            </table>
-        </td>
-    </tr>
-";
+$refresh_result = array_merge([$max_refresh], $db->query('SELECT `name`,refresh,`connect` FROM general ORDER BY refresh DESC LIMIT 5'));
 
-$query = "select name,refresh,connect from general order by refresh desc limit 0,5";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$count = MYDB_num_rows($result);
-for ($i=0; $i < $count; $i++) {
-    $user = MYDB_fetch_array($result);
-
-    $w = round($user['refresh'] / $maxrefresh * 100, 1);
+foreach ($refresh_result as $i=>$user) {
+    $w = round($user['refresh'] / $max_refresh['refresh'] * 100, 1);
     $w2 = round(100 - $w, 1);
     $color = getTrafficColor($w);
-    echo "
+?>
     <tr>
-        <td width=98  align=center>{$user['name']}</td>
-        <td width=98  align=center>{$user['connect']}({$user['refresh']})</td>
-        <td width=798 align=center>
-            <table align=center width=100% height=100% border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                <tr>
-                    <td width={$w}% bgcolor={$color}>&nbsp;</td>
-                    <td width={$w2}%>&nbsp;</td>
-                </tr>
-            </table>
+        <td width=98  align=center><?=$user['name']?></td>
+        <td width=98  align=center><?=$user['connect']?>(<?=$user['refresh']?>)</td>
+        <td width=798>
+            <?php if($w == 0): ?>
+            <?php elseif($w < 10): ?>
+                <div class='little_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'></div>
+            <?php else:?>
+                <div class='little_bar' style='width:<?=$w?>%;background-color:<?=$color?>;'></div>
+            <?php endif;?>
         </td>
     </tr>
-    ";
+<?php
 }
 ?>
 </table>
 <br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
@@ -273,7 +198,7 @@ function getTrafficColor($per)
     $r = getHex($per);
     $b = getHex(100 - $per);
     $color = $r . "00" . $b;
-    return $color;
+    return '#'.$color;
 }
 
 function getHex($dec)

hwe/a_vote.php

@@ -7,6 +7,7 @@ include "func.php";
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("설문조사", 1);
@@ -15,9 +16,7 @@ $query = "select no,vote from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
-$query = "select develcost,voteopen,vote,votecomment from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['develcost','voteopen','vote','votecomment']);
 
 $vote = explode("|", $admin['vote']);
 if ($vote[0] == "") {
@@ -30,8 +29,17 @@ if ($vote[0] == "") {
 <head>
 <title><?=UniqueConst::$serverName?>: 설문조사</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<style>
+.little_bar{
+    float:left;
+    position:relative;
+    height:17px;
+    line-height:17px;
+    text-align:center;
+}
+</style>
 <script type="text/javascript">
 function captureKey(e) {
     if(e.keyCode == 13 && e.srcElement.type == 'text') {
@@ -44,10 +52,10 @@ function captureKey(e) {
 
 </head>
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>설 문 조 사<br><?=closeButton()?></td></tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
 <form name=form1 action=c_vote.php method=post>
     <tr><td colspan=3 align=center id=bg2><font size=5>설 문 조 사 (<?=$admin['develcost']*5?>금과 추첨으로 유니크템 증정!)</font></td></tr>
 <?php
@@ -137,21 +145,21 @@ if ($session->userGrade >= 5) {
     ";
 }
 
-if ($admin['votecomment'] != "") {
-    $comment = explode("|", $admin['votecomment']);
+if ($admin['votecomment']) {
+    $comment = $admin['votecomment'];
     $commentCount = count($comment);
 } else {
     $commentCount = 0;
 }
 echo "
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td colspan=4 align=center id=bg1>댓 글</td>
     </tr>
 ";
 for ($i=0; $i < $commentCount; $i++) {
-    $cmt = explode(":", $comment[$i]);
+    $cmt = $comment[$i];
     $cmt[2] = Tag2Code($cmt[2]);
     $j = $i+1;
     echo "
@@ -175,7 +183,7 @@ if ($me['no'] > 0) {
 ?>
 </table>
 <br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td colspan=3 align=center id=bg2><font size=5>
         전 체 통 계
 <?php
@@ -193,9 +201,7 @@ if ($admin['voteopen'] >= 1 || $session->userGrade >= 5) {
     <tr>
         <td width=98  align=center>전 체</td>
         <td width=128 align=center>{$voteCount} / {$allCount} ({$percentage} %)</td>
-        <td width=768 align=center>
-            <table align=center width=100% height=100% border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                <tr>
+        <td width=768>
     ";
 
     $memCount = max(1, $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2'));
@@ -230,14 +236,17 @@ if ($admin['voteopen'] >= 1 || $session->userGrade >= 5) {
     for ($i=0; $i < $voteTypeCount; $i++) {
         $per = round(($totalVote[$i]??0) * 100 / $memCount, 1);
 //        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-        echo "
-        <td width={$per}% align=center style=color:".getNewColor($i)."; bgcolor=".getVoteColor($i).">{$totalVote[$i]}</td>
-        ";
+?>
+        <?php if($per == 0): ?>
+        <?php elseif($per < 10): ?>
+            <div class='little_bar' style='width:<?=$per?>%;color:<?=getNewColor($i)?>;background-color:<?=getVoteColor($i)?>;'></div>
+        <?php else:?>
+            <div class='little_bar' style='width:<?=$per?>%;color:<?=getNewColor($i)?>;background-color:<?=getVoteColor($i)?>;'><?=$totalVote[$i]?></div>
+        <?php endif;?>
+<?php
     }
 
     echo "
-                </tr>
-            </table>
         </td>
     </tr>
     ";
@@ -260,22 +269,23 @@ if ($admin['voteopen'] >= 2 || $session->userGrade >= 5) {
     <tr>
         <td align=center bgcolor=black>재 야</td>
         <td align=center>{$nationVoteCount[0]} / {$memCount} ({$percentage} %)</td>
-        <td align=center>
-            <table align=center width=100% height=100% border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                <tr>
+        <td>
     ";
 
     for ($i=0; $i < $voteTypeCount; $i++) {
         $per = round(Util::array_get($nationVote[0][$i], 0) / $memCount * 100, 1);
 //        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-        echo "
-                    <td width={$per}% align=center style=color:".getNewColor($i)."; bgcolor=".getVoteColor($i).">{$nationVote[0][$i]}</td>
-        ";
+?>
+            <?php if($per == 0): ?>
+            <?php elseif($per < 10): ?>
+                <div class='little_bar' style='width:<?=$per?>%;color:<?=getNewColor($i)?>;background-color:<?=getVoteColor($i)?>;'></div>
+            <?php else:?>
+                <div class='little_bar' style='width:<?=$per?>%;color:<?=getNewColor($i)?>;background-color:<?=getVoteColor($i)?>;'><?=$nationVote[0][$i]?></div>
+            <?php endif;?>
+<?php
     }
 
     echo "
-                </tr>
-            </table>
         </td>
     </tr>
     ";
@@ -306,21 +316,22 @@ if ($admin['voteopen'] >= 2 || $session->userGrade >= 5) {
         <td align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>{$nation['name']}</td>
         <td align=center>{$voteCount} / {$memCount} ({$percentage} %)</td>
         <td align=center>
-            <table align=center width=100% height=100% border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-                <tr>
         ";
 
         for ($k=0; $k < $voteTypeCount; $k++) {
             $per = round($nationVote[$nation['nation']][$k] / $memCount * 100, 1);
 //            if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-            echo "
-                    <td width={$per}% align=center style=color:".getNewColor($k)."; bgcolor=".getVoteColor($k).">{$nationVote[$nation['nation']][$k]}</td>
-            ";
+?>
+            <?php if($per == 0): ?>
+            <?php elseif($per < 10): ?>
+                <div class='little_bar' style='width:<?=$per?>%;color:<?=getNewColor($k)?>;background-color:<?=getVoteColor($k)?>;'></div>
+            <?php else:?>
+                <div class='little_bar' style='width:<?=$per?>%;color:<?=getNewColor($k)?>;background-color:<?=getVoteColor($k)?>;'><?=$nationVote[$nation['nation']][$k]?></div>
+            <?php endif;?>
+<?php
         }
 
         echo "
-                </tr>
-            </table>
         </td>
     </tr>
         ";
@@ -329,7 +340,7 @@ if ($admin['voteopen'] >= 2 || $session->userGrade >= 5) {
 ?>
 </form>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/b_auction.php

@@ -14,6 +14,7 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("거래장", 2);
@@ -22,11 +23,7 @@ $query = "select no,special,con,turntime from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
@@ -60,16 +57,15 @@ if ($msg2 == "") {
 <head>
 <title><?=UniqueConst::$serverName?>: 거래장</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>거 래 장<br><?=closeButton()?></td></tr>
     <tr><td align=center id=bg2><font color=orange size=6><b>거 래 장</b></font><input type=button value='갱신' onclick=location.replace('b_auction.php')></td></tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
 <form method=post action=c_auction.php>
     <tr><td colspan=11 align=center bgcolor=orange><font size=5>팝 니 다</font></td></tr>
     <tr align=center id=bg1>
@@ -167,7 +163,7 @@ for ($i=0; $i < $count; $i++) {
 </form>
 </table>
 <br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
 <form method=post action=c_auction.php>
     <tr><td colspan=11 align=center bgcolor=skyblue><font size=5>삽 니 다</font></td></tr>
     <tr align=center id=bg1>
@@ -265,7 +261,7 @@ for ($i=0; $i < $count; $i++) {
 </form>
 </table>
 <br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td align=center id=bg2><font size=5>최 근 기 록</font></td></tr>
     <tr><td>
     <?=getAuctionLogRecent(20)?>

hwe/b_battleCenter.php

@@ -23,15 +23,13 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("감찰부", 2);
 //전투 추진을 위해 갱신
 checkTurn();
-
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
+$gameStor->resetCache();
 
 $query = "select nation from general where no='$gen'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
@@ -45,7 +43,7 @@ $query = "select secretlimit from nation where nation='{$me['nation']}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $nation = MYDB_fetch_array($result);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
@@ -77,13 +75,13 @@ $sel[$type] = "selected";
 <head>
 <title><?=UniqueConst::$serverName?>: 감찰부</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>감 찰 부<br><?=closeButton()?></td></tr>
     <tr><td>
         <form name=form1 method=post>
@@ -131,7 +129,7 @@ for ($i=0; $i < $gencount; $i++) {
         </form>
     </td></tr>
 </table>
-<table width=1000 align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table width=1000 align=center class='tb_layout bg0'>
     <tr>
         <td width=50% align=center id=bg1><font color=skyblue size=3>장 수 정 보</font></td>
         <td width=50% align=center id=bg1><font color=orange size=3>장 수 열 전</font></td>
@@ -170,7 +168,7 @@ for ($i=0; $i < $gencount; $i++) {
     </tr>
 <?php endif; ?>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/b_betting.php

@@ -8,6 +8,7 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("베팅장", 1);
@@ -17,11 +18,13 @@ $query = "select no,tournament,con,turntime,bet0+bet1+bet2+bet3+bet4+bet5+bet6+b
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
-$query = "select conlimit,tournament,phase,tnmt_type,develcost,bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['tournament','phase','tnmt_type','develcost','bet0','bet1','bet2','bet3','bet4','bet5','bet6','bet7','bet8','bet9','bet10','bet11','bet12','bet13','bet14','bet15']);
+$admin['bet'] = 
+    $admin['bet0'] + $admin['bet1'] + $admin['bet2'] + $admin['bet3'] + $admin['bet4'] + 
+    $admin['bet5'] + $admin['bet6'] + $admin['bet7'] + $admin['bet8'] + $admin['bet9'] + 
+    $admin['bet10'] + $admin['bet11'] + $admin['bet12'] + $admin['bet13'] + $admin['bet14'] + $admin['bet15'];
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
@@ -54,29 +57,20 @@ if($str3){
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 베팅장</title>
-<style>
-body { color:white; background-color:black; border-width:1px; border-color:gray; }
-table { font-family:'맑은 고딕';}
-font { font-family:'맑은 고딕';}
-input { font-family:'맑은 고딕';height:20px }
-select { font-family:'굴림'; }
-#bg0 { background-image:url(<?=ServConfig::$gameImagePath?>/back_walnut.jpg); }
-#bg1 { background-image:url(<?=ServConfig::$gameImagePath?>/back_green.jpg); }
-#bg2 { background-image:url(<?=ServConfig::$gameImagePath?>/back_blue.jpg); }
-</style>
-
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 
 <body>
-<table align=center width=1120 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1120 class='tb_layout bg0'>
     <tr><td>베 팅 장<br><?=closeButton()?></td></tr>
 </table>
-<table align=center width=1120 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:10px;word-break:break-all; id=bg0>
+<table align=center width=1120 class='tb_layout bg0'>
     <tr><td colspan=16><input type=button value='갱신' onclick='location.reload()'></td></tr>
     <tr><td colspan=16 align=center><font color=white size=6><?=$tnmt_type?> (<?=$str1.$str2.$str3?>)</font></td></tr>
     <tr><td height=50 colspan=16 align=center id=bg2><font color=limegreen size=6>16강 상황</font><br><font color=orange size=3>(전체 금액 : <?=$admin['bet']?> / 내 투자 금액 : <?=$me['bet']?>)</font></td></tr>
 </table>
-<table align=center width=1120 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:10px;word-break:break-all; id=bg0>
+<table align=center width=1120 class='mimic_flex bg0' style='border:solid 1px gray;font-size:10px;'>
     <tr align=center><td height=10 colspan=16></td></tr>
     <tr align=center>
 <?php
@@ -308,7 +302,7 @@ for ($i=0; $i < 16; $i++) {
 ?>
     </tr>
 </table>
-<table align=center width=1120 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1120 class='tb_layout bg0'>
     <tr align=center><td height=10 colspan=16></td></tr>
 <?php
 echo "
@@ -387,7 +381,7 @@ if ($admin['tournament'] == 6) {
     </tr>
     <tr align=center><td height=10 colspan=16></td></tr>
 </table>
-<table align=center width=1120 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1120 class='tb_layout bg0'>
     <tr align=center><td height=50 colspan=4 id=bg2><font color=yellow size=6>토너먼트 랭킹</font></td></tr>
     <tr align=center><td colspan=4 id=bg2><font color=skyblue size=3>순위 / 장수명 / 능력치 / 경기수 / 승리 / 무승부 / 패배 / 집계점수 / 우승횟수</font></td></tr>
     <tr align=center>
@@ -402,7 +396,7 @@ for ($i=0; $i < 4; $i++) {
     $grp = $i;
     echo "
         <td>
-            <table align=center width=280 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+            <table align=center width=280 class='tb_layout bg0'>
                 <tr><td colspan=9 align=center style=color:white;background-color:black;><font size=4>{$type1[$i]}</font></td></tr>
                 <tr id=bg1><td align=center>순</td><td align=center>장수</td><td align=center>{$type2[$i]}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>勝</td></tr>";
 
@@ -429,7 +423,7 @@ for ($i=0; $i < 4; $i++) {
         </td>
     </tr>
 </table>
-<table align=center width=1120 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1120 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/b_chiefboard.php

@@ -27,13 +27,13 @@ if($me['level'] < 5) {
 <head>
 <title><?=UniqueConst::$serverName?>: 기밀실</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>기 밀 실<br><?=backButton()?></td></tr>
 <form name=form1 method=post action=c_chiefboard.php>
     <tr><td align=center>
@@ -65,7 +65,7 @@ for($i=0; $i < 20; $i++) {
 
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/b_chiefcenter.php

@@ -8,14 +8,11 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("사령부", 1);
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
-
 $query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
@@ -24,7 +21,7 @@ $query = "select secretlimit from nation where nation='{$me['nation']}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $nation = MYDB_fetch_array($result);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 
 if($me['level'] == 0 || ($me['level'] == 1 && $me['belong'] < $nation['secretlimit'])) {
@@ -38,9 +35,7 @@ else { $btn = "hidden"; $btn2 = "hidden"; }
 $date = date('Y-m-d H:i:s');
 
 // 명령 목록
-$query = "select year,month,turnterm from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['year','month','turnterm']);
 
 $query = "
     select nation,level,
@@ -84,8 +79,8 @@ for($i= $lv - 1; $i>=5; $i--){
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 사령부</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 <script type="text/javascript">
 function turn(type) {
     if(type == 0) location.replace('turn_push_core.php');
@@ -96,10 +91,10 @@ function turn(type) {
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>사 령 부<input type=button value='갱신' onclick=location.replace('b_chiefcenter.php')><br><?=backButton()?></td></tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td colspan=10 align=center bgcolor=skyblue>수뇌부 일정</td></tr>
     <tr><td colspan=10 align=center>
 <?php
@@ -188,7 +183,7 @@ for($k=0; $k < 2; $k++) {
 
 ?>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/b_currentCity.php

@@ -34,8 +34,8 @@ $templates = new \League\Plates\Engine('templates');
 <head>
 <title><?=UniqueConst::$serverName?>: 도시정보</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link href="../d_shared/common.css" rel="stylesheet">
-<link href="css/common.css" rel="stylesheet">
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 <style>
 #general_list tr td{
     text-align:center;
@@ -53,11 +53,11 @@ $templates = new \League\Plates\Engine('templates');
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>도 시 정 보<br><?=backButton()?></td></tr>
 </table>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td width=998>
             <form name=cityselect method=get>도시선택 :
@@ -175,11 +175,11 @@ if($city['trade'] == 0) {
 }
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
 </table>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg2>
+<table align=center width=1000 class='tb_layout bg2'>
     <tr>
         <td colspan=12 align=center style=color:"<?=newColor($nation['color'])?>"; bgcolor=<?=$nation['color']?>>【 <?=CityConst::$regionMap[$city['region']]?> | <?=CityConst::$levelMap[$city['level']]?> 】 <?=$city['name']?></td>
     </tr>
@@ -230,7 +230,7 @@ if($city['trade'] == 0) {
 
 
 <br>
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
+<table align=center class='tb_layout bg0'>
 <thead>
     <tr>
         <td width=64 align=center class=bg1>얼 굴</td>
@@ -365,7 +365,7 @@ for($j=0; $j < $gencount; $j++) {
 </tbody>
 </table>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/b_dipcenter.php

@@ -8,14 +8,11 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("내무부", 1);
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
 $query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
@@ -24,7 +21,7 @@ $query = "select secretlimit from nation where nation='{$me['nation']}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $nation = MYDB_fetch_array($result);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
@@ -49,16 +46,16 @@ if ($me['level'] >= 5) {
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 내무부</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>내 무 부<br><?=backButton()?></td></tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td colspan=9 align=center bgcolor=blue>외 교 관 계</td></tr>
     <tr>
         <td width=100 align=center class=bg1>국 가 명</td>
@@ -71,9 +68,7 @@ if ($me['level'] >= 5) {
         <td align=center class=bg1>비 고</td>
     </tr>
 <?php
-$query = "select year,month from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['year','month']);
 
 $query = "select nation,name,color,power,gennum from nation order by power desc";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
@@ -190,9 +185,7 @@ $query = "select nation,name,color,type,msg,gold,rice,bill,rate,scout,war,scoutm
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $nation = MYDB_fetch_array($result);
 
-$query = "select gold_rate,rice_rate from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['gold_rate','rice_rate']);
 // 금 수지
 $deadIncome = getDeadIncome($nation['nation'], $nation['type'], $admin['gold_rate']);
 
@@ -220,7 +213,7 @@ if ($budgetricediff > 0) {
 }
 
 ?>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
 <form name=form1 method=post action=c_dipcenter.php>
     <tr><td colspan=2 height=10></td></tr>
     <tr><td colspan=2 align=center bgcolor=orange>국 가 방 침 &amp; 임관 권유 메세지</td></tr>
@@ -231,7 +224,7 @@ if ($budgetricediff > 0) {
     <tr><td colspan=2 align=center bgcolor=green>예 산 &amp; 정 책</td></tr>
     <tr>
         <td colspan=2>
-            <table width=998 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
+            <table width=998 class='tb_layout bg0'>
                 <tr>
                     <td colspan=2 align=center class=bg1>자금 예산</td>
                     <td colspan=2 align=center class=bg1>병량 예산</td>
@@ -304,7 +297,7 @@ if ($nation['war'] == 0) {
     <tr><td colspan=2 height=10></td></tr>
 </form>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; class=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/b_diplomacy.php

@@ -8,14 +8,11 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("중원정보", 1);
 
-$query = "select turnterm from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
-
 $query = "select no,nation from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
@@ -79,11 +76,11 @@ foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE confl
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <title><?=UniqueConst::$serverName?>: 중원 정보</title>
-<script src="../e_lib/jquery-3.2.1.min.js"></script>
-<script src="../d_shared/common_path.js"></script>
-<script src="js/common.js"></script>
-<script src="js/base_map.js"></script>
-<script src="js/map.js"></script>
+<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS('js/map.js')?>
 <script>
 $(function(){
 
@@ -94,19 +91,19 @@ $(function(){
 
 });
 </script>
-<link href="css/normalize.css" rel="stylesheet">
-<link href="../d_shared/common.css" rel="stylesheet">
-<link href="css/common.css" rel="stylesheet">
-<link href="css/map.css" rel="stylesheet">
+<?=WebUtil::printCSS('css/normalize.css')?>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printCSS('css/map.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>중 원 정 보<br><?=backButton()?></td></tr>
 </table>
 <br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td colspan=<?=$nationcount+1?> align=center bgcolor=blue>외 교 현 황</td></tr>
 <?php
 echo "
@@ -179,31 +176,13 @@ for($i=0; $i < $nationcount; $i++) {
 <?php if ($realConflict) : ?>
 
 <br>
-<table
-    align='center'
-    width=1000 
-    border=1 
-    cellspacing=0 
-    cellpadding=0 
-    bordercolordark='gray' 
-    bordercolorlight='black' 
-    style='font-size:13px;word-break:break-all;' 
-    class='bg0'
->
+<table align='center' width=1000 class='tb_layout bg0'>
     <tr><td colspan=2 align=center bgcolor=magenta>분 쟁 현 황</td></tr>
     <?php foreach($realConflict as list($cityID, $cityName, $conflict)): ?>
     <tr>
         <td align=center width=48><?=$cityName?></td>
-        <td width=948>
-            <table 
-                border=0
-                cellspacing=0 
-                cellpadding=0
-                bordercolordark='gray'
-                bordercolorlight='black'
-                style='font-size:13px;word-break:break-all;width:100%;'
-                class='bg0'
-            >
+        <td style='width:948px;position:relative;'>
+            <table class='tb_layout bg0' style='width:100%;'>
             <?php foreach($conflict as $item): ?>
                 <tr>
                     <td 
@@ -228,7 +207,7 @@ for($i=0; $i < $nationcount; $i++) {
 <?php endif; ?> 
 
 <br>
-<table class="bg0" align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style="font-size:13px;word-break:break-all;">
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td colspan=5 align=center bgcolor=green><font size=3>중 원 지 도</font></td>
     </tr>
@@ -244,7 +223,7 @@ for($i=0; $i < $nationcount; $i++) {
 </table>
 <br>
 
-<table class="bg0" align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style="font-size:13px;word-break:break-all;">
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/b_genList.php

@@ -16,14 +16,11 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("암행부", 2);
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
-
 $query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
@@ -32,7 +29,7 @@ $query = "select level,secretlimit from nation where nation='{$me['nation']}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $nation = MYDB_fetch_array($result);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
@@ -55,13 +52,13 @@ $sel[$type] = "selected";
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 암행부</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>암 행 부<br><?=closeButton()?></td></tr>
     <tr><td><form name=form1 method=post>정렬순서 :
         <select name=type size=1>
@@ -101,7 +98,7 @@ $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect)
 $gencount = MYDB_num_rows($genresult);
 
 echo"
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center class='tb_layout bg0'>
     <tr>
         <td width=98 align=center id=bg1>이 름</td>
         <td width=98 align=center id=bg1>통무지</td>
@@ -206,7 +203,7 @@ echo "
 
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/b_myBossInfo.php

@@ -31,8 +31,8 @@ if($meLevel == 0) {
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 인사부</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 <script type="text/javascript">
 function out() {
     return confirm('정말 추방하시겠습니까?');
@@ -42,7 +42,7 @@ function out() {
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>인 사 부<br><?=backButton()?></td></tr>
 </table>
 <br>
@@ -72,7 +72,7 @@ $query = "select name,picture,firenum from general where nation='{$nation['natio
 $eagleresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
 echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']} colspan=6>
             <font size=5>【 {$nation['name']} 】</font>
@@ -131,7 +131,7 @@ echo "
         </td>
     </tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
 <form method=post action=c_myBossInfo.php>
     <tr><td colspan=6 height=5></td></tr>
     <tr><td colspan=2 align=center bgcolor=red>추 방</td></tr>
@@ -167,7 +167,7 @@ echo "
     </tr>
 </form>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td colspan=4 height=5></td></tr>
     <tr><td colspan=4 align=center bgcolor=blue>수 뇌 부 임 명</td></tr>
     <tr>
@@ -270,7 +270,7 @@ 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 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td colspan=5 height=5></td></tr>
 ";
 if($meLevel >= 5) {
@@ -505,7 +505,7 @@ for($j=0; $j < $citycount; $j++) {
     <tr><td colspan=5>※ <font color=orange>노란색</font>은 변경 불가능, 하얀색은 변경 가능 관직입니다.</td></tr>
 </table>
 <br>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/b_myCityInfo.php

@@ -38,13 +38,13 @@ $sel = [$type => "selected"];
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 세력도시</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>세 력 도 시<br><?=backButton()?></td></tr>
     <tr><td><form name=form1 method=post>정렬순서 :
         <select name=type size=1>
@@ -123,7 +123,7 @@ for ($j=0; $j < $citycount; $j++) {
     }
 
     echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
+<table align=center width=1000 class='tb_layout bg2'>
     <tr>
         <td colspan=12 style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}><font size=2>【 ".CityConst::$regionMap[$city['region']]." | ".CityConst::$levelMap[$city['level']]." 】 {$city['name']}</font></td>
     </tr>
@@ -188,7 +188,7 @@ for ($j=0; $j < $citycount; $j++) {
 }
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/b_myGenInfo.php

@@ -38,13 +38,13 @@ $sel = [$type => "selected"];
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 세력장수</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>세 력 장 수<br><?=backButton()?></td></tr>
     <tr><td><form name=form1 method=post>정렬순서 :
         <select name=type size=1>
@@ -114,7 +114,7 @@ $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect)
 $gencount = MYDB_num_rows($genresult);
 
 echo"
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center class='tb_layout bg0'>
     <tr>
         <td width=64 align=center id=bg1>얼 굴</td>
         <td width=98 align=center id=bg1>이 름</td>
@@ -191,7 +191,7 @@ for($j=0; $j < $gencount; $j++) {
 
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/b_myKingdomInfo.php

@@ -8,6 +8,7 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("세력정보", 1);
@@ -27,13 +28,13 @@ if($me['level'] == 0) {
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 세력정보</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>세 력 정 보<br><?=backButton()?></td></tr>
 </table>
 <br>
@@ -65,9 +66,7 @@ $query = "select sum(crew) as totcrew,sum(leader)*100 as maxcrew from general wh
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $general = MYDB_fetch_array($result);
 
-$query = "select gold_rate,rice_rate from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['gold_rate','rice_rate']);
 // 금 수지
 $deadIncome = getDeadIncome($nation['nation'], $nation['type'], $admin['gold_rate']);
 
@@ -89,7 +88,7 @@ if($budgetricediff > 0) { $budgetricediff = "+{$budgetricediff}"; }
 else { $budgetricediff = "$budgetricediff"; }
 
 echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
+<table align=center width=1000 class='tb_layout bg2'>
     <tr>
         <td colspan=8 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>【 ";echo $me['nation']==0?"공 백 지":"{$nation['name']}";echo " 】</td>
     </tr>
@@ -156,7 +155,7 @@ echo"
 
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/b_myPage.php

@@ -7,7 +7,8 @@ include "func.php";
 $btn = Util::getReq('btn');
 $mode = Util::getReq('mode', 'int', 2);
 $tnmt = Util::getReq('tnmt', 'int', 1);
-$detachNPC = Util::getReq('detachNPC', 'bool');
+//$detachNPC = Util::getReq('detachNPC', 'bool');
+$detachNPC = false;
 
 extractMissingPostToGlobals();
 
@@ -24,6 +25,7 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("내정보", 1);
@@ -55,7 +57,7 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
     ], 'owner=%i', $userID);
 
     if($me['npc'] == 1 && $detachNPC){
-        $turnterm = $db->queryFirstField('SELECT turnterm FROM game LIMIT 1');
+        $turnterm = $gameStor->turnterm;
 
         if($turnterm < 10){
             $targetKillTurn = 30 / $turnterm;
@@ -77,16 +79,16 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 내정보</title>
-<link href="../d_shared/common.css" rel="stylesheet">
-<link rel=stylesheet href="css/common.css">
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>내 정 보<br><?=backButton()?></td></tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td width=50%>
             <?php myInfo(); ?>
@@ -109,8 +111,8 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
             </form>
             휴 가 신 청<br>
             <a href="c_vacation.php"><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>휴가 신청</button></a><br><br>
-            빙의 해제용 삭턴 조절<br>
-            <a href="b_myPage.php?detachNPC=1"><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>빙의 해체 요청</button></a>
+            <!--빙의 해제용 삭턴 조절<br>
+            <a href="b_myPage.php?detachNPC=1"><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>빙의 해체 요청</button></a>-->
         </td>
     </tr>
     <tr>
@@ -138,7 +140,7 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
         </td>
     </tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>

hwe/b_nationboard.php

@@ -22,13 +22,13 @@ $me = MYDB_fetch_array($result);
 <head>
 <title><?=UniqueConst::$serverName?>: 회의실</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>회 의 실<br><?=backButton()?></td></tr>
 <form name=form1 method=post action=c_nationboard.php>
     <tr><td align=center>
@@ -60,7 +60,7 @@ for($i=0; $i < 20; $i++) {
 
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/b_nationrule.php

@@ -17,13 +17,13 @@ increaseRefresh("국법", 1);
 <head>
 <title><?=UniqueConst::$serverName?>: 국법</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td>국 법<br><?=backButton()?></td></tr>
     <tr><td>
 

hwe/b_tournament.php

@@ -8,6 +8,7 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("토너먼트", 1);
@@ -17,11 +18,9 @@ $query = "select no,tournament,con,turntime from general where owner='{$userID}'
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
-$query = "select conlimit,tournament,phase,tnmt_msg,tnmt_type,develcost,tnmt_trig from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['tournament','phase','tnmt_msg','tnmt_type','develcost','tnmt_trig']);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
@@ -44,24 +43,15 @@ case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "itl"; $tp2 = "
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 토너먼트</title>
-<style>
-body { color:white; background-color:black; border-width:1px; border-color:gray; }
-table { font-family:'맑은 고딕'; }
-font { font-family:'맑은 고딕'; }
-input { font-family:'맑은 고딕'; height:20px }
-select { font-family:'굴림'; line-height:100%; }
-#bg0 { background-image:url(<?=ServConfig::$gameImagePath?>/back_walnut.jpg); }
-#bg1 { background-image:url(<?=ServConfig::$gameImagePath?>/back_green.jpg); }
-#bg2 { background-image:url(<?=ServConfig::$gameImagePath?>/back_blue.jpg); }
-</style>
-
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 
 <body>
-<table align=center width=2000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=2000 class='tb_layout bg0'>
     <tr><td>삼모전 토너먼트<br><?=closeButton()?></td></tr>
 </table>
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center class='tb_layout bg0'>
 <?php
 if ($session->userGrade >= 5) {
     $sel = [];
@@ -193,7 +183,7 @@ if($str3){
 echo "
     <tr>
         <td colspan=8>
-            <table align=center width=2000 border=0 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+            <table align=center width=2000 class='bg0 mimic_flex'>
                <tr align=center>";
 
 $query = "select npc,name,win from tournament where grp>=60 order by grp, grp_no";
@@ -403,9 +393,11 @@ for ($i=0; $i < 16; $i++) {
 echo"
                 </tr>";
 
-$query = "select tournament,bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$betting = MYDB_fetch_array($result);
+$betting = $gameStor->getValues(['tournament','bet0','bet1','bet2','bet3','bet4','bet5','bet6','bet7','bet8','bet9','bet10','bet11','bet12','bet13','bet14','bet15']);
+$betting['bet'] = 0;
+for($i=0;$i<16;$i+=1){
+    $betting['bet'] += $betting['bet'.$i];
+}
 $bet = [];
 for ($i=0; $i < 16; $i++) {
     if($betting['bet'] == 0){
@@ -444,7 +436,7 @@ for ($i=0; $i < 8; $i++) {
     $grp = $i + 10;
     echo "
         <td>
-            <table align=center width=250 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+            <table align=center width=250 class='tb_layout bg0'>
                 <tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr>
                 <tr id=bg1><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
 
@@ -470,7 +462,7 @@ for ($i=0; $i < 8; $i++) {
     $grp = $i;
     echo "
         <td>
-            <table align=center width=250 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+            <table align=center width=250 class='tb_layout bg0'>
                 <tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr>
                 <tr id=bg1><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
 
@@ -506,7 +498,7 @@ if ($admin['tournament'] == 2 || $admin['tournament'] == 3) {
         </font>
     </td></tr>
 </table>
-<table align=center width=2000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=2000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/b_troop.php

@@ -26,23 +26,22 @@ $troopcount = MYDB_num_rows($result);
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <title><?=UniqueConst::$serverName?>: 부대편성</title>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table width=1000 class='tb_layout bg0'>
     <tr><td>부 대 편 성<br><?=backButton()?></td></tr>
 </table>
 <form name=form1 method=post action=c_troop.php>
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table class='tb_layout bg0'>
     <tr>
-        <td align=center width=64  id=bg1>선 택</td>
-        <td align=center width=98  id=bg1>부 대 정 보</td>
-        <td align=center width=64  id=bg1>부 대 장</td>
-        <td align=center width=662 id=bg1 style=table-layout:fixed;word-break:break-all;>장 수</td>
-        <td align=center width=98  id=bg1 style=table-layout:fixed;word-break:break-all;>부대장행동</td>
+        <td width=64  class='bg1 center'>선 택</td>
+        <td width=98  class='bg1 center'>부 대 정 보</td>
+        <td width=64  class='bg1 center'>부 대 장</td>
+        <td width=662 class='bg1 center' style=table-layout:fixed;word-break:break-all;>장 수</td>
+        <td width=98  class='bg1 center' style=table-layout:fixed;word-break:break-all;>부대장행동</td>
     </tr>
 <?php
 for($i=0; $i < $troopcount; $i++) {
@@ -139,7 +138,7 @@ echo "
 <br>";
 
 echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td width=80 id=bg1>부 대 명</td>
         <td width=100><input type=text style=color:white;background-color:black; size=12 maxlength=6 name=name></td>";
@@ -155,7 +154,7 @@ echo "
 </table>";
 
 ?>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/c_auction.php

@@ -34,13 +34,12 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("입찰", 1);
 
-$query = "select turnterm from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
+$turnterm = $gameStor->turnterm;
 
 $query = "select no,name,gold,rice,special from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
@@ -56,7 +55,7 @@ $bidCount = MYDB_num_rows($result);
 
 $btCount = $tradeCount + $bidCount;
 
-$unit = $admin['turnterm'] * 60;
+$unit = $turnterm * 60;
 
 $amount = Util::round($amount / 10) * 10;
 $cost = Util::round($cost / 10) * 10;

hwe/c_betting.php

@@ -38,10 +38,11 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("베팅", 1);
 
-$tournament = $db->queryFirstField('SELECT tournament FROM game LIMIT 1');
+$tournament = $gameStor->tournament;
 if($tournament != 6) {
     header('Location: b_betting.php');
     exit();
@@ -59,9 +60,8 @@ if($betGold + 500 <= $myGold && $betGold + $oldBet <= 1000 && $betGold + $totalB
         "bet{$betTarget}"=>$db->sqleval("bet{$betTarget} + %i", $betGold),
         'betgold'=>$db->sqleval('betgold + %i', $betGold)
     ], 'owner = %i', $userID);
-    $db->update('game', [
-        "bet{$betTarget}"=>$db->sqleval("bet{$betTarget} + %i", $betGold)
-    ], true);
+
+    $gameStor->setValue("bet{$betTarget}", $gameStor->getValue("bet{$betTarget}") + $betGold);//TODO: +로 증가하는 storage값은 별도로 분리
 }
 
 header('location: b_betting.php');

hwe/c_myBossInfo.php

@@ -18,11 +18,10 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
-$query = "select startyear,year,month,scenario from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['startyear','year','month','scenario']);
 
 $query = "select no,nation,level from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -211,13 +210,11 @@ if($btn == "추방") {
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         }
 
-        $query = "select year,month from game limit 1";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $admin = MYDB_fetch_array($result);
-        pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D>{$nation['name']}</>에서 추방됨");
+        list($year, $month) = $gameStor->getValuesAsArray(['year','month']);
+        pushGeneralHistory($general, "<C>●</>{$year}년 {$month}월:<D>{$nation['name']}</>에서 추방됨");
 
         pushGenLog($general, $log);
-        pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
+        pushGeneralPublicRecord($alllog, $year, $month);
     }
     header('location:b_myBossInfo.php');
     die();

hwe/c_tournament.php

@@ -21,11 +21,10 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
-$query = "select tournament,phase,tnmt_type,develcost from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['tournament','phase','tnmt_type','develcost']);
 
 $query = "select no,name,tournament from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -80,8 +79,8 @@ if($btn == '참가') {
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $grpCount = MYDB_num_rows($result);
     if($grpCount >= 8) {
-        $query = "update game set tournament=2, phase=0";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gameStor->tournament = 2;
+        $gameStor->phase = 0;
     }
     header('location:b_tournament.php');
     die(); 
@@ -93,15 +92,13 @@ if($session->userGrade < 5) {
 }
 
 if($btn == "자동개최설정") {
-    $db->update('game', ['tnmt_trig'=>$trig], true);
+    $gameStor->tnmt_trig = $trig;
 } elseif($btn == "개최") {
     startTournament($auto, $type);
 } elseif($btn == "중단") {
-    $db->update('game', [
-        'tnmt_auto'=>0,
-        'tournament'=>0,
-        'phase'=>0
-    ], true);
+    $gameStor->tnmt_auto = 0;
+    $gameStor->tournament = 0;
+    $gameStor->phase = 0;
 } elseif($btn == "투입" || $btn == "무명투입" || $btn == "쪼렙투입" || $btn == "일반투입" || $btn == "굇수투입" || $btn == "랜덤투입") {
     if($btn == "투입") {
         $query = "select no,name,npc,leader,power,intel,explevel,gold,horse,weap,book from general where no='$gen'";
@@ -184,8 +181,8 @@ if($btn == "자동개최설정") {
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $grpCount = MYDB_num_rows($result);
     if($grpCount >= 8) {
-        $query = "update game set tournament=2, phase=0";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gameStor->tournament=2;
+        $gameStor->phase=0;
     }
 
 } elseif($btn == "쪼렙전부투입" || $btn == "일반전부투입" || $btn == "굇수전부투입" || $btn == "랜덤전부투입") {
@@ -241,8 +238,8 @@ if($btn == "자동개최설정") {
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     }
 
-    $query = "update game set tournament=2, phase=0";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->tournament = 2;
+    $gameStor->phase = 0;
 } elseif($btn == "무명전부투입") { 
     fillLowGenAll();
 } elseif($btn == "예선") { 
@@ -261,8 +258,9 @@ if($btn == "자동개최설정") {
     final16set();
 } elseif($btn == "베팅마감") {
     $dt = date("Y-m-d H:i:s", time() + 60);
-    $query = "update game set tournament='7',phase='0',tnmt_time='$dt'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->tournament=7;
+    $gameStor->phase=0;
+    $gameStor->tnmt_time = $dt;
 } elseif($btn == "16강") { 
     finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 16);
 } elseif($btn == "8강") { 
@@ -276,9 +274,7 @@ if($btn == "자동개최설정") {
 } elseif($btn == "회수") { 
     setRefund();
 } elseif($btn == "메시지") {
-    $msg = addslashes(SQ2DQ($msg));
-    $query = "update game set tnmt_msg='$msg'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->tnmt_msg = $msg;
 }
 
 header('location:b_tournament.php');

hwe/c_vacation.php

@@ -8,16 +8,11 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
-$connect=$db->get();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 
-$query = "select killturn from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
+$killturn = $gameStor->killturn;
 
-$admin['killturn'] *= 3;
-
-$query = "update general set killturn='{$admin['killturn']}' where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+$db->update('general', ['killturn'=>$killturn*3], 'owner=%i', $userID);
 
 
 header('location:b_myPage.php');

hwe/c_vote.php

@@ -17,11 +17,10 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
-$query = "select develcost,vote,votecomment from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['develcost', 'cost', 'vote', 'votecomment']);
 
 $query = "select no,vote,name,nation,horse,weap,book,item,npc from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -44,14 +43,11 @@ else if($btn == "댓글" && $comment != "") {
 
     $nation = getNationStaticInfo($me['nation']);
 
-    if($admin['votecomment'] != "") { $admin['votecomment'] .= "|"; }
-    $admin['votecomment'] .= "{$nation['name']}:{$me['name']}:{$comment}";
-
-    $query = "update game set votecomment='{$admin['votecomment']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-    
-
+    if(!$admin['votecomment']){
+        $admin['votecomment'] = [];
+    }
+    $admin['votecomment'][] = [$nation['name'],$me['name'],$comment];
+    $gameStor->votecomment = $admin['votecomment'];
 }
 
 if($session->userGrade < 5){
@@ -62,22 +58,20 @@ if($session->userGrade < 5){
 
 if($btn == "수정") {
     if($title != "") {
-        $vote = explode("|", $admin['vote']);
-        $vote[0] = addslashes(SQ2DQ($title));
-        $admin['vote'] = implode("|", $vote);
-        $query = "update game set vote='{$admin['vote']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $vote = $admin['vote'];
+        $vote[0] = $title;
+        $gameStor->vote = $admin['vote'];
     }
 } elseif($btn == "추가") {
     if($str != "") {
-        $str = addslashes(SQ2DQ($str));
-        $admin['vote'] .= "|{$str}";
-        $query = "update game set vote='{$admin['vote']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        //TODO:vote
+        $admin['vote'][] = $str;
+        $gameStor->vote=$admin['vote'];
     }
 } elseif($btn == "리셋") {
-    $query = "update game set voteopen=1,vote='',votecomment=''";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->voteopen=1;
+    $gameStor->vote='';
+    $gameStor->votecomment='';
 
     $query = "update general set vote='0'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -85,14 +79,11 @@ if($btn == "수정") {
     $query = "update general set newvote='1' where vote=0";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 } elseif($btn == "숨김") {
-    $query = "update game set voteopen=0";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->voteopen = 0;
 } elseif($btn == "전체통계만") {
-    $query = "update game set voteopen=1";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->voteopen = 1;
 } elseif($btn == "전부") {
-    $query = "update game set voteopen=2";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->voteopen = 2;
 }
 
 header('location:a_vote.php');

hwe/commandlist.php

@@ -15,8 +15,8 @@ $connect=$db->get();
 <head>
 <title>커맨드리스트</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 <script type="text/javascript">
 <?php
 if(!$session->isLoggedIn()){
@@ -67,15 +67,14 @@ myCommandList();
 
 function myCommandList() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
     $userID = Session::getUserID();
 
     $date = date('Y-m-d H:i:s');
 
     // 명령 목록
-    $query = "select year,month,turnterm from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','turnterm']);
 
     $query = "select no,turntime,term,turn0,turn1,turn2,turn3,turn4,turn5,turn6,turn7,turn8,turn9,turn10,turn11,turn12,turn13,turn14,turn15,turn16,turn17,turn18,turn19,turn20,turn21,turn22,turn23 from general where owner='{$userID}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -86,7 +85,7 @@ function myCommandList() {
     }
     $turn = getTurn($me, 2);
 
-    echo "<table width=300 height=700 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
+    echo "<table width=300 height=700 class='tb_layout bg2'>
 <form name=clock>
     <tr>
         <td colspan=4 align=center id=bg0><b>- 명령 목록 - <input value='$date' type=text name=clock size=19 style=background-color:black;color:white;border-style:none;></b></td>

hwe/css/common.css

@@ -11,6 +11,59 @@ font { font-family:'맑은 고딕'; }
 input { font-family:'맑은 고딕'; font-size:13px; }
 select { font-family:'굴림'; line-height:100%; }
 
+.center{
+    text-align:center;
+}
+
+table.mimic_flex{
+    border-collapse: collapse;
+    border:none;
+    padding:0;
+}
+
+.mimic_flex td, .mimic_flex th     {
+    border:none !important;
+    padding: 0px;
+    word-break: break-all;
+}
+
+
+table.tb_layout  {
+    border-collapse: collapse;
+    padding: 0px;
+    font-size: 13px;
+    word-break: break-all;
+    font-family: '맑은 고딕';
+}
+
+.tb_layout td, .tb_layout th     {
+    border:solid 1px gray;
+    padding: 0px;
+    word-break: break-all;
+    font-family: '맑은 고딕';;
+}
+
+div.bar_out{
+    position:relative;
+    border-top:solid 1px #888888;
+    border-bottom:solid 1px #333333;
+    padding:0;
+    margin:0;
+    width:100%;
+    overflow: hidden;
+}
+
+div.bar_out div{
+    position:absolute;
+    left:0;
+    top:0;
+    height:100%;
+}
+
+div.bar_out div.bar_in{
+    width:100%;
+}
+
 /* */
 
 .ev_warning{

hwe/css/main.css

@@ -63,4 +63,8 @@ color:white;
     font-size:13px;
     margin:0;
     display:block;
+}
+
+.nation_info td{
+    height:18px;
 }

hwe/css/msg.css

@@ -22,9 +22,9 @@
 
 .msg_plate{
     width:100%;
-    border-bottom:groove 0.1em;
-    border-left:groove 0.1em;
-    border-right:groove 0.1em;
+    border-bottom:solid 1px gray;
+    border-left:solid 1px gray;
+    border-right:solid 1px gray;
     height:64px;
     font-size:12px;
     word-break:break-all;
@@ -61,7 +61,7 @@
     float:left;
     width:64px;
     height:64px;
-    border-right:groove 0.1em;
+    border-right:solid 1px gray;
 }
 
 .msg_time{
@@ -105,7 +105,7 @@
 
 .board_header{
     color:white;
-    border:groove 0.1em;
+    border:solid 1px gray;
 }
 
 .board_side{
@@ -113,9 +113,9 @@
     height:1370px;
     width:498px;
     overflow-y: hidden;
-    border-left:groove 1px;
-    border-right:groove 1px;
-    border-bottom:groove 1px;
+    border-left:solid 1px;
+    border-right:solid 1px;
+    border-bottom:solid 1px;
 }
 
 .msg_body{

hwe/func.php

@@ -89,20 +89,19 @@ function GetImageURL($imgsvr, $filepath='') {
  * @param null|int $con 장수의 벌점
  * @param null|int $conlimit 최대 벌점
  */
-function checkLimit($con = null, $conlimit = null) {
+function checkLimit($con = null) {
     $session = Session::getInstance();
     if($session->userGrade>=4){
         return 0;
     }
 
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
 
     if($con === null){
         $con = $db->queryFirstField('SELECT con FROM general WHERE `owner`=%i', Session::getUserID());
     }
-    if($conlimit === null){
-        $conlimit = $db->queryFirstField('SELECT conlimit FROM game LIMIT 1');
-    }
+    $conlimit = $gameStor->conlimit;
 
     if($con > $conlimit) {
         return 2;
@@ -173,9 +172,9 @@ function cityInfo() {
     }
 
     if($nation['color'] == "" ) { $nation['color'] = "#000000"; }
-    echo "<table width=640 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
-    <tr><td colspan=8 align=center style=height:20px;color:".newColor($nation['color']).";background-color:{$nation['color']};font-weight:bold;font-size:13px;>【 ".CityConst::$regionMap[$city['region']]." | ".CityConst::$levelMap[$city['level']]." 】 {$city['name']}</td></tr>
-    <tr><td colspan=8 align=center style=height:20px;color:".newColor($nation['color']).";background-color:{$nation['color']}><b>";
+    echo "<table style='width:100%;' class='tb_layout bg2'>
+    <tr><td colspan=8 style=text-align:center;height:20px;color:".newColor($nation['color']).";background-color:{$nation['color']};font-weight:bold;font-size:13px;>【 ".CityConst::$regionMap[$city['region']]." | ".CityConst::$levelMap[$city['level']]." 】 {$city['name']}</td></tr>
+    <tr><td colspan=8 style=text-align:center;height:20px;color:".newColor($nation['color']).";background-color:{$nation['color']}><b>";
 
     if($city['nation'] == 0) {
         echo "공 백 지";
@@ -211,46 +210,46 @@ function cityInfo() {
         </b></td>
     </tr>
     <tr>
-        <td rowspan=2 align=center id=bg1><b>주민</b></td>
+        <td rowspan=2 style='text-align:center;' class='bg1'><b>주민</b></td>
         <td height=7 colspan=3>".bar($pop)."</td>
-        <td rowspan=2 align=center id=bg1><b>민심</b></td>
+        <td rowspan=2 style='text-align:center;' class='bg1'><b>민심</b></td>
         <td height=7>".bar($rate)."</td>
-        <td rowspan=2 align=center id=bg1><b>태수</b></td>
-        <td rowspan=2 align=center>{$gen1['name']}</td>
+        <td rowspan=2 style='text-align:center;' class='bg1'><b>태수</b></td>
+        <td rowspan=2 style='text-align:center;'>{$gen1['name']}</td>
     </tr>
     <tr>
-        <td colspan=3 align=center>{$city['pop']}/{$city['pop2']}</td>
-        <td align=center>{$city['rate']}</td>
+        <td colspan=3 style='text-align:center;'>{$city['pop']}/{$city['pop2']}</td>
+        <td style='text-align:center;'>{$city['rate']}</td>
     </tr>
     <tr>
-        <td width=50  rowspan=2 align=center id=bg1><b>농업</b></td>
+        <td width=50  rowspan=2 style='text-align:center;' class='bg1'><b>농업</b></td>
         <td width=100 height=7>".bar($agri)."</td>
-        <td width=50  rowspan=2 align=center id=bg1><b>상업</b></td>
+        <td width=50  rowspan=2 style='text-align:center;' class='bg1'><b>상업</b></td>
         <td width=100 height=7>".bar($comm)."</td>
-        <td width=50  rowspan=2 align=center id=bg1><b>치안</b></td>
+        <td width=50  rowspan=2 style='text-align:center;' class='bg1'><b>치안</b></td>
         <td width=100 height=7>".bar($secu)."</td>
-        <td width=50  rowspan=2 align=center id=bg1><b>군사</b></td>
-        <td rowspan=2 align=center>{$gen2['name']}</td>
+        <td width=50  rowspan=2 style='text-align:center;' class='bg1'><b>군사</b></td>
+        <td rowspan=2 style='text-align:center;'>{$gen2['name']}</td>
     </tr>
     <tr>
-        <td align=center>{$city['agri']}/{$city['agri2']}</td>
-        <td align=center>{$city['comm']}/{$city['comm2']}</td>
-        <td align=center>{$city['secu']}/{$city['secu2']}</td>
+        <td style='text-align:center;'>{$city['agri']}/{$city['agri2']}</td>
+        <td style='text-align:center;'>{$city['comm']}/{$city['comm2']}</td>
+        <td style='text-align:center;'>{$city['secu']}/{$city['secu2']}</td>
     </tr>
     <tr>
-        <td rowspan=2 align=center id=bg1><b>수비</b></td>
+        <td rowspan=2 style='text-align:center;' class='bg1'><b>수비</b></td>
         <td height=7>".bar($def)."</td>
-        <td rowspan=2 align=center id=bg1><b>성벽</b></td>
+        <td rowspan=2 style='text-align:center;' class='bg1'><b>성벽</b></td>
         <td height=7>".bar($wall)."</td>
-        <td rowspan=2 align=center id=bg1><b>시세</b></td>
+        <td rowspan=2 style='text-align:center;' class='bg1'><b>시세</b></td>
         <td height=7>".bar($trade)."</td>
-        <td rowspan=2 align=center id=bg1><b>시중</b></td>
-        <td rowspan=2 align=center>{$gen3['name']}</td>
+        <td rowspan=2 style='text-align:center;' class='bg1'><b>시중</b></td>
+        <td rowspan=2 style='text-align:center;'>{$gen3['name']}</td>
     </tr>
     <tr>
-        <td align=center>{$city['def']}/{$city['def2']}</td>
-        <td align=center>{$city['wall']}/{$city['wall2']}</td>
-        <td align=center>{$tradeStr}</td>
+        <td style='text-align:center;'>{$city['def']}/{$city['def2']}</td>
+        <td style='text-align:center;'>{$city['wall']}/{$city['wall2']}</td>
+        <td style='text-align:center;'>{$tradeStr}</td>
     </tr>
 </table>
 ";
@@ -258,12 +257,11 @@ function cityInfo() {
 
 function myNationInfo() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
     $userID = Session::getUserID();
 
-    $query = "select startyear,year from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear','year']);
 
     $query = "select no,nation from general where owner='{$userID}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -289,43 +287,43 @@ function myNationInfo() {
     $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $level11 = MYDB_fetch_array($genresult);
 
-    echo "<table width=498 height=190 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
+    echo "<table width=498 class='tb_layout bg2 nation_info'>
     <tr>
-        <td colspan=4 align=center ";
+        <td colspan=4 ";
 
-    if($me['nation'] == 0) { echo "style=color:white;background-color:000000;font-weight:bold;font-size:13px;>【재 야】"; }
-    else { echo "style=color:".newColor($nation['color']).";background-color:{$nation['color']};font-weight:bold;font-size:13px;>국가【 {$nation['name']} 】"; }
+    if($me['nation'] == 0) { echo "style='color:white;background-color:000000;font-weight:bold;font-size:13px;text-align:center;'>【재 야】"; }
+    else { echo "style='color:".newColor($nation['color']).";background-color:{$nation['color']};font-weight:bold;font-size:13px;text-align:center'>국가【 {$nation['name']} 】"; }
 
     echo "
         </td>
     </tr>
     <tr>
-        <td align=center id=bg1><b>성 향</b></td>
-        <td align=center colspan=3><font color=\"yellow\">".getNationType($nation['type'])."</font> (".getNationType2($nation['type']).")</td>
+        <td class='bg1 center'><b>성 향</b></td>
+        <td colspan=3 class='center'><font color=\"yellow\">".getNationType($nation['type'])."</font> (".getNationType2($nation['type']).")</td>
         </td>
     </tr>
     <tr>
-        <td width=68  align=center id=bg1><b>".getLevel(12, $nation['level'])."</b></td>
-        <td width=178 align=center>";echo $level12?$level12['name']:"-"; echo "</td>
-        <td width=68  align=center id=bg1><b>".getLevel(11, $nation['level'])."</b></td>
-        <td width=178 align=center>";echo $level11?$level11['name']:"-"; echo "</td>
+        <td width=68 class='bg1 center'><b>".getLevel(12, $nation['level'])."</b></td>
+        <td width=178 class='center'>";echo $level12?$level12['name']:"-"; echo "</td>
+        <td width=68 class='bg1 center'><b>".getLevel(11, $nation['level'])."</b></td>
+        <td width=178 class='center'>";echo $level11?$level11['name']:"-"; echo "</td>
     </tr>
     <tr>
-        <td align=center id=bg1><b>총주민</b></td>
-        <td align=center>";echo $me['nation']==0?"해당 없음":"{$city['totpop']}/{$city['maxpop']}";echo "</td>
-        <td align=center id=bg1><b>총병사</b></td>
-        <td align=center>";echo $me['nation']==0?"해당 없음":"{$general['totcrew']}/{$general['maxcrew']}"; echo "</td>
+        <td class='bg1 center'><b>총주민</b></td>
+        <td class='center'>";echo $me['nation']==0?"해당 없음":"{$city['totpop']}/{$city['maxpop']}";echo "</td>
+        <td class='bg1 center'><b>총병사</b></td>
+        <td class='center'>";echo $me['nation']==0?"해당 없음":"{$general['totcrew']}/{$general['maxcrew']}"; echo "</td>
         </td>
     </tr>
     <tr>
-        <td align=center id=bg1><b>국 고</b></td>
-        <td align=center>";echo $me['nation']==0?"해당 없음":"{$nation['gold']}";echo "</td>
-        <td align=center id=bg1><b>병 량</b></td>
-        <td align=center>";echo $me['nation']==0?"해당 없음":"{$nation['rice']}";echo "</td>
+        <td class='bg1 center'><b>국 고</b></td>
+        <td class='center'>";echo $me['nation']==0?"해당 없음":"{$nation['gold']}";echo "</td>
+        <td class='bg1 center'><b>병 량</b></td>
+        <td class='center'>";echo $me['nation']==0?"해당 없음":"{$nation['rice']}";echo "</td>
     </tr>
     <tr>
-        <td align=center id=bg1><b>지급율</b></td>
-        <td align=center>";
+        <td class='bg1 center'><b>지급율</b></td>
+        <td class='center'>";
     if($me['nation'] == 0) {
         echo "해당 없음";
     } else {
@@ -333,8 +331,8 @@ function myNationInfo() {
     }
     echo "
         </td>
-        <td align=center id=bg1><b>세 율</b></td>
-        <td align=center>";
+        <td class='bg1 center'><b>세 율</b></td>
+        <td class='center'>";
     if($me['nation'] == 0) {
         echo "해당 없음";
     } else {
@@ -374,28 +372,28 @@ function myNationInfo() {
         </td>
     </tr>
     <tr>
-        <td align=center id=bg1><b>속 령</b></td>
-        <td align=center>";echo $me['nation']==0?"-":"{$city['cnt']}"; echo "</td>
-        <td align=center id=bg1><b>장 수</b></td>
-        <td align=center>";echo $me['nation']==0?"-":"{$general['cnt']}"; echo "</td>
+        <td style='text-align:center;' class='bg1'><b>속 령</b></td>
+        <td style='text-align:center;'>";echo $me['nation']==0?"-":"{$city['cnt']}"; echo "</td>
+        <td style='text-align:center;' class='bg1'><b>장 수</b></td>
+        <td style='text-align:center;'>";echo $me['nation']==0?"-":"{$general['cnt']}"; echo "</td>
     </tr>
     <tr>
-        <td align=center id=bg1><b>국 력</b></td>
-        <td align=center>{$nation['power']}</td>
-        <td align=center id=bg1><b>기술력</b></td>
-        <td align=center>";echo $me['nation']==0?"-":"{$nation['tech']}"; echo "</td>
+        <td style='text-align:center;' class='bg1'><b>국 력</b></td>
+        <td style='text-align:center;'>{$nation['power']}</td>
+        <td style='text-align:center;' class='bg1'><b>기술력</b></td>
+        <td style='text-align:center;'>";echo $me['nation']==0?"-":"{$nation['tech']}"; echo "</td>
     </tr>
     <tr>
-        <td align=center id=bg1><b>전 략</b></td>
-        <td align=center>{$nation['sabotagelimit']}</td>
-        <td align=center id=bg1><b>외 교</b></td>
-        <td align=center>{$nation['surlimit']}</td>
+        <td style='text-align:center;' class='bg1'><b>전 략</b></td>
+        <td style='text-align:center;'>{$nation['sabotagelimit']}</td>
+        <td style='text-align:center;' class='bg1'><b>외 교</b></td>
+        <td style='text-align:center;'>{$nation['surlimit']}</td>
     </tr>
     <tr>
-        <td align=center id=bg1><b>임 관</b></td>
-        <td align=center>{$nation['scout']}</td>
-        <td align=center id=bg1><b>전 쟁</b></td>
-        <td align=center>{$nation['war']}</td>
+        <td style='text-align:center;' class='bg1'><b>임 관</b></td>
+        <td style='text-align:center;'>{$nation['scout']}</td>
+        <td style='text-align:center;' class='bg1'><b>전 쟁</b></td>
+        <td style='text-align:center;'>{$nation['war']}</td>
     </tr>
 </table>
 ";
@@ -435,12 +433,11 @@ function commandGroup($typename, $type=0) {
 
 function commandTable() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
     $userID = Session::getUserID();
 
-    $query = "select startyear,year,develcost,scenario from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'develcost', 'scenario']);
 
     $query = "select no,npc,troop,city,nation,level,crew,makelimit,special from general where owner='{$userID}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -675,12 +672,11 @@ function commandTable() {
 
 function CoreCommandTable() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
     $userID = Session::getUserID();
 
-    $query = "select develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $develcost = $gameStor->develcost;
 
     $query = "select no,nation,city,level from general where owner='{$userID}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -727,8 +723,8 @@ function CoreCommandTable() {
     commandGroup("", 1);
     commandGroup("====== 특 수 ======");
     addCommand("초토화", 65, $valid);
-    addCommand("천도/3턴(금쌀{$admin['develcost']}0)", 66, $valid);
-    $cost = $admin['develcost'] * 500 + 60000;   // 7만~13만
+    addCommand("천도/3턴(금쌀{$develcost}0)", 66, $valid);
+    $cost = $develcost * 500 + 60000;   // 7만~13만
     addCommand("증축/6턴(금쌀{$cost})", 67, $valid);
     addCommand("감축/6턴", 68, $valid);
     commandGroup("", 1);
@@ -777,11 +773,10 @@ function myInfo() {
 
 function generalInfo($no) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select show_img_level from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $show_img_level = $gameStor->show_img_level;
 
     $query = "select block,no,name,picture,imgsvr,injury,nation,city,troop,leader,leader2,power,power2,intel,intel2,explevel,experience,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,killturn,age,personal,special,specage,special2,specage2,mode,con,connect from general where no='$no'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -877,77 +872,77 @@ function generalInfo($no) {
     else                        { $general['mode'] = "<font color=red>수비 안함</font>"; }
 
     $weapImage = ServConfig::$gameImagePath."/weap{$general['crewtype']}.png";
-    if($admin['show_img_level'] < 2) { $weapImage = ServConfig::$sharedIconPath."/default.jpg"; };
+    if($show_img_level < 2) { $weapImage = ServConfig::$sharedIconPath."/default.jpg"; };
     $imageTemp = GetImageURL($general['imgsvr']);
-    echo "<table width=498 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
+    echo "<table width=498 class='tb_layout bg2'>
     <tr>
-        <td width=64 height=64 align=center rowspan=3 style='background:no-repeat center url(\"{$imageTemp}/{$general['picture']}\");background-size:64px;'>&nbsp;</td>
-        <td align=center colspan=9 height=16 style=color:".newColor($nation['color']).";background-color:{$nation['color']};font-weight:bold;font-size:13px;>{$general['name']} 【 {$level} | {$call} | {$color}{$injury}</font> 】 ".substr($general['turntime'], 11)."</td>
+        <td width=64 height=64 rowspan=3 style='text-align:center;background:no-repeat center url(\"{$imageTemp}/{$general['picture']}\");background-size:64px;'>&nbsp;</td>
+        <td colspan=9 height=16 style=text-align:center;color:".newColor($nation['color']).";background-color:{$nation['color']};font-weight:bold;font-size:13px;>{$general['name']} 【 {$level} | {$call} | {$color}{$injury}</font> 】 ".substr($general['turntime'], 11)."</td>
     </tr>
     <tr height=16>
-        <td align=center id=bg1><b>통솔</b></td>
-        <td align=center>&nbsp;{$color}{$leader}</font>{$lbonus}&nbsp;</td>
-        <td align=center width=45>".bar(expStatus($general['leader2']), 20)."</td>
-        <td align=center id=bg1><b>무력</b></td>
-        <td align=center>&nbsp;{$color}{$power}</font>&nbsp;</td>
-        <td align=center width=45>".bar(expStatus($general['power2']), 20)."</td>
-        <td align=center id=bg1><b>지력</b></td>
-        <td align=center>&nbsp;{$color}{$intel}</font>&nbsp;</td>
-        <td align=center width=45>".bar(expStatus($general['intel2']), 20)."</td>
+        <td style='text-align:center;' class='bg1'><b>통솔</b></td>
+        <td style='text-align:center;'>&nbsp;{$color}{$leader}</font>{$lbonus}&nbsp;</td>
+        <td style='text-align:center;' width=45>".bar(expStatus($general['leader2']), 20)."</td>
+        <td style='text-align:center;' class='bg1'><b>무력</b></td>
+        <td style='text-align:center;'>&nbsp;{$color}{$power}</font>&nbsp;</td>
+        <td style='text-align:center;' width=45>".bar(expStatus($general['power2']), 20)."</td>
+        <td style='text-align:center;' class='bg1'><b>지력</b></td>
+        <td style='text-align:center;'>&nbsp;{$color}{$intel}</font>&nbsp;</td>
+        <td style='text-align:center;' width=45>".bar(expStatus($general['intel2']), 20)."</td>
     </tr>
     <tr>
-        <td align=center id=bg1><b>명마</b></td>
-        <td align=center colspan=2><font size=1>$horsename</font></td>
-        <td align=center id=bg1><b>무기</b></td>
-        <td align=center colspan=2><font size=1>$weapname</font></td>
-        <td align=center id=bg1><b>서적</b></td>
-        <td align=center colspan=2><font size=1>$bookname</font></td>
+        <td style='text-align:center;' class='bg1'><b>명마</b></td>
+        <td style='text-align:center;' colspan=2><font size=1>$horsename</font></td>
+        <td style='text-align:center;' class='bg1'><b>무기</b></td>
+        <td style='text-align:center;' colspan=2><font size=1>$weapname</font></td>
+        <td style='text-align:center;' class='bg1'><b>서적</b></td>
+        <td style='text-align:center;' colspan=2><font size=1>$bookname</font></td>
     </tr>
     <tr>
-        <td align=center height=64 rowspan=3 style='background:no-repeat center url(\"{$weapImage}\");background-size:64px;'></td>
-        <td align=center id=bg1><b>자금</b></td>
-        <td align=center colspan=2>{$general['gold']}</td>
-        <td align=center id=bg1><b>군량</b></td>
-        <td align=center colspan=2>{$general['rice']}</td>
-        <td align=center id=bg1><b>도구</b></td>
-        <td align=center colspan=2><font size=1>$itemname</font></td>
+        <td height=64 rowspan=3 style='text-align:center;background:no-repeat center url(\"{$weapImage}\");background-size:64px;'></td>
+        <td style='text-align:center;' class='bg1'><b>자금</b></td>
+        <td style='text-align:center;' colspan=2>{$general['gold']}</td>
+        <td style='text-align:center;' class='bg1'><b>군량</b></td>
+        <td style='text-align:center;' colspan=2>{$general['rice']}</td>
+        <td style='text-align:center;' class='bg1'><b>도구</b></td>
+        <td style='text-align:center;' colspan=2><font size=1>$itemname</font></td>
     </tr>
     <tr>
-        <td align=center id=bg1><b>병종</b></td>
-        <td align=center colspan=2>$typename</td>
-        <td align=center id=bg1><b>병사</b></td>
-        <td align=center colspan=2>{$general['crew']}</td>
-        <td align=center id=bg1><b>성격</b></td>
-        <td align=center colspan=2>".getGenChar($general['personal'])."</td>
+        <td style='text-align:center;' class='bg1'><b>병종</b></td>
+        <td style='text-align:center;' colspan=2>$typename</td>
+        <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>
     </tr>
     <tr>
-        <td align=center id=bg1><b>훈련</b></td>
-        <td align=center colspan=2>$train</td>
-        <td align=center id=bg1><b>사기</b></td>
-        <td align=center colspan=2>$atmos</td>
-        <td align=center id=bg1><b>특기</b></td>
-        <td align=center colspan=2>$special / $special2</td>
+        <td style='text-align:center;' class='bg1'><b>훈련</b></td>
+        <td style='text-align:center;' colspan=2>$train</td>
+        <td style='text-align:center;' class='bg1'><b>사기</b></td>
+        <td style='text-align:center;' colspan=2>$atmos</td>
+        <td style='text-align:center;' class='bg1'><b>특기</b></td>
+        <td style='text-align:center;' colspan=2>$special / $special2</td>
     </tr>
     <tr height=20>
-        <td align=center id=bg1><b>Lv</b></td>
-        <td align=center>&nbsp;{$general['explevel']}&nbsp;</td>
-        <td align=center colspan=5>".bar(getLevelPer($general['experience'], $general['explevel']), 20)."</td>
-        <td align=center id=bg1><b>연령</b></td>
-        <td align=center colspan=2>{$general['age']}</td>
+        <td style='text-align:center;' class='bg1'><b>Lv</b></td>
+        <td style='text-align:center;'>&nbsp;{$general['explevel']}&nbsp;</td>
+        <td style='text-align:center;' colspan=5>".bar(getLevelPer($general['experience'], $general['explevel']), 20)."</td>
+        <td style='text-align:center;' class='bg1'><b>연령</b></td>
+        <td style='text-align:center;' colspan=2>{$general['age']}</td>
     </tr>
     <tr height=20>
-        <td align=center id=bg1><b>수비</b></td>
-        <td align=center colspan=3>{$general['mode']}</td>
-        <td align=center id=bg1><b>삭턴</b></td>
-        <td align=center colspan=2>{$general['killturn']} 턴</td>
-        <td align=center id=bg1><b>실행</b></td>
-        <td align=center colspan=2>$remaining 분 남음</td>
+        <td style='text-align:center;' class='bg1'><b>수비</b></td>
+        <td style='text-align:center;' colspan=3>{$general['mode']}</td>
+        <td style='text-align:center;' class='bg1'><b>삭턴</b></td>
+        <td style='text-align:center;' colspan=2>{$general['killturn']} 턴</td>
+        <td style='text-align:center;' class='bg1'><b>실행</b></td>
+        <td style='text-align:center;' colspan=2>$remaining 분 남음</td>
     </tr>
     <tr height=20>
-        <td align=center id=bg1><b>부대</b></td>
-        <td align=center colspan=3>{$troop['name']}</td>
-        <td align=center id=bg1><b>벌점</b></td>
-        <td align=center colspan=5>".getConnect($general['connect'])." {$general['connect']}({$general['con']})</td>
+        <td style='text-align:center;' class='bg1'><b>부대</b></td>
+        <td style='text-align:center;' colspan=3>{$troop['name']}</td>
+        <td style='text-align:center;' class='bg1'><b>벌점</b></td>
+        <td style='text-align:center;' colspan=5>".getConnect($general['connect'])." {$general['connect']}({$general['con']})</td>
     </tr>
 </table>";
 }
@@ -1014,103 +1009,95 @@ function generalInfo2($no) {
     $general['dex30_short'] = sprintf('%.1fK', $general['dex30']/1000);
     $general['dex40_short'] = sprintf('%.1fK', $general['dex40']/1000);
 
-    echo "<table width=498 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
-    <tr><td align=center colspan=6 id=bg1><b>추 가 정 보</b></td></tr>
+    echo "<table width=498 class='tb_layout bg2'>
+    <tr><td style='text-align:center;' colspan=6 class='bg1'><b>추 가 정 보</b></td></tr>
     <tr>
-        <td align=center id=bg1><b>명성</b></td>
-        <td align=center>$experience</td>
-        <td align=center id=bg1><b>계급</b></td>
-        <td align=center colspan=3>$dedication</td>
+        <td style='text-align:center;' class='bg1'><b>명성</b></td>
+        <td style='text-align:center;'>$experience</td>
+        <td style='text-align:center;' class='bg1'><b>계급</b></td>
+        <td style='text-align:center;' colspan=3>$dedication</td>
     </tr>
     <tr>
-        <td width=64 align=center id=bg1><b>전투</b></td>
-        <td width=132 align=center>{$general['warnum']}</td>
-        <td width=48 align=center id=bg1><b>계략</b></td>
-        <td width=98 align=center>{$general['firenum']}</td>
-        <td width=48 align=center id=bg1><b>사관</b></td>
-        <td width=98 align=center>{$general['belong']}년</td>
+        <td width=64 style='text-align:center;' class='bg1'><b>전투</b></td>
+        <td width=132 style='text-align:center;'>{$general['warnum']}</td>
+        <td width=48 style='text-align:center;' class='bg1'><b>계략</b></td>
+        <td width=98 style='text-align:center;'>{$general['firenum']}</td>
+        <td width=48 style='text-align:center;' class='bg1'><b>사관</b></td>
+        <td width=98 style='text-align:center;'>{$general['belong']}년</td>
     </tr>
     <tr>
-        <td align=center id=bg1><b>승률</b></td>
-        <td align=center>{$general['winrate']} %</td>
-        <td align=center id=bg1><b>승리</b></td>
-        <td align=center>{$general['killnum']}</td>
-        <td align=center id=bg1><b>패배</b></td>
-        <td align=center>{$general['deathnum']}</td>
+        <td style='text-align:center;' class='bg1'><b>승률</b></td>
+        <td style='text-align:center;'>{$general['winrate']} %</td>
+        <td style='text-align:center;' class='bg1'><b>승리</b></td>
+        <td style='text-align:center;'>{$general['killnum']}</td>
+        <td style='text-align:center;' class='bg1'><b>패배</b></td>
+        <td style='text-align:center;'>{$general['deathnum']}</td>
     </tr>
     <tr>
-        <td align=center id=bg1><b>살상률</b></td>
-        <td align=center>{$general['killrate']} %</td>
-        <td align=center id=bg1><b>사살</b></td>
-        <td align=center>{$general['killcrew']}</td>
-        <td align=center id=bg1><b>피살</b></td>
-        <td align=center>{$general['deathcrew']}</td>
+        <td style='text-align:center;' class='bg1'><b>살상률</b></td>
+        <td style='text-align:center;'>{$general['killrate']} %</td>
+        <td style='text-align:center;' class='bg1'><b>사살</b></td>
+        <td style='text-align:center;'>{$general['killcrew']}</td>
+        <td style='text-align:center;' class='bg1'><b>피살</b></td>
+        <td style='text-align:center;'>{$general['deathcrew']}</td>
     </tr>
 </table>
-<table width=498 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
-    <tr><td align=center colspan=4 id=bg1><b>숙 련 도</b></td></tr>
+<table width=498 class='tb_layout bg2'>
+    <tr><td style='text-align:center;' colspan=4 class='bg1'><b>숙 련 도</b></td></tr>
     <tr height=16>
-        <td width=64 align=center id=bg1><b>보병</b></td>
+        <td width=64 style='text-align:center;' class='bg1'><b>보병</b></td>
         <td width=40>　{$general['dex0_text']}</td>
         <td width=60 align=right>{$general['dex0_short']}&nbsp;</td>
-        <td width=330 align=center>".bar($dex0, 16)."</td>
+        <td width=330 style='text-align:center;'>".bar($dex0, 16)."</td>
     </tr>
     <tr height=16>
-        <td align=center id=bg1><b>궁병</b></td>
+        <td style='text-align:center;' class='bg1'><b>궁병</b></td>
         <td>　{$general['dex10_text']}</td>
         <td align=right>{$general['dex10_short']}&nbsp;</td>
-        <td align=center>".bar($dex10, 16)."</td>
+        <td style='text-align:center;'>".bar($dex10, 16)."</td>
     </tr>
     <tr height=16>
-        <td align=center id=bg1><b>기병</b></td>
+        <td style='text-align:center;' class='bg1'><b>기병</b></td>
         <td>　{$general['dex20_text']}</td>
         <td align=right>{$general['dex20_short']}&nbsp;</td>
-        <td align=center>".bar($dex20, 16)."</td>
+        <td style='text-align:center;'>".bar($dex20, 16)."</td>
     </tr>
     <tr height=16>
-        <td align=center id=bg1><b>귀병</b></td>
+        <td style='text-align:center;' class='bg1'><b>귀병</b></td>
         <td>　{$general['dex30_text']}</td>
         <td align=right>{$general['dex30_short']}&nbsp;</td>
-        <td align=center>".bar($dex30, 16)."</td>
+        <td style='text-align:center;'>".bar($dex30, 16)."</td>
     </tr>
     <tr height=16>
-        <td align=center id=bg1><b>차병</b></td>
+        <td style='text-align:center;' class='bg1'><b>차병</b></td>
         <td>　{$general['dex40_text']}</td>
         <td align=right>{$general['dex40_short']}&nbsp;</td>
-        <td align=center>".bar($dex40, 16)."</td>
+        <td style='text-align:center;'>".bar($dex40, 16)."</td>
     </tr>
 </table>";
 }
 
 function adminMsg() {
     $db = DB::db();
-    $connect=$db->get();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $msg = $gameStor->msg;
 
-    $query = "select msg from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
-
-    echo "운영자 메세지 : <font color=yellow>";
-    echo $admin['msg']."</font>";
+    return "운영자 메세지 : <span style='color:yellow;'>$msg</span>";
 }
 
 function getOnlineNum() {
-    return DB::db()->queryFirstField('select `online` from `game` where `no`=1');
+    return KVStorage::getStorage(DB::db(), 'game_env')->online;
 }
 
 function onlinegen() {
     $db = DB::db();
-    $connect=$db->get();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
 
     $onlinegen = "";
     $generalID = Session::getInstance()->generalID;
     $nationID = DB::db()->queryFirstField('select `nation` from `general` where `no` = %i', $generalID);
     if($nationID === null || Util::toInt($nationID) === 0) {
-        $query = "select onlinegen from game limit 1";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $game = MYDB_fetch_array($result);
-
-        $onlinegen = $game['onlinegen'];
+        $onlinegen = $gameStor->onlinegen;
     } else {
         $onlinegen = DB::db()->queryFirstField('select onlinegen from nation where nation=%i',$nationID);
     }
@@ -1119,12 +1106,9 @@ function onlinegen() {
 
 function onlineNation() {
     $db = DB::db();
-    $connect=$db->get();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    $query = "select onlinenation from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $game = MYDB_fetch_array($result);
-    return $game['onlinenation'];
+    return $gameStor->onlinenation;
 }
 
 function nationMsg() {
@@ -1159,14 +1143,14 @@ function msgprint($msg, $name, $picture, $imgsvr, $when, $num, $type) {
 
     $imageTemp = GetImageURL($imgsvr);
     echo "
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table style='text-align:center;' width=1000 class='tb_layout bg0'>
     <tr>
-        <td width=64 align=center id=bg1><font size=1>$name</font></td>
-        <td width=772 align=center id=bg1><font size=4><b>$message[0]</b></font></td>
-        <td width=148 align=center id=bg1>$when</td>
+        <td width=64 style='text-align:center;' class='bg1'><font size=1>$name</font></td>
+        <td width=772 style='text-align:center;' class='bg1'><font size=4><b>$message[0]</b></font></td>
+        <td width=148 style='text-align:center;' class='bg1'>$when</td>
     </tr>
     <tr>
-        <td width=64 height=64 valign=top><img width='64' height='64' src={$imageTemp}/{$picture} border=0></td>
+        <td width=64 height=64 valign=top><img width='64' height='64' src={$imageTemp}/{$picture} border='0'></td>
         <td width=932 colspan=2>$message[1]</td>
     </tr>";
     for($i=0; $i < $count; $i++) {
@@ -1177,14 +1161,14 @@ function msgprint($msg, $name, $picture, $imgsvr, $when, $num, $type) {
         $regen = MYDB_fetch_array($result);
         echo "
     <tr>
-        <td width=64 align=center><font size=1>{$regen['name']}</font></td>
+        <td width=64 style='text-align:center;'><font size=1>{$regen['name']}</font></td>
         <td width=932 colspan=2>$reply</td>
     </tr>";
     }
     echo "
     <tr>
         <form name=reply_form{$num} method=post action=$board>
-        <td width=64 align=center>댓글달기</td>
+        <td width=64 style='text-align:center;'>댓글달기</td>
         <td width=932 colspan=2>
             <input type=textarea name=reply maxlength=250 style=color:white;background-color:black;width:830px;>
             <input type=submit value=댓글달기>
@@ -1268,9 +1252,8 @@ function increaseRefresh($type="", $cnt=1) {
     $date = date('Y-m-d H:i:s');
 
     $db = DB::db();
-    $db->update('game', [
-        'refresh'=>$db->sqleval('refresh+%i', $cnt)
-    ], true);
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $gameStor->refresh = $gameStor->refresh+$cnt; //TODO: +로 증가하는 값은 별도로 분리
 
     if($generalID) {
         $db->update('general', [
@@ -1338,22 +1321,21 @@ function increaseRefresh($type="", $cnt=1) {
 function updateTraffic() {
     $online = getOnlineNum();
     $db = DB::db();
-    $game = $db->queryFirstRow('SELECT year,month,refresh,maxonline,maxrefresh from game limit 1');
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $game_env = $gameStor->getValues(['year','month','refresh','maxonline','maxrefresh']);
 
     //최다갱신자
     $user = $db->queryFirstRow('select name,refresh from general order by refresh desc limit 1');
 
-    if($game['maxrefresh'] < $game['refresh']) {
-        $game['maxrefresh'] = $game['refresh'];
+    if($game_env['maxrefresh'] < $game_env['refresh']) {
+        $game_env['maxrefresh'] = $game_env['refresh'];
     }
-    if($game['maxonline'] < $online) {
-        $game['maxonline'] = $online;
+    if($game_env['maxonline'] < $online) {
+        $game_env['maxonline'] = $online;
     }
-    $db->update('game',[
-        'refresh'=>0,
-        'maxrefresh'=>$game['maxrefresh'],
-        'maxonline'=>$game['maxonline']
-    ], true);
+    $gameStor->refresh = 0;
+    $gameStor->maxrefresh = $game_env['maxrefresh'];
+    $gameStor->maxonline = $game_env['maxonline'];
 
     $db->update('general', ['refresh'=>0], true);
 
@@ -1362,9 +1344,9 @@ function updateTraffic() {
     file_put_contents(__dir__."/logs/_traffic.txt",
         Json::encode([
             $date,
-            $game['year'],
-            $game['month'],
-            $game['refresh'],
+            $game_env['year'],
+            $game_env['month'],
+            $game_env['refresh'],
             $online,
             $user['name']."(".$user['refresh'].")"
         ])."\n"
@@ -1374,15 +1356,14 @@ function updateTraffic() {
 function CheckOverhead() {
     //서버정보
     $db = DB::db();
-    $admin = $db->queryFirstRow('SELECT turnterm, conlimit from game LIMIT 1');
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    list($turnterm, $conlimit) = $gameStor->getValuesAsArray(['turnterm', 'conlimit']);
 
-    $con = Util::round(pow($admin['turnterm'], 0.6) * 3) * 10;
+    $con = Util::round(pow($turnterm, 0.6) * 3) * 10;
 
 
-    if($con != $admin['conlimit']){
-        $db->update('game', [
-            'conlimit' => $con
-        ], true);
+    if($con != $conlimit){
+        $gameStor->conlimit = $con;
     }
 }
 
@@ -1420,27 +1401,30 @@ function unlock() {
 }
 
 function timeover() {
-    $admin = DB::db()->queryFirstRow(
-        'SELECT turnterm,TIMESTAMPDIFF(SECOND,turntime,now()) as diff from game limit 1'
-    );
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    $t = min($admin['turnterm'], 5);
+    list($turnterm, $turntime) = $gameStor->getValuesAsArray(['turnterm', 'turntime']);
+    $diff = (new \DateTime())->getTimestamp() - (new \DateTime($turntime))->getTimestamp();
 
-    $term = $admin['diff'];
+    $t = min($turnterm, 5);
+
+    $term = $diff;
     if($term >= $t || $term < 0) { return 1; }
     else { return 0; }
 }
 
 function checkDelay() {
     $db = DB::db();
-    $connect=$db->get();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
 
     //서버정보
-    $query = "select turnterm,now() as now,TIMESTAMPDIFF(MINUTE,turntime,now()) as offset from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $now = new \DateTimeImmutable();
+    $turntime = new \DateTimeImmutable($gameStor->turntime);
+    $timeMinDiff = intdiv($now->getTimestamp() - $turntime->getTimestamp(), 60);
+    
     // 1턴이상 갱신 없었으면 서버 지연
-    $term = $admin['turnterm'];
+    $term = $gameStor->turnterm;
     if($term >= 20){
         $threshold = 1;
     }
@@ -1451,20 +1435,25 @@ function checkDelay() {
         $threshold = 3;
     }
     //지연 해야할 밀린 턴 횟수
-    $iter = intdiv($admin['offset'], $term);
+    $iter = intdiv($timeMinDiff, $term);
     if($iter > $threshold) {
         $minute = $iter * $term;
-        $query = "update game set turntime=DATE_ADD(turntime, INTERVAL $minute MINUTE),starttime=DATE_ADD(starttime, INTERVAL $minute MINUTE),tnmt_time=DATE_ADD(tnmt_time, INTERVAL $minute MINUTE)";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $query = "update general set turntime=DATE_ADD(turntime, INTERVAL $minute MINUTE) where turntime<=DATE_ADD(turntime, INTERVAL $term MINUTE)";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $query = "update auction set expire=DATE_ADD(expire, INTERVAL $minute MINUTE)";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $newTurntime = $turntime->add(new DateInterval("PT{$minute}M"));
+        $newNextTurntime = $turntime->add(new DateInterval("PT{$term}M"));
+        $gameStor->turntime = $newTurntime;
+
+        $db->update('general', [
+            'turntime'=> $db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
+        ], 'turntime<=DATE_ADD(turntime, INTERVAL %i MINUTE)', $term);
+        $db->update('auction', [
+            'expire'=> $db->sqleval('DATE_ADD(expire, INTERVAL %i MINUTE)', $minute)
+        ], true);
     }
 }
 
 function updateOnline() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
     $nationname = ["재야"];
 
@@ -1498,8 +1487,7 @@ function updateOnline() {
 	        $onnationstr .= "【{$nationname[$key]}】, ";
 	
 	        if($key == 0) {
-	            $query = "update game set onlinegen='$onnation[0]'";
-	            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+                $gameStor->onlinegen = $onnation[0];
 	        } else {
 	            $query = "update nation set onlinegen='$onnation[$key]' where nation='$key'";
 	            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1508,12 +1496,13 @@ function updateOnline() {
 	}
 
     //접속중인 국가
-    $query = "update game set online='$onlinenum',onlinenation='$onnationstr'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->online = $onlinenum;
+    $gameStor->onlinenation = $onnationstr;
 }
 
 function checkTurn() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $alllog = [];
@@ -1548,14 +1537,11 @@ function checkTurn() {
     //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', 진입');
     
     //천통시에는 동결
-    $query = "select turntime from game where isUnited=2";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $down = MYDB_num_rows($result);
-    if($down > 0) {
-        $query = "update plock set plock=1";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    if($gameStor->isUnited == 2) {
+        $db->update('plock', ['plock'=>1], true);
         return;
     }
+    $gameStor->cacheAll();
     // 1턴이상 갱신 없었으면 서버 지연
     //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', checkDelay');
     checkDelay();
@@ -1566,14 +1552,11 @@ function checkTurn() {
     //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', CheckOverhead');
     CheckOverhead();
     //서버정보
-    $query = "select * from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
 
     $date = date('Y-m-d H:i:s');
     // 최종 처리 월턴의 다음 월턴시간 구함
-    $prevTurn = cutTurn($admin['turntime'], $admin['turnterm']);
-    $nextTurn = addTurn($prevTurn, $admin['turnterm']);
+    $prevTurn = cutTurn($gameStor->turntime, $gameStor->turnterm);
+    $nextTurn = addTurn($prevTurn, $gameStor->turnterm);
     // 현재 턴 이전 월턴까지 모두처리.
     //최종 처리 이후 다음 월턴이 현재 시간보다 전이라면
     while($nextTurn <= $date) {
@@ -1611,15 +1594,15 @@ function checkTurn() {
 
             // 잡금 해제
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', unlock');
+            $gameStor->resetCache(true);
             unlock();
             return false;
         }
 
         // 그 시각 년도,월 저장
-        $dt = turnDate($nextTurn);
-        $admin['year'] = $dt[0]; $admin['month'] = $dt[1];
+        list($gameStor->year, $gameStor->month) = turnDate($nextTurn);
 
-        pushLockLog(["-- checkTurn() ".$admin['month']."월 : ".date('Y-m-d H:i:s')." : ".$session->userName]);
+        pushLockLog(["-- checkTurn() ".$gameStor->month."월 : ".date('Y-m-d H:i:s')." : ".$session->userName]);
 
         // 이벤트 핸들러 동작
         foreach (DB::db()->query('SELECT * from event') as $rawEvent) {
@@ -1628,13 +1611,12 @@ function checkTurn() {
             $action = Json::decode($rawEvent['action']);
             $event = new Event\EventHandler($cond, $action);
 
-            $event->tryRunEvent(['currentEventID'=>$eventID] + $admin);
+            $event->tryRunEvent(['currentEventID'=>$eventID] + $gameStor->getAll(true));
         }
 
         // 분기계산. 장수들 턴보다 먼저 있다면 먼저처리
-        if($admin['month'] == 1) {
+        if($gameStor->month == 1) {
             // NPC 등장
-            //if($admin['scenario'] > 0 && $admin['scenario'] < 20) { RegNPC(); }
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processGoldIncome');
             processGoldIncome();
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processSpring');
@@ -1650,14 +1632,14 @@ function checkTurn() {
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', addAge');
             addAge();
             // 새해 알림
-            $alllog[] = "<C>◆</>{$admin['month']}월:<C>{$admin['year']}</>년이 되었습니다.";
-            pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-        } elseif($admin['month'] == 4) {
+            $alllog[] = "<C>◆</>{$gameStor->month}월:<C>{$gameStor->year}</>년이 되었습니다.";
+            pushGeneralPublicRecord($alllog, $gameStor->year, $gameStor->month);
+        } elseif($gameStor->month == 4) {
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateQuaterly');
             updateQuaterly();
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', disaster');
             disaster();
-        } elseif($admin['month'] == 7) {
+        } elseif($gameStor->month == 7) {
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processRiceIncome');
             processRiceIncome();
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', processFall');
@@ -1668,7 +1650,7 @@ function checkTurn() {
             disaster();
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', tradeRate');
             tradeRate();
-        } elseif($admin['month'] == 10) {
+        } elseif($gameStor->month == 10) {
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', updateQuaterly');
             updateQuaterly();
             //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', disaster');
@@ -1679,18 +1661,16 @@ function checkTurn() {
 
         // 다음달로 넘김
         $prevTurn = $nextTurn;
-        $nextTurn = addTurn($prevTurn, $admin['turnterm']);
+        $nextTurn = addTurn($prevTurn, $gameStor->turnterm);
     }
 
     //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', '.__LINE__);
         
     // 이시각 정각 시까지 업데이트 완료했음
-    $query = "update game set turntime='$prevTurn'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->turntime = $prevTurn;
 
     // 그 시각 년도,월 저장
-    $dt = turnDate($prevTurn);
-    $admin['year'] = $dt[0]; $admin['month'] = $dt[1];
+    list($gameStor->year, $gameStor->month) = turnDate($prevTurn);
     // 현재시간의 월턴시간 이후 분단위 장수 처리
     do {
         $query = "select no,name,turntime,turn0,npc from general where turntime<='$date' order by turntime";
@@ -1718,8 +1698,7 @@ function checkTurn() {
 
     //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', '.__LINE__);
     
-    $query = "update game set turntime='$date'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->turntime = $date;
 
     // 부상 과도 제한
     $query = "update general set injury='80' where injury>'80'";
@@ -1732,6 +1711,7 @@ function checkTurn() {
     processAuction();
     // 잡금 해제
     //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', unlock');
+    $gameStor->resetCache(true);
     unlock();
 
     pushLockLog(["- checkTurn()   출 : ".date('Y-m-d H:i:s')." : ".$session->userName]);
@@ -1743,15 +1723,14 @@ function checkTurn() {
 
 function addAge() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     //나이와 호봉 증가
     $query = "update general set age=age+1,belong=belong+1";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
-    $query = "select startyear,year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
     if($admin['year'] >= $admin['startyear']+3) {
         $query = "select no,name,nation,leader,power,intel from general where specage<=age and special='0'";
@@ -1787,8 +1766,8 @@ function addAge() {
 
 function turnDate($curtime) {
     $db = DB::db();
-
-    $admin = $db->queryFirstRow('SELECT startyear,starttime,turnterm,year,month from game limit 1');
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $admin = $gameStor->getValues(['startyear', 'starttime', 'turnterm', 'year', 'month']);
 
     $turn = $admin['starttime'];
     $curturn = cutTurn($curtime, $admin['turnterm']);
@@ -1804,10 +1783,8 @@ function turnDate($curtime) {
 
     // 바뀐 경우만 업데이트
     if($admin['month'] != $month || $admin['year'] != $year) {
-        $db->update('game', [
-            'year'=>$year,
-            'month'=>$month
-        ], true);
+        $gameStor->year = $year;
+        $gameStor->month = $month;
     }
 
     return [$year, $month];
@@ -1816,11 +1793,9 @@ function turnDate($curtime) {
 
 function triggerTournament() {
     $db = DB::db();
-    $connect=$db->get();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    $query = "select tournament,tnmt_trig from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['tournament', 'tnmt_trig']);
 
     //현재 토너먼트 없고, 자동개시 걸려있을때, 40%확률
     if($admin['tournament'] == 0 && $admin['tnmt_trig'] > 0 && rand() % 100 < 40) {
@@ -1913,13 +1888,12 @@ function PreprocessCommand($no) {
 
 function updateTurntime($no) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
     $alllog = [];
     $log = [];
 
-    $query = "select year,month,isUnited,turnterm from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month', 'isUnited', 'turnterm']);
 
     $query = "select no,name,name2,nation,troop,age,turntime,killturn,level,deadyear,npc,npc_org,affinity,npcid from general where no='$no'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -2163,6 +2137,7 @@ function CheckHall($no) {
 
 function uniqueItem($general, $log, $vote=0) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
     $alllog = [];
     $history = [];
@@ -2172,15 +2147,13 @@ function uniqueItem($general, $log, $vote=0) {
     if($general['npc'] >= 2) { return $log; }
     if($general['weap'] > 6 || $general['book'] > 6 || $general['horse'] > 6 || $general['item'] > 6) { return $log; }
 
-    $query = "select year,month,scenario from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $game = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month', 'scenario']);
 
     $query = "select count(*) as cnt from general where npc<2";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $gen = MYDB_fetch_array($result);
 
-    if($game['scenario'] == 0)  { $prob = $gen['cnt'] * 5; }  // 5~6개월에 하나씩 등장
+    if($game_env['scenario'] == 0)  { $prob = $gen['cnt'] * 5; }  // 5~6개월에 하나씩 등장
     else { $prob = $gen['cnt']; }  // 1~2개월에 하나씩 등장
 
     if($vote == 1) { $prob = Util::round($gen['cnt'] * 0.7 / 3); }     // 투표율 70%, 투표 한번에 2~3개 등장
@@ -2221,63 +2194,63 @@ function uniqueItem($general, $log, $vote=0) {
             switch($sel) {
             case 0:
                 $log[] = "<C>●</><C>".getWeapName($it)."</>(을)를 습득했습니다!";
-                $alllog[0] = "<C>●</>{$game['month']}월:<Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$game['year']}년 {$game['month']}월:<C>".getWeapName($it)."</>(을)를 습득");
+                $alllog[0] = "<C>●</>{$game_env['month']}월:<Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
+                pushGeneralHistory($general, "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C>".getWeapName($it)."</>(을)를 습득");
                 if($vote == 0) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getWeapName($it)."</>(을)를 습득했습니다!";
                 }
                 break;
             case 1:
                 $log[] = "<C>●</><C>".getBookName($it)."</>(을)를 습득했습니다!";
-                $alllog[0] = "<C>●</>{$game['month']}월:<Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$game['year']}년 {$game['month']}월:<C>".getBookName($it)."</>(을)를 습득");
+                $alllog[0] = "<C>●</>{$game_env['month']}월:<Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
+                pushGeneralHistory($general, "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C>".getBookName($it)."</>(을)를 습득");
                 if($vote == 0) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getBookName($it)."</>(을)를 습득했습니다!";
                 }
                 break;
             case 2:
                 $log[] = "<C>●</><C>".getHorseName($it)."</>(을)를 습득했습니다!";
-                $alllog[0] = "<C>●</>{$game['month']}월:<Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$game['year']}년 {$game['month']}월:<C>".getHorseName($it)."</>(을)를 습득");
+                $alllog[0] = "<C>●</>{$game_env['month']}월:<Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
+                pushGeneralHistory($general, "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C>".getHorseName($it)."</>(을)를 습득");
                 if($vote == 0) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getHorseName($it)."</>(을)를 습득했습니다!";
                 }
                 break;
             case 3:
                 $log[] = "<C>●</><C>".getItemName($it)."</>(을)를 습득했습니다!";
-                $alllog[0] = "<C>●</>{$game['month']}월:<Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$game['year']}년 {$game['month']}월:<C>".getItemName($it)."</>(을)를 습득");
+                $alllog[0] = "<C>●</>{$game_env['month']}월:<Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
+                pushGeneralHistory($general, "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C>".getItemName($it)."</>(을)를 습득");
                 if($vote == 0) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
                 } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$game['year']}년 {$game['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
+                    $history[] = "<C>●</>{$game_env['year']}년 {$game_env['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>(이)가 <C>".getItemName($it)."</>(을)를 습득했습니다!";
                 }
                 break;
             }
-            pushGeneralPublicRecord($alllog, $game['year'], $game['month']);
-            pushWorldHistory($history, $game['year'], $game['month']);
+            pushGeneralPublicRecord($alllog, $game_env['year'], $game_env['month']);
+            pushWorldHistory($history, $game_env['year'], $game_env['month']);
         }
     }
     return $log;
@@ -2374,13 +2347,8 @@ function checkExperience($general, $log) {
 
 function getAdmin() {
     $db = DB::db();
-    $connect=$db->get();
-
-    $query = "select * from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
-
-    return $admin;
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    return $gameStor->getAll();
 }
 
 function getMe() {
@@ -2430,14 +2398,13 @@ function getNation($nation) {
 
 function deleteNation($general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $nation = getNationStaticInfo($general['nation']);
 
@@ -2465,11 +2432,10 @@ function deleteNation($general) {
 
 function nextRuler($general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $query = "select nation,name from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -2579,7 +2545,7 @@ function searchDistance(int $from, int $maxDist=99, bool $distForm = false) {
     }
 }
 
-function isClose(int $nation1, int $nation2, bool $includeNoSupply=true) {
+function isNeighbor(int $nation1, int $nation2, bool $includeNoSupply=true) {
     $db = DB::db();
 
     $nation1Cities = [];
@@ -2672,12 +2638,11 @@ function CharCritical($rate, $personal) {
 
 function SabotageInjury($city, $type=0) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
     $log = [];
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $query = "select no,name,nation from general where city='$city'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

hwe/func_auction.php

@@ -18,11 +18,10 @@ function GetStuffName($stuff) {
 
 function registerAuction() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select startyear,year,month,turnterm from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'turnterm']);
 
     $unit = 60 * $admin['turnterm'];
 
@@ -142,6 +141,7 @@ function registerAuction() {
 
 function processAuction() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $trader = [];
@@ -153,9 +153,7 @@ function processAuction() {
 
     $date = date("Y-m-d H:i:s");
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $query = "select * from auction where expire<='$date'";
     $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

hwe/func_command.php

@@ -457,28 +457,27 @@ function getCoreTurn($nation, $level) {
 function processCommand($no) {
     $session = Session::getInstance();
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
-
-    $query = "select month,killturn from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    
+    list($month, $killturn) = $gameStor->getValuesAsArray(['month', 'killturn']);
     $log = [];
 
     // 블럭자는 미실행. 삭턴 감소
     if($general['block'] == 2) {
         $date = substr($general['turntime'],11,5);
-        $log[] = "<C>●</>{$admin['month']}월:현재 멀티, 또는 비매너로 인한<R>블럭</> 대상자입니다. <1>$date</>";
+        $log[] = "<C>●</>{$month}월:현재 멀티, 또는 비매너로 인한<R>블럭</> 대상자입니다. <1>$date</>";
         pushGenLog($general, $log);
 
         $query = "update general set recturn='',resturn='BLOCK_2',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     } elseif($general['block'] == 3) {
         $date = substr($general['turntime'],11,5);
-        $log[] = "<C>●</>{$admin['month']}월:현재 악성유저로 분류되어 <R>블럭, 발언권 무효</> 대상자입니다. <1>$date</>";
+        $log[] = "<C>●</>{$month}월:현재 악성유저로 분류되어 <R>블럭, 발언권 무효</> 대상자입니다. <1>$date</>";
         pushGenLog($general, $log);
 
         $query = "update general set recturn='',resturn='BLOCK_3',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
@@ -530,14 +529,14 @@ function processCommand($no) {
 
         $command = DecodeCommand($general['turn0']);
         //삭턴 처리
-        if($general['npc'] >= 2 || $general['killturn'] > $admin['killturn']) {
+        if($general['npc'] >= 2 || $general['killturn'] > $killturn) {
             $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         } elseif($command[0] == 0) {
             $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         } else {
-            $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn='{$admin['killturn']}' where no='{$general['no']}'";
+            $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn='{$killturn}' where no='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         }
         //FIXME: 운영자 같이 사망하면 안되는 인물에 대한 처리가 필요
@@ -551,7 +550,7 @@ function processCommand($no) {
         switch($command[0]) {
             case 0: //휴식
                 $date = substr($general['turntime'],11,5);
-                $log[] = "<C>●</>{$admin['month']}월:아무것도 실행하지 않았습니다. <1>$date</>";
+                $log[] = "<C>●</>{$month}월:아무것도 실행하지 않았습니다. <1>$date</>";
                 pushGenLog($general, $log);
                 break;
             case  1: process_1($general, 1); break; //농업

hwe/func_gamerule.php

@@ -257,12 +257,15 @@ function checkSupply() {
     }
     
     $queue = new \SplQueue();
-    foreach(getAllNationStaticInfo() as $nation){
+    foreach($db->query('SELECT capital, nation FROM nation WHERE `level` > 0') as $nation){
         $capitalID = $nation['capital'];
         if(!$capitalID){
             continue;
         }
         $city = &$cities[$capitalID];
+        if($nation['nation'] != $city['nation']){
+            continue;
+        }
         $city['supply'] = true;
         $queue->enqueue($city['id']);
     }
@@ -338,6 +341,7 @@ function updateQuaterly() {
 // 벌점 감소와 건국제한-1 전턴제한-1 외교제한-1, 1달마다 실행, 병사 있는 장수의 군량 감소, 수입비율 조정
 function preUpdateMonthly() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     //연감 월결산
@@ -346,9 +350,7 @@ function preUpdateMonthly() {
 
     if($result == false) { return false; }
 
-    $query = "select startyear,year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
     //배신 횟수 최대 10회 미만
     $query = "update general set betray=9 where betray>9";
@@ -428,8 +430,10 @@ function preUpdateMonthly() {
     $ratio = 100;
     // 20 ~ 140원
     $develcost = ($admin['year'] - $admin['startyear'] + 10) * 2;
-    $query = "update game set gold_rate='$ratio',rice_rate='$ratio',city_rate='$rate',develcost='$develcost'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->gold_rate = $ratio;
+    $gameStor->rice_rate = $ratio;
+    $gameStor->city_rate = $rate;
+    $gameStor->develcost = $develcost;
 
     //매달 사망자 수입 결산
     processDeadIncome($ratio);
@@ -490,11 +494,10 @@ function preUpdateMonthly() {
 // 외교 로그처리, 외교 상태 처리
 function postUpdateMonthly() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select startyear,year,month,scenario from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'scenario']);
 
     $history = [];
 
@@ -644,11 +647,10 @@ group by A.nation
 
 function checkWander() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $needRefresh = false;
 
@@ -675,15 +677,14 @@ function checkWander() {
 
 function checkMerge() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $mylog = [];
     $youlog = [];
     $history = [];
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $query = "select * from diplomacy where state='3' and term='0'";
     $dipresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -797,11 +798,10 @@ function checkMerge() {
 
 function checkSurrender() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $query = "select * from diplomacy where state='5' and term='0'";
     $dipresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -921,12 +921,11 @@ function checkSurrender() {
 
 function updateNationState() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $history = array();
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $query = "select nation,name,level from nation";
     $nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1002,11 +1001,10 @@ function updateNationState() {
 
 function checkStatistic() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $nationHists = [];
     $specialHists = [];
@@ -1158,11 +1156,10 @@ function checkStatistic() {
 
 function checkEmperior() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select year,month,isUnited from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month', 'isUnited']);
 
     $query = "select nation,name from nation where level>0";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1182,8 +1179,8 @@ function checkEmperior() {
         if($count == $allcount) {
             pushNationHistory($nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>(이)가 전토를 통일");
 
-            $query = "update game set isUnited=2,conlimit=conlimit*100";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $gameStor->isUnited = 2;
+            $gameStor->conlimit = $gameStor->conlimit*100;
 
             $query = "select no from general where npc<2 and age>=45";
             $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

hwe/func_history.php

@@ -151,10 +151,9 @@ function pushWorldHistory(array $history, $year=null, $month=null) {
         return;
     }
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     if($year === null || $month === null){
-        $game = $db->queryFirstRow('SELECT year, month FROM game LIMIT 1');
-        $year = $game['year'];
-        $month = $game['month'];
+        list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
     }
     $request = array_map(function($text) use ($year, $month) {
         return ['year'=>$year, 'month'=>$month, 'text'=>$text];
@@ -199,10 +198,9 @@ function pushGeneralPublicRecord(array $history, $year=null, $month=null) {
         return;
     }
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     if($year === null || $month === null){
-        $game = $db->queryFirstRow('SELECT year, month FROM game LIMIT 1');
-        $year = $game['year'];
-        $month = $game['month'];
+        list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
     }
     $request = array_map(function($text) use ($year, $month) {
         return ['year'=>$year, 'month'=>$month, 'text'=>$text];
@@ -249,7 +247,8 @@ function LogHistory($isFirst=0) {
     if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', LogHistory Start');
 
     $db = DB::db();
-    $obj = $db->queryFirstRow('SELECT year, month, startyear FROM game limit 1');
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $obj = $gameStor->getValues(['startyear', 'year', 'month']);
 
     //TODO: 새롭게 추가할 지도 값 받아오는 함수를 이용하여 재구성
     $map = getWorldMap([

hwe/func_legacy.php

@@ -9,8 +9,8 @@ function printLimitMsg($turntime) {
 <head>
 <title>접속제한</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
 </head>
 <body>
 <font size=4><b>
@@ -28,15 +28,11 @@ function bar($per, $h=7) {
     else        { $bd = 1; $h = 12; $h2 =  8; }
 
     $per = round($per, 1);
-    if($per < 1 || $per > 99) { $per = Util::round($per); }
-    $str1 = "<td width='{$per}%' background=".ServConfig::$gameImagePath."/pb{$h2}.gif></td>";
-    $str2 = "<td width='*%' background=".ServConfig::$gameImagePath."/pr{$h2}.gif></td>";
-    if($per <= 0) { $str1 = ""; }
-    elseif($per >= 100) { $str2 = ""; }
-    $str = "
-    <table width=100% height={$h} border={$bd} cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black>
-        <tr>{$str1}{$str2}</tr>
-    </table>";
+    
+    $str = "<div class='bar_out' style='height:{$h2}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>";
     return $str;
 }
 
@@ -110,11 +106,10 @@ function printCitiesBasedOnDistance(int $cityNo, int $maxDistance=1) {
 
 function info($type=0) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select year,month,turnterm,maxgeneral from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month', 'turnterm', 'maxgeneral']);
 
     $termtype = "{$admin['turnterm']}분 턴";
 

hwe/func_map.php

@@ -54,11 +54,12 @@ function getWorldMap($req){
     $userID = $session->userID;
 
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
 
-    $game = $db->queryFirstRow('select `startyear`, `year`, `month` from `game` where `no` = 1');
-    $startYear = Util::toInt($game['startyear']);
-    $year = Util::toInt($game['year']);
-    $month = Util::toInt($game['month']);
+    list($startYear, $year, $month) = $gameStor->getValuesAsArray(['startyear', 'year', 'month']);
+    $startYear = Util::toInt($startYear);
+    $year = Util::toInt($year);
+    $month = Util::toInt($month);
 
     $general = $db->queryFirstRow(
         'select `no`, `city`, `nation` from `general` where `owner`=%i',

hwe/func_npc.php

@@ -165,11 +165,10 @@ function SetCrew($no, $personal, $gold, $leader, $genType, $tech, $region, $city
 
 function processAI($no) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select startyear,year,month,turnterm,scenario,gold_rate,rice_rate from game limit 1";
-    $result = MYDB_query($query, $connect) or Error("processAI00 ".MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear','year','month','turnterm','scenario','gold_rate','rice_rate']);
     // 초반 여부
     if($admin['startyear']+2 > $admin['year'] || ($admin['startyear']+2 == $admin['year'] && $admin['month'] < 5)) {
         $isStart = 1;
@@ -479,7 +478,7 @@ function processAI($no) {
                         for($i=0; $i < $nationCount; $i++) {
                             $youNation = MYDB_fetch_array($result);
 
-                            if(isClose($general['nation'], $youNation['nation'])) {
+                            if(isNeighbor($general['nation'], $youNation['nation'])) {
                                 $command = EncodeCommand(0, 0, $youNation['nation'], 62);
                                 $query = "update nation set l12turn0='$command' where nation='{$general['nation']}'";
                                 MYDB_query($query, $connect) or Error("processAI09 ".MYDB_error($connect),"");
@@ -1045,13 +1044,12 @@ function processAI($no) {
 
 function Promotion($nation, $level) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $lv = getNationChiefLevel($level);
 
-    $query = "select scenario,killturn from game limit 1";
-    $result = MYDB_query($query, $connect) or Error("processAI00 ".MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['scenario', 'killturn']);
 
     //우선 수뇌 해제 (승상 뺴고)
     $query = "update general set level=1 where level<11 and level>4 and nation='$nation'";

hwe/func_process.php

@@ -187,6 +187,7 @@ function CriticalScore($score, $type) {
 
 function process_1(&$general, $type) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -194,9 +195,7 @@ function process_1(&$general, $type) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'develcost']);
 
     if($type == 1)     { $dtype = "농지 개간"; $atype = "을"; $btype = "은"; $stype = "agri"; }
     elseif($type == 2) { $dtype = "상업 투자"; $atype = "를"; $btype = "는"; $stype = "comm"; }
@@ -288,6 +287,7 @@ function process_1(&$general, $type) {
 
 function process_3(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -295,9 +295,7 @@ function process_3(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'develcost']);
 
     $dtype = "기술 연구";
 
@@ -388,6 +386,7 @@ function process_3(&$general) {
 
 function process_4(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -395,9 +394,7 @@ function process_4(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'develcost']);
 
     $query = "select * from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -479,6 +476,7 @@ function process_4(&$general) {
 
 function process_5(&$general, $type) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -486,9 +484,7 @@ function process_5(&$general, $type) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'develcost']);
 
     if($type == 1) { $dtype = "수비 강화"; $stype = "def"; }
     elseif($type == 2) { $dtype = "성벽 보수"; $stype = "wall"; }
@@ -580,6 +576,7 @@ function process_5(&$general, $type) {
 
 function process_7(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -587,9 +584,7 @@ function process_7(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'develcost']);
 
     $query = "select * from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -671,6 +666,7 @@ function process_7(&$general) {
 
 function process_8(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -678,9 +674,7 @@ function process_8(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'develcost']);
 
     $dtype = "치안"; $stype = "secu";
 
@@ -770,6 +764,7 @@ function process_8(&$general) {
 
 function process_9(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -777,9 +772,7 @@ function process_9(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month', 'develcost']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -860,6 +853,7 @@ function process_9(&$general) {
 
 function process_11(&$general, $type) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -870,9 +864,7 @@ function process_11(&$general, $type) {
     if($type == 1) { $defaultatmos = GameConst::$defaultAtmosLow; $defaulttrain = GameConst::$defaultTrainLow; }
     else { $defaultatmos = GameConst::$defaultAtmosHigh; $defaulttrain = GameConst::$defaultTrainHigh; }
 
-    $query = "select year,month,startyear from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
     $query = "select level,tech from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1046,6 +1038,7 @@ function process_11(&$general, $type) {
 
 function process_13(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1053,9 +1046,7 @@ function process_13(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $nation = getNationStaticInfo($general['nation']);
 
@@ -1115,6 +1106,7 @@ function process_13(&$general) {
 
 function process_14(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1122,9 +1114,7 @@ function process_14(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $nation = getNationStaticInfo($general['nation']);
 
@@ -1177,6 +1167,7 @@ function process_14(&$general) {
 
 function process_15(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1184,9 +1175,7 @@ function process_15(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $query = "select nation,tech from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1250,6 +1239,7 @@ function process_15(&$general) {
 
 function process_16(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1257,9 +1247,7 @@ function process_16(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
     $query = "select nation,war,sabotagelimit,tech from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1343,6 +1331,7 @@ function process_16(&$general) {
 
 function process_17(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1350,9 +1339,7 @@ function process_17(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     if($general['crew'] == 0) {
         $log[] = "<C>●</>{$admin['month']}월:병사가 없습니다. 소집해제 실패. <1>$date</>";
@@ -1384,6 +1371,7 @@ function process_17(&$general) {
 
 function process_21(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1393,7 +1381,7 @@ function process_21(&$general) {
 
 
     $db = DB::db();
-    $admin = $db->queryFirstRow('SELECT year, month, develcost FROM game limit 1');
+    $admin = $gameStor->getValues(['year', 'month', 'develcost']);
     $city = CityConst::byID($general['city']);
     $command = DecodeCommand($general['turn0']);
     $destination = $command[1];
@@ -1445,6 +1433,7 @@ function process_21(&$general) {
 
 function process_26(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1454,9 +1443,7 @@ function process_26(&$general) {
 
     $troop = getTroop($general['troop']);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $query = "select nation,name,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1511,6 +1498,7 @@ function process_26(&$general) {
 
 function process_28(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1520,9 +1508,7 @@ function process_28(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $nation = getNationStaticInfo($general['nation']);
 
@@ -1577,6 +1563,7 @@ function process_28(&$general) {
 
 function process_30(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1584,9 +1571,7 @@ function process_30(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month', 'develcost']);
 
     $query = "select path from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1645,6 +1630,7 @@ function process_30(&$general) {
 
 function process_31(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1653,9 +1639,7 @@ function process_31(&$general) {
     $date = substr($general['turntime'],11,5);
     $msg = [];
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month', 'develcost']);
 
     $dist = searchDistance($general['city'], 2, false);
     $command = DecodeCommand($general['turn0']);
@@ -1786,6 +1770,7 @@ function process_31(&$general) {
 
 function process_41(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1793,9 +1778,7 @@ function process_41(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month', 'develcost']);
 
     $ratio = rand() % 100;
     $exp = $general['crew'] / 400;
@@ -1855,6 +1838,7 @@ function process_41(&$general) {
 
 function process_42(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1862,9 +1846,7 @@ function process_42(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $type = rand() % 27 + 1;
     $exp = 30;
@@ -2076,6 +2058,7 @@ function process_42(&$general) {
 
 function process_43(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $genlog = [];
@@ -2084,9 +2067,7 @@ function process_43(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $command = DecodeCommand($general['turn0']);
     $what = $command[3];
@@ -2167,6 +2148,7 @@ function process_43(&$general) {
 
 function process_44(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2174,9 +2156,7 @@ function process_44(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $query = "select name,gold,rice from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -2258,6 +2238,7 @@ function process_44(&$general) {
 
 function process_48(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2265,9 +2246,7 @@ function process_48(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $city = getCity($general['city']);
 
@@ -2366,6 +2345,7 @@ function process_48(&$general) {
 
 function process_49(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2374,9 +2354,7 @@ function process_49(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $nation = getNationStaticInfo($general['nation']);
 
@@ -2503,6 +2481,7 @@ function process_49(&$general) {
 
 function process_50(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2510,11 +2489,9 @@ function process_50(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $month = $gameStor->month;
 
-    $log[] = "<C>●</>{$admin['month']}월:건강 회복을 위해 요양합니다. <1>$date</>";
+    $log[] = "<C>●</>{$month}월:건강 회복을 위해 요양합니다. <1>$date</>";
     // 경험치 상승        // 공헌도, 명성 상승
     $exp = 10;
     $ded = 7;
@@ -2530,6 +2507,7 @@ function process_50(&$general) {
 
 function process_99(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2537,9 +2515,7 @@ function process_99(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     $log[] = "<C>●</>{$admin['month']}월:아직 구현되지 않았습니다. <1>$date</>";
 

hwe/func_process_chief.php

@@ -3,6 +3,7 @@ namespace sammo;
 
 function process_23(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $genlog = [];
@@ -12,9 +13,7 @@ function process_23(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -105,6 +104,7 @@ function process_23(&$general) {
 
 function process_24(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $genlog = [];
@@ -113,9 +113,7 @@ function process_24(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,scenario,startyear from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','scenario','startyear']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -233,6 +231,7 @@ function process_24(&$general) {
 
 function process_27(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -249,9 +248,7 @@ function process_27(&$general) {
     $who = $command[2];
     $where = $command[1];
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -310,8 +307,9 @@ function process_27(&$general) {
 function process_51(&$general) {
 
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $date = substr($general['turntime'],11,5);
-    list($year, $month, $turnterm) = $db->queryFirstList('SELECT year,month,turnterm FROM game LIMIT 1');
+    list($year, $month, $turnterm) = $gameStor->getValuesAsArray(['year','month','turnterm']);
 
     if($general['level'] < 5 || $general['nation']==0) {
         pushGenLog($general, ["<C>●</>{$month}월:수뇌부가 아닙니다. 권고 실패. <1>$date</>"]);
@@ -393,6 +391,7 @@ function process_51(&$general) {
 
 function process_52(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -401,9 +400,7 @@ function process_52(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -505,8 +502,9 @@ function process_52(&$general) {
 
 function process_53(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $date = substr($general['turntime'],11,5);
-    list($year, $month, $turnterm) = $db->queryFirstList('SELECT year,month,turnterm FROM game LIMIT 1');
+    list($year, $month, $turnterm) = $gameStor->getValuesAsArray(['year','month','turnterm']);
 
     if($general['level'] < 5 || $general['nation']==0) {
         pushGenLog($general, ["<C>●</>{$month}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>"]);
@@ -589,8 +587,9 @@ function process_53(&$general) {
 
 function process_61(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $date = substr($general['turntime'],11,5);
-    list($year, $month, $turnterm) = $db->queryFirstList('SELECT year,month,turnterm FROM game LIMIT 1');
+    list($year, $month, $turnterm) = $gameStor->getValuesAsArray(['year','month','turnterm']);
 
     if($general['level'] < 5 || $general['nation']==0) {
         pushGenLog($general, ["<C>●</>{$month}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>"]);
@@ -689,6 +688,7 @@ function process_61(&$general) {
 
 function process_62(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -696,9 +696,7 @@ function process_62(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','startyear']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -744,7 +742,7 @@ function process_62(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:아국과 불가침중입니다. 선포 실패. <1>$date</>";
     } elseif($dipcount != 0) {
         $log[] = "<C>●</>{$admin['month']}월:상대국이 외교 진행중입니다. 선포 실패. <1>$date</>";
-    } elseif(!isClose($nation['nation'], $younation['nation'])) {
+    } elseif(!isNeighbor($nation['nation'], $younation['nation'])) {
         $log[] = "<C>●</>{$admin['month']}월:인접하지 않았습니다. 선포 실패. <1>$date</>";
     } elseif($admin['year'] <= $admin['startyear']) {
         $log[] = "<C>●</>{$admin['month']}월:초반제한 해제 2년전부터 가능합니다. 선포 실패. <1>$date</>";
@@ -809,8 +807,9 @@ function process_62(&$general) {
 
 function process_63(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $date = substr($general['turntime'],11,5);
-    list($year, $month, $turnterm) = $db->queryFirstList('SELECT year,month,turnterm FROM game LIMIT 1');
+    list($year, $month, $turnterm) = $gameStor->getValuesAsArray(['year','month','turnterm']);
 
     if($general['level'] < 5 || $general['nation']==0) {
         pushGenLog($general, ["<C>●</>{$month}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>"]);
@@ -892,8 +891,9 @@ function process_63(&$general) {
 
 function process_64(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $date = substr($general['turntime'],11,5);
-    list($year, $month, $turnterm) = $db->queryFirstList('SELECT year,month,turnterm FROM game LIMIT 1');
+    list($year, $month, $turnterm) = $gameStor->getValuesAsArray(['year','month','turnterm']);
 
     if($general['level'] < 5 || $general['nation']==0) {
         pushGenLog($general, ["<C>●</>{$month}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>"]);
@@ -975,6 +975,7 @@ function process_64(&$general) {
 
 function process_65(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -982,9 +983,7 @@ function process_65(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1069,6 +1068,7 @@ function process_65(&$general) {
 
 function process_66(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1077,9 +1077,7 @@ function process_66(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1159,6 +1157,7 @@ function process_66(&$general) {
 
 function process_67(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1167,9 +1166,7 @@ function process_67(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1250,6 +1247,7 @@ function process_67(&$general) {
 
 function process_68(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1258,9 +1256,7 @@ function process_68(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1353,6 +1349,7 @@ function process_68(&$general) {
 
 function process_71(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1362,9 +1359,7 @@ function process_71(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1459,6 +1454,7 @@ function process_71(&$general) {
 
 function process_72(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1468,9 +1464,7 @@ function process_72(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1574,6 +1568,7 @@ function process_72(&$general) {
 
 function process_73(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1583,9 +1578,7 @@ function process_73(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1705,6 +1698,7 @@ function process_73(&$general) {
 
 function process_74(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1714,9 +1708,7 @@ function process_74(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1849,6 +1841,7 @@ function process_74(&$general) {
 
 function process_75(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1858,9 +1851,7 @@ function process_75(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1975,6 +1966,7 @@ function process_75(&$general) {
 
 function process_76(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1984,9 +1976,7 @@ function process_76(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month,develcost,npccount,turnterm from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear','year','month','develcost','npccount','turnterm']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -2163,8 +2153,7 @@ function process_76(&$general) {
             $npcid++;
         }
         //npccount
-        $query = "update game set npccount={$npcid}";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gameStor->npccount=$npcid;
 
         //국가 기술력 그대로
         $query = "select no from general where nation='{$general['nation']}'";
@@ -2194,6 +2183,7 @@ function process_76(&$general) {
 
 function process_77(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2203,9 +2193,7 @@ function process_77(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -2322,6 +2310,7 @@ function process_77(&$general) {
 
 function process_78(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2331,9 +2320,7 @@ function process_78(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -2447,6 +2434,7 @@ function process_78(&$general) {
 
 function process_81(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2455,9 +2443,7 @@ function process_81(&$general) {
     
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month']);
 
     $query = "select nation from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

hwe/func_process_personnel.php

@@ -3,6 +3,7 @@ namespace sammo;
 
 function process_22(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -10,9 +11,7 @@ function process_22(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear','year','month','develcost']);
 
     $query = "select nation,supply from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -60,6 +59,7 @@ function process_22(&$general) {
 
 function process_25(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -67,9 +67,7 @@ function process_25(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
     $query = "select nation from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -183,6 +181,7 @@ function process_25(&$general) {
 
 function process_29(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -190,9 +189,7 @@ function process_29(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month,develcost,npccount,turnterm,scenario from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear','year','month','develcost','npccount','turnterm','scenario']);
 
     $query = "select nation,name,level,gennum,scout from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -400,8 +397,7 @@ function process_29(&$general) {
             $npcid++;
 
             //npccount
-            $query = "update game set npccount={$npcid}";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $gameStor->npccount=$npcid;
 
             //국가 기술력 그대로
             $query = "select no from general where nation='{$general['nation']}'";
@@ -437,6 +433,7 @@ function process_29(&$general) {
 
 function process_45(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -444,9 +441,7 @@ function process_45(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
     $query = "select name,chemi from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -549,6 +544,7 @@ function process_45(&$general) {
 
 function process_46(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -556,9 +552,7 @@ function process_46(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
     $query = "select * from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -637,6 +631,7 @@ function process_46(&$general) {
 
 function process_47(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -644,9 +639,7 @@ function process_47(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
     $nation = getNationStaticInfo($general['nation']);
 
@@ -702,6 +695,7 @@ function process_47(&$general) {
 
 function process_54(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -710,9 +704,7 @@ function process_54(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month']);
 
     $command = DecodeCommand($general['turn0']);
     $who = $command[1];
@@ -768,6 +760,7 @@ function process_54(&$general) {
 
 function process_55(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -776,9 +769,7 @@ function process_55(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select startyear,year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
     $query = "select name from city where city='{$general['city']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -857,6 +848,7 @@ function process_55(&$general) {
 
 function process_56(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -864,9 +856,7 @@ function process_56(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month']);
 
     $nation = getNationStaticInfo($general['nation']);
 
@@ -910,6 +900,7 @@ function process_56(&$general) {
 
 function process_57(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -918,9 +909,7 @@ function process_57(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,killturn from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month', 'killturn']);
 
     $query = "select nation,name from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

hwe/func_process_sabotage.php

@@ -4,6 +4,7 @@ namespace sammo;
 
 function process_32(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -12,9 +13,7 @@ function process_32(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $dist = searchDistance($general['city'], 5, false);
     $command = DecodeCommand($general['turn0']);
@@ -129,6 +128,7 @@ function process_32(&$general) {
 
 function process_33(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -138,9 +138,7 @@ function process_33(&$general) {
     //탈취는 0까지 무제한
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $dist = searchDistance($general['city'], 5, false);
     $command = DecodeCommand($general['turn0']);
@@ -281,6 +279,7 @@ function process_33(&$general) {
 
 function process_34(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -289,9 +288,7 @@ function process_34(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $dist = searchDistance($general['city'], 5, false);
     $command = DecodeCommand($general['turn0']);
@@ -407,6 +404,7 @@ function process_34(&$general) {
 
 function process_35(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -415,9 +413,7 @@ function process_35(&$general) {
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','develcost']);
 
     $dist = searchDistance($general['city'], 5, false);
     $command = DecodeCommand($general['turn0']);

hwe/func_template.php

@@ -66,7 +66,9 @@ function CoreTurnTable() {
 
 
 function allButton() {
-    $npcmode = DB::db()->queryFirstField("select npcmode from game limit 1");
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $npcmode = $gameStor->npcmode;
     if($npcmode == 1) {
         $site = "a_npcList.php";
         $call = "빙의일람";

hwe/func_time_event.php

@@ -8,6 +8,7 @@ namespace sammo;
 //1월마다 실행
 function processSpring() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     //인구 증가
@@ -37,9 +38,7 @@ function processSpring() {
     $query = "update nation set gold=gold*0.95 where gold>100000";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
 
     pushWorldHistory(["<R>★</>{$admin['year']}년 {$admin['month']}월: <S>모두들 즐거운 게임 하고 계신가요? ^^ <Y>삼국일보</> 애독해 주시고, <M>훼접</>은 삼가주세요~</>"], $admin['year'], $admin['month']);
 }
@@ -47,10 +46,9 @@ function processSpring() {
 function processGoldIncome() {
     $db = DB::db();
     $connect=$db->get();
+    $gameStor = new KVStorage($db, 'game_env');
 
-    $query = "select year,month,gold_rate from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','gold_rate']);
     $adminLog = [];
 
     $query = "select name,nation,gold,rate_tmp,bill,type from nation";
@@ -369,11 +367,10 @@ function processFall() {
 
 function processRiceIncome() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select year,month,rice_rate from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year','month','rice_rate']);
     $adminLog = [];
 
     $query = "select name,nation,rice,rate_tmp,bill,type from nation";
@@ -570,11 +567,10 @@ function tradeRate() {
 
 function disaster() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select startyear,year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
 
     //재난표시 초기화
     $query = "update city set state=0 where state<=10";

hwe/func_tournament.php

@@ -4,11 +4,13 @@ namespace sammo;
 
 function processTournament() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select tournament,phase,tnmt_type,tnmt_auto,tnmt_time,now() as now,TIMESTAMPDIFF(SECOND,tnmt_time,now()) as offset from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_type', 'tnmt_auto', 'tnmt_time']);
+    $now = new \DateTime();
+    $admin['now'] = $now->format('Y-m-d H:i:s');
+    $admin['offset'] = $now->getTimestamp() - (new \DateTime($admin['tnmt_time']))->getTimestamp();
 
     //수동일땐 무시
     if($admin['tnmt_auto'] == 0) { return; }
@@ -83,8 +85,9 @@ function processTournament() {
                 if($betTerm > 3600) { $betTerm = 3600; }
                 //처리 초 더한 날짜
                 $dt = date("Y-m-d H:i:s", strtotime($admin['tnmt_time']) + $unit * $i + $betTerm);
-                $query = "update game set tournament='$tnmt',phase='$phase',tnmt_time='$dt'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+                $gameStor->tournament = $tnmt;
+                $gameStor->phase = $phase;
+                $gameStor->tnmt_time = $dt;
                 return;
             }
 
@@ -95,28 +98,29 @@ function processTournament() {
                 //지정시간대 넘어가면 중단 20~24시
                 if($hr < 20) {
                     $dt = substr($dt, 0, 11)."20:00:00";
-                    $query = "update game set tournament='$tnmt',phase='$phase',tnmt_time='$dt'";
-                    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+                    $gameStor->tournament = $tnmt;
+                    $gameStor->phase = $phase;
+                    $gameStor->tnmt_time = $dt;
                     return;
                 }
             }
         }
 
         $second = $unit * $iter;
-        $query = "update game set tournament='$tnmt',phase='$phase',tnmt_time=DATE_ADD(tnmt_time, INTERVAL {$second} SECOND)";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gameStor->tournament = $tnmt;
+        $gameStor->phase = $phase;
+        $gameStor->tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->add(new \DateInterval("PT{$second}S"))->format('Y-m-d H:i:s');
     }
 }
 
 function getTournamentTerm() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select tnmt_auto from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $tnmt_auto = $gameStor->tnmt_auto;
 
-    switch($admin['tnmt_auto']) {
+    switch($tnmt_auto) {
     case 0: $str = ''; break;
     case 1: $str = "경기당 12분"; break;
     case 2: $str = "경기당 7분"; break;
@@ -131,14 +135,11 @@ function getTournamentTerm() {
 
 function getTournamentTime() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select tournament,tnmt_time from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
-
-    $tnmt = $admin['tournament'];
-    $dt = substr($admin['tnmt_time'], 11, 5);
+    list($tnmt, $tnmt_time) = $gameStor->getValuesAsArray(['tournament', 'tnmt_time']);
+    $dt = substr($tnmt_time, 11, 5);
     switch($tnmt) {
     case 1: $tnmt = "개막시간 {$dt}"; break;
     case 2: $tnmt = "다음경기 {$dt}"; break;
@@ -170,11 +171,11 @@ function getTournament($tnmt) {
     return $tnmt;
 }
 
-function printRow($k, $npc, $name, $abil, $game, $win, $draw, $lose, $gd, $gl, $prmt) {
+function printRow($k, $npc, $name, $abil, $tgame, $win, $draw, $lose, $gd, $gl, $prmt) {
     if($prmt > 0) { $name = "<font color=orange>".$name."</font>"; }
     elseif($npc >= 2) { $name = "<font color=cyan>".$name."</font>"; }
     elseif($npc == 1) { $name = "<font color=skyblue>".$name."</font>"; }
-    echo "<tr align=center><td id=bg2>$k</td><td>$name</td><td>$abil</td><td>$game</td><td>$win</td><td>$draw</td><td>$lose</td><td>$gd</td><td>$gl</td></tr>";
+    echo "<tr align=center><td id=bg2>$k</td><td>$name</td><td>$abil</td><td>$tgame</td><td>$win</td><td>$draw</td><td>$lose</td><td>$gd</td><td>$gl</td></tr>";
 }
 
 function printFighting($tournament, $phase) {
@@ -231,6 +232,7 @@ function printFighting($tournament, $phase) {
 
 function startTournament($auto, $type) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     eraseTnmtFightLogAll();
@@ -246,12 +248,17 @@ function startTournament($auto, $type) {
     default:$unit = 60; break;
     }
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month']);
     
-    $query = "update game set tnmt_auto='$auto',tnmt_time=DATE_ADD(now(), INTERVAL {$unit} MINUTE),tournament=1,tnmt_type='$type',phase=0,bet0=0,bet1=0,bet2=0,bet3=0,bet4=0,bet5=0,bet6=0,bet7=0,bet8=0,bet9=0,bet10=0,bet11=0,bet12=0,bet13=0,bet14=0,bet15=0";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->tnmt_auto = $auto;
+    $gameStor->tnmt_time = (new \DateTimeImmutable())->add(new \DateInterval("PT{$unit}M"))->format('Y-m-d H:i:s');
+    $gameStor->tournament = 1;
+    $gameStor->tnmt_type = $type;
+    $gameStor->phase = 0;
+    $gameStor->bet = 0;
+    for($i=0;$i<16;$i+=1){
+        $gameStor->setValue("bet{$i}", 0);
+    }
     $query = "update general set tournament=0,bet0=0,bet1=0,bet2=0,bet3=0,bet4=0,bet5=0,bet6=0,bet7=0,bet8=0,bet9=0,bet10=0,bet11=0,bet12=0,bet13=0,bet14=0,bet15=0";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $query = "truncate tournament";
@@ -269,14 +276,13 @@ function startTournament($auto, $type) {
 
 function fillLowGenAll() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $general = [];
     $grpCount = [];
 
-    $query = "select develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $develcost = $gameStor->develcost;
 
     $general['no'] = 0;
     $general['name'] = "무명장수";
@@ -293,7 +299,7 @@ function fillLowGenAll() {
     }
 
     //자동신청하고, 돈 있고, 아직 참가 안한 장수
-    $query = "select no,npc,name,leader,power,intel,explevel from general where tnmt='1' and tournament='0' and gold>='{$admin['develcost']}' order by rand() limit 0,64";
+    $query = "select no,npc,name,leader,power,intel,explevel from general where tnmt='1' and tournament='0' and gold>='{$develcost}' order by rand() limit 0,64";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $genCount = MYDB_num_rows($result);
 
@@ -308,7 +314,7 @@ function fillLowGenAll() {
                 if($genCount > 0) {
                     $genCount--;
                     $gen = MYDB_fetch_array($result);
-                    $query = "update general set gold=gold-'{$admin['develcost']}',tournament='1' where no='{$gen['no']}'";
+                    $query = "update general set gold=gold-'{$develcost}',tournament='1' where no='{$gen['no']}'";
                     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
                     $query = "insert into tournament (no, npc, name, ldr, pwr, itl, lvl, grp, grp_no) values ('{$gen['no']}', '{$gen['npc']}', '{$gen['name']}', '{$gen['leader']}', '{$gen['power']}', '{$gen['intel']}', '{$gen['explevel']}', '$i', '$grpCount[$i]')";
@@ -327,8 +333,8 @@ function fillLowGenAll() {
         }
     }
 
-    $query = "update game set tournament=2, phase=0";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->tournament = 2;
+    $gameStor->phase = 0;
 }
 
 //0 경기없음
@@ -376,6 +382,7 @@ function getTwo($tournament, $phase) {
 
 function qualify($tnmt_type, $tnmt, $phase) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $cand = getTwo($tnmt, $phase);
@@ -385,11 +392,10 @@ function qualify($tnmt_type, $tnmt, $phase) {
         fight($tnmt_type, $tnmt, $phase, $i, $cand[0], $cand[1], 0);
     }
     if($phase < 55) {
-        $query = "update game set phase=phase+1";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gameStor->phase+=1;
     } else {
-        $query = "update game set tournament=3, phase=0";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gameStor->phase=0;
+        $gameStor->tournament=3;
 
         for($i=0; $i < 8; $i++) {
             $query = "select grp,grp_no,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp='$i' order by gd desc, gl desc, seq limit 0,4";
@@ -416,6 +422,7 @@ function qualifyAll($tnmt_type, $tnmt, $phase) {
 
 function selection($tnmt_type, $tnmt, $phase) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     //시드1 배정
@@ -444,18 +451,14 @@ function selection($tnmt_type, $tnmt, $phase) {
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
     if($phase < 31) {
-        $query = "update game set phase=phase+1";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gameStor->phase+=1;
     } else {
-        $query = "update game set tournament=4, phase=0";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gameStor->tournamemt = 4;
+        $gameStor->phase=0;
     }
 }
 
 function selectionAll($tnmt_type, $tnmt, $phase) {
-    $db = DB::db();
-    $connect=$db->get();
-
     $start = $phase;
     $end = $phase - ($phase % 8) + 8;
     for($i=$start; $i < $end; $i++) {
@@ -465,6 +468,7 @@ function selectionAll($tnmt_type, $tnmt, $phase) {
 
 function finallySingle($tnmt_type, $tnmt, $phase) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $cand = getTwo($tnmt, $phase);
@@ -474,11 +478,10 @@ function finallySingle($tnmt_type, $tnmt, $phase) {
         fight($tnmt_type, $tnmt, $phase, $i, $cand[0], $cand[1], 0);
     }
     if($phase < 5) {
-        $query = "update game set phase=phase+1";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gameStor->phase+=1;
     } else {
-        $query = "update game set tournament=5, phase=0";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gameStor->tournament=5;
+        $gameStor->phase=0;
 
         for($i=10; $i < 18; $i++) {
             $query = "select grp,grp_no,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp='$i' order by gd desc, gl desc, seq limit 0,2";
@@ -493,9 +496,6 @@ function finallySingle($tnmt_type, $tnmt, $phase) {
 }
 
 function finallyAll($tnmt_type, $tnmt, $phase) {
-    $db = DB::db();
-    $connect=$db->get();
-
     $start = $phase;
     $end = $phase - ($phase % 2) + 2;
     for($i=$start; $i < $end; $i++) {
@@ -505,6 +505,7 @@ function finallyAll($tnmt_type, $tnmt, $phase) {
 
 function final16set() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     //1조1-5조2, 2조1-6조2, 3조1-7조2, 4조1-8조2, 5조1-1조2, 6조1-2조2, 7조1-3조2, 8조1-4조2
@@ -523,12 +524,13 @@ function final16set() {
     $query = "update tournament set prmt=0";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
-    $query = "update game set tournament=6, phase=0";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->tournament=6;
+    $gameStor->phase=0;
 }
 
 function finalFight($tnmt_type, $tnmt, $phase, $type) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     switch($type) {
@@ -541,8 +543,7 @@ function finalFight($tnmt_type, $tnmt, $phase, $type) {
     $grp = $phase + $offset;
     fight($tnmt_type, $tnmt, $phase, $grp, 0, 1, 1);
 
-    $query = "update game set phase=phase+1";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->phase+=1;
 
     $query = "select * from tournament where grp='$grp' and win>0 and (grp_no=0 or grp_no=1)";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -554,18 +555,17 @@ function finalFight($tnmt_type, $tnmt, $phase, $type) {
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
     if($phase >= $turn) {
-        $query = "update game set tournament='$next', phase=0";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gameStor->tournament = $next;
+        $gameStor->phase = 0;
     }
 }
 
 function setGift($tnmt_type, $tnmt, $phase) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select year,month,develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $admin = $gameStor->getValues(['year', 'month', 'develcost']);
 
     $genNo = [];
     $genName = [];
@@ -656,8 +656,7 @@ function setGift($tnmt_type, $tnmt, $phase) {
     $general2 = MYDB_fetch_array($result);
 
     //자동진행 끝
-    $query = "update game set tnmt_auto=0";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->tnmt_auto = 0;
 
     //장수열전 기록
     $query = "select no from general where no={$general['no']}";
@@ -693,9 +692,9 @@ function setGift($tnmt_type, $tnmt, $phase) {
     $general = MYDB_fetch_array($result);
     $no = ($general['grp'] - 20) * 2 + $general['grp_no'];
 
-    $query = "select bet{$no},bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+
+    $admin = $gameStor->getDBValues(['bet0','bet1','bet2','bet3','bet4','bet5','bet6','bet7','bet8','bet9','bet10','bet11','bet12','bet13','bet14','bet15']);
+    $admin['bet'] = array_sum($admin);
     $bet = @round($admin['bet'] /  $admin["bet{$no}"], 2);
 
     //당첨칸에 베팅한 사람들만
@@ -715,14 +714,11 @@ function setGift($tnmt_type, $tnmt, $phase) {
 
 function setRefund() {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select develcost from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
-
     //16강자 명성 돈
-    $cost = $admin['develcost'];
+    $cost = $gameStor->develcost;
     $query = "select no from tournament where grp<10";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $count = MYDB_num_rows($result);
@@ -733,8 +729,7 @@ function setRefund() {
     }
 
     //자동진행 끝
-    $query = "update game set tnmt_auto=0";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $gameStor->tnmt_auto = 0;
     //베팅금 환수
     $query = "update general set gold=gold+bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

hwe/index.php

@@ -10,6 +10,7 @@ $userID = Session::getUserID();
 increaseRefresh("메인", 1);
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 if (!$userID) {
@@ -39,65 +40,20 @@ if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
     ], 'owner=%i', $userID);
 }
 
-$query = "select develcost,online,conlimit,tournament,tnmt_type,turnterm,scenario,scenario_text,extended_general,fiction,npcmode,vote from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['develcost','online','conlimit','tournament','tnmt_type','turnterm','scenario','scenario_text','extended_general','fiction','npcmode','vote']);
 
 $query = "select plock from plock limit 1";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $plock = MYDB_fetch_array($result);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
 }
 
 $scenario = $admin['scenario_text'];
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title><?=UniqueConst::$serverName?>: 메인</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<script src="../e_lib/jquery-3.2.1.min.js"></script>
-<script src="../e_lib/jquery.redirect.js"></script>
-<script src="../d_shared/common_path.js"></script>
-<script src="js/common.js"></script>
-<script src="js/main.js"></script>
-<script src="js/base_map.js"></script>
-<script src="js/map.js"></script>
-<script src="js/msg.js"></script>
-<script>
-$(function(){
-    reloadWorldMap({
-        hrefTemplate:'b_currentCity.php?citylist={0}'
-    });
 
-    setInterval(function(){
-        refreshMsg();
-    }, 10000);
-});
-</script>
-<link href="css/normalize.css" rel="stylesheet">
-<link href="../d_shared/common.css" rel="stylesheet">
-<link href="css/common.css" rel="stylesheet">
-<link href="css/main.css" rel="stylesheet">
-<link href="css/map.css" rel="stylesheet">
-<link href="css/msg.css" rel="stylesheet">
-
-
-</head>
-<body class="img_back">
-
-<div id="container">
-<div><?=allButton()?></div>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 style=font-size:13px;word-break:break-all; id=bg0>
-    <tr height=50>
-        <td colspan=5 align=center><font size=4>삼국지 모의전투 HiDCHe (<font color=cyan><?=$scenario?></font>)</font></td>
-    </tr>
-<?php
 $valid = 0;
 if ($admin['extended_general'] == 0) {
     $extend = "표준";
@@ -118,25 +74,67 @@ if ($admin['npcmode'] == 0) {
     $valid = 1;
 }
 $color = "cyan";
-if ($valid == 1) {
-    echo "
-    <tr height=30>
-        <td width=398 colspan=2 align=center><font color={$color}>{$scenario}</font></td>
-        <td width=198 align=center><font color={$color}>NPC수 : {$extend}</font></td>
-        <td width=198 align=center><font color={$color}>NPC상성 : {$fiction}</font></td>
-        <td width=198 align=center><font color={$color}>NPC선택 : {$npcmode}</font></td>
-    </tr>";
-}
+
 ?>
+<!DOCTYPE html>
+<html>
+<head>
+<title><?=UniqueConst::$serverName?>: 메인</title>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/main.js')?>
+<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS('js/map.js')?>
+<?=WebUtil::printJS('js/msg.js')?>
+<script>
+$(function(){
+    reloadWorldMap({
+        hrefTemplate:'b_currentCity.php?citylist={0}'
+    });
+
+    setInterval(function(){
+        refreshMsg();
+    }, 10000);
+});
+</script>
+<?=WebUtil::printCSS('css/normalize.css')?>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printCSS('css/main.css')?>
+<?=WebUtil::printCSS('css/map.css')?>
+<?=WebUtil::printCSS('css/msg.css')?>
+
+
+</head>
+<body class="img_back">
+
+<div id="container">
+<div><?=allButton()?></div>
+<table class="tb_layout bg0" style="width:1000px;">
+    <tr height=50>
+        <td colspan=5 align=center><font size=4>삼국지 모의전투 HiDCHe (<font color=cyan><?=$scenario?></font>)</font></td>
+    </tr>
+<?php if ($valid == 1): ?>
+    <tr height=30>
+        <td width=398 colspan=2 align=center><font color=<?=$color?>><?=$scenario?></font></td>
+        <td width=198 align=center><font color=<?=$color?>>NPC수 : <?=$extend?></font></td>
+        <td width=198 align=center><font color=<?=$color?>>NPC상성 : <?=$fiction?></font></td>
+        <td width=198 align=center><font color=<?=$color?>>NPC선택 : <?=$npcmode?></font></td>
+    </tr>
+<?php endif; ?>
 
     <tr height=30>
-        <td width=198 align=center><?=info(2)?></td>
-        <td width=198 align=center>전체 접속자 수 : <?=$admin['online']?> 명</td>
-        <td width=198 align=center>턴당 갱신횟수 : <?=$admin['conlimit']?>회</td>
-        <td width=398 colspan=2 align=center><?=info(3)?></td>
+        <td width=198><?=info(2)?></td>
+        <td width=198>전체 접속자 수 : <?=$admin['online']?> 명</td>
+        <td width=198>턴당 갱신횟수 : <?=$admin['conlimit']?>회</td>
+        <td width=398 colspan=2><?=info(3)?></td>
     </tr>
     <tr height=30>
-        <td align=center>
+        <td>
 <?php
 if ($plock['plock'] == 0) {
     echo "<marquee scrollamount=2><font color=cyan>서버 가동중</font></marquee>";
@@ -195,10 +193,10 @@ echo "
         </td>
     </tr>";
 ?>
-    <tr><td colspan=5>접속중인 국가: <?=onlinenation()?></td></tr>
-    <tr><td colspan=5><?php adminMsg(); ?></td></tr>
-    <tr><td colspan=5>【 국가방침 】<?php nationMsg(); ?></td></tr>
-    <tr><td colspan=5>【 접속자 】<?=onlinegen()?></td></tr>
+    <tr><td colspan=5 style="text-align:left;">접속중인 국가: <?=onlinenation()?></td></tr>
+    <tr><td colspan=5 style="text-align:left;"><?=adminMsg()?></td></tr>
+    <tr><td colspan=5 style="text-align:left;">【 국가방침 】<?php nationMsg(); ?></td></tr>
+    <tr><td colspan=5 style="text-align:left;">【 접속자 】<?=onlinegen()?></td></tr>
 <?php
 if ($session->userGrade >= 5) {
     echo "
@@ -227,7 +225,7 @@ else if($session->userGrade == 4){
 ?>
 
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 style=font-size:13px;word-break:break-all; id=bg0>
+<table class="tb_layout bg0" style="width:1000px;">
     <tr>
         <td width=698 height=520 colspan=2>
             <?=getMapHtml()?>
@@ -237,7 +235,7 @@ else if($session->userGrade == 4){
 <form name=form2 action=preprocessing.php method=post target=commandlist>
     <tr>
         <td rowspan=3 width=50 valign=top><?=turnTable()?></td>
-        <td width=646><?php cityInfo(); ?></td>
+        <td width=646 style="border:none;text-align:center;"><?php cityInfo(); ?></td>
     </tr>
     <tr>
         <td width=646 align=right>
@@ -259,31 +257,31 @@ else if($session->userGrade == 4){
         </td>
     </tr>
     <tr>
-        <td width=646 align=right>
+        <td width=646 align=right style="border:none;">
             <?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>
     </tr>
 </form>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 style=font-size:13px;word-break:break-all; id=bg0>
+<table class="tb_layout bg0" style="width:1000px;">
     <tr>
-        <td width=498><?php myNationInfo(); ?></td>
-        <td width=498><?php myInfo(); ?></td>
+        <td width=498 style="border:none;"><?php myNationInfo(); ?></td>
+        <td width=498 style="border:none;"><?php myInfo(); ?></td>
     </tr>
     <tr><td colspan=2><?=commandButton()?></td></tr>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 style=font-size:13px;word-break:break-all; id=bg0>
+<table class="tb_layout bg0">
     <tr>
-        <td width=498 align=center id=bg1><b>장수 동향</b></td>
-        <td width=498 align=center id=bg1><b>개인 기록</b></td>
+        <td width=498 class='bg1 center'><b>장수 동향</b></td>
+        <td width=498 class='bg1 center'><b>개인 기록</b></td>
     </tr>
     <tr>
-        <td width=498 ><?=getGeneralPublicRecordRecent(15)?></td>
-        <td width=498 ><?=getGenLogRecent($me['no'], 15)?></td>
+        <td width=498 style="text-align:left;"><?=getGeneralPublicRecordRecent(15)?></td>
+        <td width=498 style="text-align:left;"><?=getGenLogRecent($me['no'], 15)?></td>
     </tr>
-    <tr><td width=998 colspan=2 align=center id=bg1><b>중원 정세</b></td></tr>
-    <tr><td width=998 colspan=2><?=getWorldHistoryRecent(15)?></td></tr>
+    <tr><td width=998 colspan=2 class='bg1 center'><b>중원 정세</b></td></tr>
+    <tr><td width=998 colspan=2 style="text-align:left;"><?=getWorldHistoryRecent(15)?></td></tr>
 </table>
 <div class="message_input_form bg0">
     <select id="mailbox_list" size="1">

hwe/install.php

@@ -20,14 +20,14 @@ if($session->userGrade < 5){
 <title>설치</title>
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<script src="../e_lib/jquery-3.2.1.min.js"></script>
-<script src="../e_lib/bootstrap.bundle.min.js"></script>
-<script src="../e_lib/jquery.validate.min.js"></script>
-<script src="js/common.js"></script>
-<script src="js/install.js"></script>
-<link rel="stylesheet" href="css/normalize.css" >
-<link rel="stylesheet" href="../e_lib/bootstrap.min.css">
-<link rel="stylesheet" href="css/install.css" >
+<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('../e_lib/jquery.validate.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/install.js')?>
+<?=WebUtil::printCSS('css/normalize.css')?>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+<?=WebUtil::printCSS('css/install.css')?>
 </head>
 <body>
     <div class="container" style="min-width:720px;">

hwe/install_db.php

@@ -20,14 +20,14 @@ if($session->userGrade == 5){
 <title>설치</title>
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<script src="../e_lib/jquery-3.2.1.min.js"></script>
-<script src="../e_lib/bootstrap.bundle.min.js"></script>
-<script src="../e_lib/jquery.validate.min.js"></script>
-<script src="js/common.js"></script>
-<script src="js/install_db.js"></script>
-<link rel="stylesheet" href="css/normalize.css" >
-<link rel="stylesheet" href="../e_lib/bootstrap.min.css">
-<link rel="stylesheet" href="css/install.css" >
+<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('../e_lib/jquery.validate.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/install.js')?>
+<?=WebUtil::printCSS('css/normalize.css')?>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+<?=WebUtil::printCSS('css/install.css')?>
 </head>
 <body>
     <div class="container" style="min-width:720px;">

hwe/j_autoreset.php

@@ -5,7 +5,7 @@ include 'lib.php';
 include "func.php";
 
 $db = DB::db();
-
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $reserved = $db->queryFirstRow('SELECT `date`, options FROM reserved_open ORDER BY `date` ASC LIMIT 1');
 
 if(!$reserved){
@@ -22,10 +22,8 @@ $now = new \DateTime();
 
 $status = 'not_yet';
 
-if ($db->queryFirstField("SHOW TABLES LIKE 'game'")) {
-    list($isUnited, $lastTurn) = $db->queryFirstList('SELECT isUnited, turntime FROM game LIMIT 1');
-}
-else{
+list($isUnited, $lastTurn) = $gameStor->getValues(['isUnited', 'turntime']);
+if($isUnited === null || $lastTurn === null){
     $isUnited = 2;
     $lastTurn = '2000-01-01';
 }

hwe/j_get_select_npc_token.php

@@ -21,6 +21,7 @@ $oNow = new \DateTimeImmutable();
 $now = $oNow->format('Y-m-d H:i:s');
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 
 $oldGeneral = $db->queryFirstField('SELECT `no` FROM general WHERE `owner`=%i', $userID);
 if($oldGeneral !== null){
@@ -34,7 +35,7 @@ list(
     $maxgeneral,
     $turnterm,
     $npcmode
-) = $db->queryFirstList('SELECT maxgeneral,turnterm,npcmode from game limit 1');
+) = $gameStor->getValuesAsArray(['maxgeneral', 'turnterm', 'npcmode']);
 
 if(!$npcmode){
     Json::die([
@@ -119,7 +120,7 @@ while(count($pickResult) < $pickLimit){
 $newNonce = mt_rand(0, 0xfffffff);
 
 $validSecond = max(VALID_SECOND, $turnterm*40);
-$pickMoreSecond = max(PICK_MORE_SECOND, $turnterm*10);
+$pickMoreSecond = max(PICK_MORE_SECOND, Util::round(pow($turnterm, 0.672)*8));
 
 $validUntil = $oNow->add(new \DateInterval(sprintf('PT%dS', $validSecond)));
 $pickMoreFrom = $oNow->add(new \DateInterval(sprintf('PT%dS', $pickMoreSecond)));

hwe/j_install.php

@@ -51,8 +51,8 @@ $reserve_open = Util::getReq('reserve_open');
 if($reserve_open){
     $reserve_open = new \DateTime($reserve_open);
     $db = DB::db();
-
-    if (!$db->queryFirstField("SHOW TABLES LIKE 'game'")) {
+    
+    if (!$db->queryFirstField("SHOW TABLES LIKE 'storage'")) {
         $clearResult = ResetHelper::clearDB();
         if(!$clearResult['result']){
             Json::die($clearResult);

hwe/j_select_npc.php

@@ -16,6 +16,7 @@ if(!$pick){
 $session = Session::requireLogin()->setReadOnly();
 $userID = Session::getUserID();
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $rootDB = RootDB::db();
 
 $oNow = new \DateTimeImmutable();
@@ -54,7 +55,7 @@ list(
     $month,
     $maxgeneral,
     $npcmode
-) = $db->queryFirstList('SELECT year,month,maxgeneral,npcmode from game limit 1');
+) = $gameStor->getValuesAsArray(['year', 'month', 'maxgeneral', 'npcmode']);
 
 if(!$npcmode){
     Json::die([
@@ -101,8 +102,8 @@ $rootDB->insert('member_log', [
     'action'=>Json::encode([
         'server'=>DB::prefix(),
         'type'=>'npc',
-        'generalID'=>$npc['no'],
-        'generalName'=>$npc['name']
+        'generalID'=>$pickedNPC['no'],
+        'generalName'=>$pickedNPC['name']
     ])
 ]);
 

hwe/j_server_basic_info.php

@@ -17,6 +17,7 @@ if(!class_exists('\\sammo\\DB')){
 }
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 
 if(file_exists(__dir__.'/.htaccess')){
     $reserved = $db->queryFirstRow(
@@ -46,16 +47,18 @@ if(file_exists(__dir__.'/.htaccess')){
 
 //TODO: 천통시에도 예약 오픈 알림이 필요..?
 
-$game = $db->queryFirstRow('SELECT isUnited, npcMode, year, month, scenario, scenario_text, maxgeneral as maxUserCnt, turnTerm from game where `no`=1');
+$game_env = $gameStor->getValues(['isUnited', 'npcMode', 'year', 'month', 'scenario', 'scenario_text', 'maxgeneral', 'turnTerm']);
+$game_env['maxUserCnt'] = $game_env['maxgeneral'];
+unset($game_env['maxgeneral']);
 
 $nationCnt = $db->queryFirstField('SELECT count(`nation`) from nation where `level` > 0');
 $genCnt = $db->queryFirstField('SELECT count(`no`) from general where `npc` < 2');
 $npcCnt = $db->queryFirstField('SELECT count(`no`) from general where `npc` >= 2');
 
-$game['scenario'] = $game['scenario_text'];
-$game['userCnt'] = $genCnt;
-$game['npcCnt'] = $npcCnt;
-$game['nationCnt'] = $nationCnt;
+$game_env['scenario'] = $game_env['scenario_text'];
+$game_env['userCnt'] = $genCnt;
+$game_env['npcCnt'] = $npcCnt;
+$game_env['nationCnt'] = $nationCnt;
 
 $me = [];
 
@@ -72,6 +75,6 @@ if($general){
 
 //TODO: 이를 표현하는 방법은 '이전 버전'의 serverListPost.php를 참고할 것.
 Json::die([
-    'game'=>$game,
+    'game'=>$game_env,
     'me'=>$me?:null
 ]);

hwe/join.php

@@ -23,6 +23,7 @@ if (!$member) {
 }
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 ?>
@@ -31,23 +32,22 @@ $connect=$db->get();
 <head>
 <title><?=UniqueConst::$serverName?>: 장수생성</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link href="../d_shared/common.css" rel="stylesheet">
-<link rel='stylesheet' href="css/common.css">
-<script type="text/javascript" src="../e_lib/jquery-3.2.1.min.js"></script>
-<script type="text/javascript" src="js/join.js"></script>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('js/join.js')?>
 
 </head>
 <body>
-    <table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+    <table align=center width=1000 class='tb_layout bg0'>
         <tr><td>장 수 생 성<br><?=backButton()?></td></tr>
     </table>
-    <table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+    <table align=center width=1000 class='tb_layout bg0'>
         <tr><td align=center><?=info(0)?></td></tr>
     </table>
 <?php
-$query = "select show_img_level,maxgeneral from game limit 1";
-$result = MYDB_query($query, $connect) or Error("join ".MYDB_error($connect), "");
-$admin = MYDB_fetch_array($result);
+$admin = $gameStor->getValues(['show_img_level','maxgeneral']);
 
 $query = "select no from general where npc<2";
 $result = MYDB_query($query, $connect) or Error("join ".MYDB_error($connect), "");
@@ -60,7 +60,7 @@ if ($gencount >= $admin['maxgeneral']) {
 }
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
 <tr><td align=center colspan=2 id=bg1>임관 권유 메세지</td></tr>
 <?php
 $query = "select name,scoutmsg,color from nation";
@@ -81,7 +81,7 @@ for ($i=0; $i < $nationcount; $i++) {
 </table>
 
 <form name=form1 method=post action=join_post.php>
-    <table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+    <table align=center width=1000 class='tb_layout bg0'>
         <tr>
             <td colspan=3 align=center id=bg1>장수 생성</td>
         </tr>
@@ -98,7 +98,7 @@ if ($admin['show_img_level'] >= 1 && $member['grade'] >= 1 && $member['picture']
         <tr>
             <td align=right id=bg1>전콘 사용 여부</td>
             <td width=64 height=64>
-                <img width='64' height='64' src='{$imageTemp}/{$member['picture']}' border=0>
+                <img width='64' height='64' src='{$imageTemp}/{$member['picture']}' border='0'>
             </td>
             <td>
                 <input type=checkbox name=pic value=1 checked>사용
@@ -172,7 +172,7 @@ if ($admin['show_img_level'] >= 1 && $member['grade'] >= 1 && $member['picture']
         </tr>
     </table>
 </form>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>

hwe/join_post.php

@@ -66,9 +66,10 @@ if (!$member) {
 }
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+$gameStor->cacheValues(['year','month','maxgeneral','scenario','show_img_level','turnterm','genius','npcmode']);
 ########## 동일 정보 존재여부 확인. ##########
 
-$admin = $db->queryFirstRow('SELECT year,month,maxgeneral,scenario,show_img_level,turnterm,genius,npcmode from game limit 1');
 $gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
 $oldGeneral = $db->queryFirstField('SELECT `no` FROM general WHERE `owner`=%i', $userID);
 $oldName = $db->queryFirstField('SELECT `no` FROM general WHERE `name`=%s', $name);
@@ -87,7 +88,7 @@ if ($oldName) {
       </script>");
     exit;
 }
-if ($admin['maxgeneral'] <= $gencount) {
+if ($gameStor->maxgeneral <= $gencount) {
     echo("<script>
       window.alert('더이상 등록할 수 없습니다!')
       history.go(-1)
@@ -118,10 +119,8 @@ if ($leader + $power + $intel > 150) {
 
 $genius = Util::randBool(0.01);
 // 현재 1%
-if ($genius && $admin['genius'] > 0) {
-    $db->update('game', [
-        'genius'=>$db->sqleval('genius-1')
-    ], true);
+if ($genius && $gameStor->genius > 0) {
+    $gameStor->genius = $gameStor->genius-1;
 } else {
     $genius = false;
 }
@@ -239,14 +238,14 @@ $log = [];
 $mylog = [];
 
 if ($genius) {
-    $log[0] = "<C>●</>{$admin['month']}월:<G><b>{$cityname}</b></>에서 <Y>{$name}</>(이)라는 기재가 천하에 이름을 알립니다.";
-    $log[1] = "<C>●</>{$admin['month']}월:<C>".getGenSpecial($special2)."</> 특기를 가진 <C>천재</>의 등장으로 온 천하가 떠들썩합니다.";
+    $log[0] = "<C>●</>{$gameStor->month}월:<G><b>{$cityname}</b></>에서 <Y>{$name}</>(이)라는 기재가 천하에 이름을 알립니다.";
+    $log[1] = "<C>●</>{$gameStor->month}월:<C>".getGenSpecial($special2)."</> 특기를 가진 <C>천재</>의 등장으로 온 천하가 떠들썩합니다.";
 
-    pushWorldHistory(["<C>●</>{$admin['year']}년 {$admin['month']}월:<L><b>【천재】</b></><G><b>{$cityname}</b></>에 천재가 등장했습니다."], $admin['year'], $admin['month']);
+    pushWorldHistory(["<C>●</>{$gameStor->year}년 {$gameStor->month}월:<L><b>【천재】</b></><G><b>{$cityname}</b></>에 천재가 등장했습니다."], $gameStor->year, $gameStor->month);
 } else {
-    $log[0] = "<C>●</>{$admin['month']}월:<G><b>{$cityname}</b></>에서 <Y>{$name}</>(이)라는 호걸이 천하에 이름을 알립니다.";
+    $log[0] = "<C>●</>{$gameStor->month}월:<G><b>{$cityname}</b></>에서 <Y>{$name}</>(이)라는 호걸이 천하에 이름을 알립니다.";
 }
-pushGeneralHistory($me, "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y>{$name}</>, <G>{$cityname}</>에서 큰 뜻을 품다.");
+pushGeneralHistory($me, "<C>●</>{$gameStor->year}년 {$gameStor->month}월:<Y>{$name}</>, <G>{$cityname}</>에서 큰 뜻을 품다.");
 $mylog[] = "<C>●</>삼국지 모의전투 PHP의 세계에 오신 것을 환영합니다 ^o^";
 $mylog[] = "<C>●</>처음 하시는 경우에는 <D>도움말</>을 참고하시고,";
 $mylog[] = "<C>●</>문의사항이 있으시면 게시판에 글을 남겨주시면 되겠네요~";
@@ -255,10 +254,10 @@ $mylog[] = "<C>●</>통솔 <C>$pleader</> 무력 <C>$ppower</> 지력 <C>$pinte
 $mylog[] = "<C>●</>연령은 <C>$age</>세로 시작합니다.";
 if ($genius) {
     $mylog[] = "<C>●</>축하합니다! 천재로 태어나 처음부터 <C>".getGenSpecial($special2)."</> 특기를 가지게 됩니다!";
-    pushGeneralHistory($me, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".getGenSpecial($special2)."</> 특기를 가진 천재로 탄생.");
+    pushGeneralHistory($me, "<C>●</>{$gameStor->year}년 {$gameStor->month}월:<C>".getGenSpecial($special2)."</> 특기를 가진 천재로 탄생.");
 }
 pushGenLog($me, $mylog);
-pushGeneralPublicRecord($log, $admin['year'], $admin['month']);
+pushGeneralPublicRecord($log, $gameStor->year, $gameStor->month);
 
 pushAdminLog(["가입 : {$userID} // {$name} // {$generalID}".getenv("REMOTE_ADDR")]);
 

hwe/lib.php

@@ -64,9 +64,10 @@ function extractMissingPostToGlobals()
 {
     $result = [];
     if (isset($_POST) && count($_POST) > 0) {
-        
-        
         foreach($_POST as $key=>$val){
+            if(is_numeric($key)){
+                continue;
+            }
             if(isset($GLOBALS[$key])){
                 continue;
             }
@@ -77,6 +78,9 @@ function extractMissingPostToGlobals()
 
     if (isset($_GET) && count($_GET) > 0) {
         foreach($_GET as $key=>$val){
+            if(is_numeric($key)){
+                continue;
+            }
             if(isset($GLOBALS[$key])){
                 continue;
             }

hwe/process_war.php

@@ -6,18 +6,17 @@ function processWar($general, $city) {
     '@phan-var array<string,int|string|null> $general';
 
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $templates = new \League\Plates\Engine('templates');
 
     $date = substr($general['turntime'],11,5);
 
-    $query = "select * from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $game = MYDB_fetch_array($result);
+    $game_env = $gameStor->getAll();
 
-    $year = $game['year'];
-    $month = $game['month'];
+    $year = $game_env['year'];
+    $month = $game_env['month'];
 
     $log = [];
     $batlog = [];
@@ -155,7 +154,7 @@ function processWar($general, $city) {
 
             $city = addConflict($city, $general['nation'], 1);//NOTE: 이 경우 두 국가가 분쟁 중인 경우에는 병량패퇴의 이득이 없다.
 
-            ConquerCity($game, $general, $city, $nation, $destnation);
+            ConquerCity($game_env, $general, $city, $nation, $destnation);
             break;
         // 장수가 없어서 도시 공격
         } elseif($opposecount == 0) {
@@ -190,13 +189,13 @@ function processWar($general, $city) {
                 if($myCrew <= 0) { $myCrew = rand() % 90 + 10; }
 
                 //훈련 사기따라
-                $myCrew = getCrew($myCrew, $game['city_rate']+$oppAtmosBonus, CharTrain($general['train']+$genTrain+$genTrainBonus, $general['personal']));
-                $cityCrew = getCrew($cityCrew, CharAtmos($general['atmos']+$genAtmos+$genAtmosBonus, $general['personal']), $game['city_rate']+$oppTrainBonus);
+                $myCrew = getCrew($myCrew, $game_env['city_rate']+$oppAtmosBonus, CharTrain($general['train']+$genTrain+$genTrainBonus, $general['personal']));
+                $cityCrew = getCrew($cityCrew, CharAtmos($general['atmos']+$genAtmos+$genAtmosBonus, $general['personal']), $game_env['city_rate']+$oppTrainBonus);
                 //숙련도 따라
                 $genDexAtt = getGenDex($general, $general['crewtype']);
                 $genDexDef = getGenDex($general, 40);
-                $cityCrew *= getDexLog($genDexAtt, ($game['city_rate']-60)*7200);
-                $myCrew *= getDexLog(($game['city_rate']-60)*7200, $genDexDef);
+                $cityCrew *= getDexLog($genDexAtt, ($game_env['city_rate']-60)*7200);
+                $myCrew *= getDexLog(($game_env['city_rate']-60)*7200, $genDexDef);
 
                 $avoid = 1;
                 // 병종간 특성
@@ -433,7 +432,7 @@ function processWar($general, $city) {
 
             // 도시쌀 소모 계산
             $opexp = Util::round($opexp / 50 * 0.8);
-            $rice = Util::round($opexp * 5 * getCrewtypeRice(0, 0) * ($game['city_rate']/100 - 0.2));
+            $rice = Util::round($opexp * 5 * getCrewtypeRice(0, 0) * ($game_env['city_rate']/100 - 0.2));
             $destnation['rice'] -= $rice;
             if($destnation['rice'] < 0) { $destnation['rice'] = 0; }
             $query = "update nation set rice='{$destnation['rice']}' where nation='{$destnation['nation']}'";
@@ -464,7 +463,7 @@ function processWar($general, $city) {
             if($nation['type'] == 3 || $nation['type'] == 13)                                                                   { $num *= 1.1; }
             if($nation['type'] == 5 || $nation['type'] == 6 || $nation['type'] == 7 || $nation['type'] == 8 || $nation['type'] == 12) { $num *= 0.9; }
             // 부드러운 기술 제한
-            if(TechLimit($game['startyear'], $year, $nation['tech'])) { $num = intdiv($num, 4); }
+            if(TechLimit($game_env['startyear'], $year, $nation['tech'])) { $num = intdiv($num, 4); }
             $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$gencount' where nation='{$nation['nation']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
             // 죽은수 기술로 누적
@@ -477,7 +476,7 @@ function processWar($general, $city) {
                 $num *= 0.9;
             }
             // 부드러운 기술 제한
-            if(TechLimit($game['startyear'], $year, $destnation['tech'])) { $num = intdiv($num, 4); }
+            if(TechLimit($game_env['startyear'], $year, $destnation['tech'])) { $num = intdiv($num, 4); }
             $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$destgencount' where nation='{$destnation['nation']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
             //양국 평균 기술가격
@@ -517,7 +516,7 @@ function processWar($general, $city) {
                 $alllog = [];
                 $history = [];
 
-                ConquerCity($game, $general, $city, $nation, $destnation);
+                ConquerCity($game_env, $general, $city, $nation, $destnation);
                 break;
             // 공격 장수 병사 소진시 실패 처리
             } elseif($general['crew'] <= 0) {
@@ -1339,7 +1338,7 @@ function processWar($general, $city) {
             if($nation['type'] == 3 || $nation['type'] == 13)                                                                   { $num *= 1.1; }
             if($nation['type'] == 5 || $nation['type'] == 6 || $nation['type'] == 7 || $nation['type'] == 8 || $nation['type'] == 12) { $num *= 0.9; }
             // 부드러운 기술 제한
-            if(TechLimit($game['startyear'], $year, $nation['tech'])) { $num = intdiv($num, 4); }
+            if(TechLimit($game_env['startyear'], $year, $nation['tech'])) { $num = intdiv($num, 4); }
             $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$gencount' where nation='{$nation['nation']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
@@ -1362,7 +1361,7 @@ function processWar($general, $city) {
             if($destnation['type'] == 3 || $destnation['type'] == 13)                                                                               { $num *= 1.1; }
             if($destnation['type'] == 5 || $destnation['type'] == 6 || $destnation['type'] == 7 || $destnation['type'] == 8 || $destnation['type'] == 12) { $num *= 0.9; }
             // 부드러운 기술 제한
-            if(TechLimit($game['startyear'], $year, $destnation['tech'])) { $num = intdiv($num, 4); }
+            if(TechLimit($game_env['startyear'], $year, $destnation['tech'])) { $num = intdiv($num, 4); }
             $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$destgencount' where nation='{$destnation['nation']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
             //양국 평균 기술가격
@@ -1627,18 +1626,19 @@ function getCityDef($city) {
     return $def;
 }
 
-function getRate($game, $type, $dtype) {
+function getRate($game_env, $type, $dtype) {
     $t = "{$dtype}{$type}";
-    return $game[$t];
+    return $game_env[$t];
 }
 
 function addConflict($city, $nationID, $mykillnum) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
 
     $nationlist = [];
     $killnum = [0];
 
-    list($year, $month) = $db->queryFirstList('SELECT year, month FROM game LIMIT 1');
+    list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
 
     $conflict = Json::decode($city['conflict']);
 
@@ -1697,7 +1697,7 @@ function getConquerNation($city) : int {
     return Util::array_first_key($conflict);
 }
 
-function ConquerCity($game, $general, $city, $nation, $destnation) {
+function ConquerCity($game_env, $general, $city, $nation, $destnation) {
     '@phan-var array<string,mixed> $city';
     $db = DB::db();
     $connect=$db->get();
@@ -1712,8 +1712,8 @@ function ConquerCity($game, $general, $city, $nation, $destnation) {
         $destnationName = "공백지인";
     }
 
-    $year = $game['year'];
-    $month = $game['month'];
+    $year = $game_env['year'];
+    $month = $game_env['month'];
 
     $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>(이)가 <G><b>{$city['name']}</b></> 공략에 <S>성공</>했습니다.";
     $log[] = "<C>●</><G><b>{$city['name']}</b></> 공략에 <S>성공</>했습니다.";

hwe/processing.php

@@ -116,18 +116,18 @@ switch($commandtype) {
 }
 
 function starter($name, $type=0) {
-    echo '
+?>
 <!DOCTYPE html>
 <html>
 <head>
-<title>'.$name.'</title>
+<title><?=$name?></title>
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<script src="../e_lib/jquery-3.2.1.min.js"></script>
-<script src="../d_shared/common_path.js"></script>
-<script src="js/common.js"></script>
-<script src="js/base_map.js"></script>
-<script src="js/map.js"></script>
+<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS('js/map.js')?>
 <script>
 $(function(){
     var $target = $("form[name=form1] select[name=double]");
@@ -143,19 +143,17 @@ $(function(){
     });
 });
 </script>
-<link href="css/normalize.css" rel="stylesheet">
-<link href="../d_shared/common.css" rel="stylesheet">
-<link href="css/common.css" rel="stylesheet">
-<link href="css/main.css" rel="stylesheet">
-<link href="css/map.css" rel="stylesheet">
-';
-echo '
+<?=WebUtil::printCSS('css/normalize.css')?>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printCSS('css/main.css')?>
+<?=WebUtil::printCSS('css/map.css')?>
 </head>
 <body class="img_back">
-<table class="bg0" align="center" width="1000" border="1" cellspacing="0" cellpadding="0" bordercolordark="gray" bordercolorlight="black" style="font-size:13px;word-break:break-all;">
-    <tr><td class="bg1" align="center">'.$name.'</td></tr>
+<table class="tb_layout bg0" style="width:1000px;margin:auto;">
+    <tr><td class="bg1" align="center"><?=$name?></td></tr>
     <tr><td>
-';
+<?php
     if($type == 1) echo CoreBackButton();
     else echo backButton();
 }
@@ -195,13 +193,11 @@ function command_99($turn) {
 
 function command_11($turn, $command) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
     $userID = Session::getUserID();
 
     starter("징병");
-    $query = "select * from game limit 1";
-    $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
 
     $query = "select no,nation,level,personal,special2,level,city,crew,horse,injury,leader,crewtype,gold from general where owner='{$userID}'";
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
@@ -221,7 +217,7 @@ function command_11($turn, $command) {
 
     $ownCities = [];
     $ownRegions = [];
-    $relativeYear = $admin['year'] - $admin['startyear'];
+    $relativeYear = $gameStor->year - $gameStor->startyear;
     $tech = $nation['tech'];
 
     foreach(DB::db()->query('SELECT city, region from city where nation = %i', $me['nation']) as $city){
@@ -279,7 +275,7 @@ function calc(cost, formnum) {
     form.cost.value = Math.round(crew * cost);
 }
 </script>
-<table border=1 cellspacing=0 bordercolordark=gray bordercolorlight=black>
+<table class='tb_layout' style='margin:auto;'>
     <tr>
         <td colspan=10 align=center id=bg2>
             현재 기술력 : <input type=text style=text-align:right;color:white;background-color:black size=5 readonly value=".getTechCall($nation['tech']).">
@@ -360,7 +356,7 @@ function calc(cost, formnum) {
         $speed = $unit->speed;
         $avoid = $unit->avoid;
         $weapImage = ServConfig::$gameImagePath."/weap{$i}.png";
-        if($admin['show_img_level'] < 2) { $weapImage = ServConfig::$sharedIconPath."/default.jpg"; }
+        if($gameStor->show_img_level < 2) { $weapImage = ServConfig::$sharedIconPath."/default.jpg"; }
         
         $baseRiceShort = round($baseRice, 1);
         $baseCostShort = round($baseCost, 1);
@@ -403,13 +399,11 @@ function calc(cost, formnum) {
 
 function command_12($turn, $command) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
     $userID = Session::getUserID();
 
     starter("모병");
-    $query = "select * from game limit 1";
-    $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
 
     $query = "select no,nation,level,personal,special2,level,city,crew,horse,injury,leader,crewtype,gold from general where owner='{$userID}'";
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
@@ -429,7 +423,7 @@ function command_12($turn, $command) {
 
     $ownCities = [];
     $ownRegions = [];
-    $relativeYear = $admin['year'] - $admin['startyear'];
+    $relativeYear = $gameStor->year - $gameStor->startyear;
     $tech = $nation['tech'];
 
     foreach(DB::db()->query('SELECT city, region from city where nation = %i', $me['nation']) as $city){
@@ -487,7 +481,7 @@ function calc(cost, formnum) {
     form.cost.value = Math.round(crew * cost * 2);
 }
 </script>
-<table border=1 cellspacing=0 bordercolordark=gray bordercolorlight=black>
+<table class='tb_layout' style='margin:auto;'>
     <tr><td align=center colspan=10>모병은 가격 2배의 자금이 소요됩니다.</td></tr>
     <tr>
         <td colspan=10 align=center id=bg2>
@@ -570,7 +564,7 @@ function calc(cost, formnum) {
         $speed = $unit->speed;
         $avoid = $unit->avoid;
         $weapImage = ServConfig::$gameImagePath."/weap{$i}.png";
-        if($admin['show_img_level'] < 2) { $weapImage = ServConfig::$sharedIconPath."/default.jpg"; }
+        if($gameStor->show_img_level < 2) { $weapImage = ServConfig::$sharedIconPath."/default.jpg"; }
         
         $baseRiceShort = round($baseRice, 1);
         $baseCostShort = round($baseCost, 1);
@@ -963,15 +957,12 @@ function command_24($turn, $command) {
 
 function command_25($turn, $command) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
     $userID = Session::getUserID();
 
     starter("임관");
 
-    $query = "select startyear,year from game limit 1";
-    $result = MYDB_query($query, $connect) or Error("command_46 ".MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
-
     $query = "select no,nations from general where owner='{$userID}'";
     $result = MYDB_query($query, $connect) or Error("command_27 ".MYDB_error($connect),"");
     $me = MYDB_fetch_array($result);
@@ -1004,7 +995,7 @@ function command_25($turn, $command) {
             $scoutStr .= "<tr><td align=center width=100 style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</td><td width=900 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>".$nation['scoutmsg']."</td></tr>";
         }
 
-        if($admin['year'] < $admin['startyear']+3 && $nation['gennum'] >= 10) {
+        if($gameStor->year < $gameStor->startyear+3 && $nation['gennum'] >= 10) {
             echo "
     <option value={$nation['nation']} style=color:{$nation['color']};background-color:red;>【 {$nation['name']} 】</option>";
         } elseif($nation['scout'] == 1) {
@@ -1031,7 +1022,7 @@ function command_25($turn, $command) {
 
     echo "
 </form>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
 <tr><td align=center colspan=2 id=bg1>임관 권유 메세지</td></tr>
 {$scoutStr}
 </table>";
@@ -1530,11 +1521,12 @@ function command_44($turn, $command) {
 
 function command_46($turn, $command) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     starter("건국");
 
-    $maxnation = $db->queryFirstField('SELECT maxnation FROM game LIMIT 1');
+    $maxnation = $gameStor->maxnation;
 
     $colorUsed = [];
     
@@ -1785,7 +1777,7 @@ function command_51($turn, $command) {
     for($i=1; $i <= $count; $i++) {
         $nation = MYDB_fetch_array($result);
 
-        if($myNation['power'] <= $nation['power'] * 3 || !isClose($me['nation'], $nation['nation'])) {
+        if($myNation['power'] <= $nation['power'] * 3 || !isNeighbor($me['nation'], $nation['nation'])) {
             echo "<option style=color:{$nation['color']};background-color:red; value={$nation['nation']}>【 {$nation['name']} 】</option>";
         } else {
             echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";
@@ -1929,7 +1921,7 @@ function command_53($turn, $command) {
     for($i=1; $i <= $count; $i++) {
         $nation = MYDB_fetch_array($result);
 
-        if($myNation['power']+$nation['power'] > $cond1 || $myNation['gennum']+$nation['gennum'] > $cond2 || !isClose($me['nation'], $nation['nation'])) {
+        if($myNation['power']+$nation['power'] > $cond1 || $myNation['gennum']+$nation['gennum'] > $cond2 || !isNeighbor($me['nation'], $nation['nation'])) {
             echo "<option style=color:{$nation['color']};background-color:red; value={$nation['nation']}>【 {$nation['name']} 】</option>";
         } else {
             echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";

hwe/sammo/DiplomaticMessage.php

@@ -225,6 +225,8 @@ class DiplomaticMessage extends Message{
         
 
         $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+
         $general = $db->queryFirstRow(
             'SELECT `name`, `level` FROM general WHERE `no`=%i AND nation=%i', 
             $receiverID, 
@@ -281,10 +283,7 @@ class DiplomaticMessage extends Message{
             return $result;
         }
         
-        list(
-            $year, 
-            $month
-        ) = $db->queryFirstList('SELECT year, month FROM game LIMIT 1');
+        list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
 
 
         $this->dest->generalID = $receiverID;

hwe/sammo/Engine/Diplomacy.php

@@ -24,6 +24,7 @@ class Diplomacy{
         }
 
         $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
         $srcNation = $db->queryFirstRow(
             'SELECT nation, `name`, `power`, capital, gold, rice, surlimit, color, `level` FROM nation WHERE nation=%i',
             $srcNationID
@@ -58,7 +59,7 @@ class Diplomacy{
             $this->startYear,
             $this->year, 
             $this->month
-        ) = $db->queryFirstList('SELECT startyear, year, month FROM game LIMIT 1');
+        ) = $gameStor->getValuesAsArray(['startyear', 'year', 'month']);
 
     }
 
@@ -148,7 +149,7 @@ class Diplomacy{
             return $prev;
         }
 
-        if(!\sammo\isClose($this->srcNation['nation'], $this->destNation['nation'], false)){
+        if(!\sammo\isNeighbor($this->srcNation['nation'], $this->destNation['nation'], false)){
             return [DiplomaticMessage::DECLINED, '상대국의 도시들과 보급선이 이어지지 않았습니다.'];
         }
 
@@ -160,7 +161,7 @@ class Diplomacy{
             return $prev;
         }
 
-        if(!\sammo\isClose($this->srcNation['nation'], $this->destNation['nation'], true)){
+        if(!\sammo\isNeighbor($this->srcNation['nation'], $this->destNation['nation'], true)){
             return [DiplomaticMessage::DECLINED, '상대국의 도시와 인접하지 않았습니다.'];
         }
 

hwe/sammo/Engine/Personnel.php

@@ -21,6 +21,7 @@ class Personnel{
 
     public function __construct(int $nationID, int $senderID){
         $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
         $nation = $db->queryFirstRow(
             'SELECT nation, `name`, `level`, capital, scout FROM nation WHERE nation=%i',
             $nationID
@@ -39,7 +40,7 @@ class Personnel{
             $this->year, 
             $this->month, 
             $this->killturn
-        ) = $db->queryFirstList('SELECT startyear, year, month, killturn FROM game LIMIT 1');
+        ) = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'killturn']);
 
     }
 

hwe/sammo/Event/Action/ChangeCity.php

@@ -140,10 +140,10 @@ class ChangeCity extends \sammo\Event\Action{
 
         if($targetType == 'cities'){
             if(is_numeric($this->targetArgs)){
-                return DB::db()->queryFirstColumn('SELECT city FROM city WHERE city IN (%ls)', $this->targetArgs);
+                return DB::db()->queryFirstColumn('SELECT city FROM city WHERE city IN %ls', $this->targetArgs);
             }
             else{
-                return DB::db()->queryFirstColumn('SELECT city FROM city WHERE name IN (%ls)', $this->targetArgs);
+                return DB::db()->queryFirstColumn('SELECT city FROM city WHERE name IN %ls', $this->targetArgs);
             }
             
         }

hwe/sammo/ResetHelper.php

@@ -89,7 +89,7 @@ class ResetHelper{
             }
         }
 
-        
+        (KVStorage::getStorage($db, 'game_env'))->resetValues();
 
         return [
             'result'=>true
@@ -131,6 +131,7 @@ class ResetHelper{
 
 
         $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
         $db->insert('plock', [
             'plock'=>1
         ]);
@@ -194,7 +195,9 @@ class ResetHelper{
             ]);
         }
 
-        $db->insert('game', $env);
+        foreach($env as $key=>$value){
+            $gameStor->$key = $value;
+        }
 
         $scenarioObj->build($env);
 

hwe/sammo/Scenario.php

@@ -300,7 +300,7 @@ class Scenario{
         /*
         env로 사용된 것들,
         게임 변수 : year, month
-        game 테이블 변수 : startyear, year, month, genius, turnterm, show_img_level, extended_general, fiction, npcmode
+        gameStor 변수 : startyear, year, month, genius, turnterm, show_img_level, extended_general, fiction, npcmode
         install 변수 : npcmode, show_img_level, extended_general, scenario, fiction
 
         event변수 : currentEventID

hwe/sammo/Scenario/NPC.php

@@ -152,7 +152,7 @@ class NPC{
 
         $city = $this->locatedCity;
         if($city === null){
-            if($nationID == 0){
+            if($nationID == 0 || !CityHelper::getAllNationCities($nationID)){
                 $cityObj = Util::choiceRandom(CityHelper::getAllCities());
             }
             else{
@@ -161,6 +161,9 @@ class NPC{
             '@phan-var array<string,string|int> $cityObj';
             $city = $cityObj['id'];
         }
+        else{
+            $city = CityHelper::getCityByName($city)['id'];
+        }
 
         $experience = $age * 100;
         $dedication = $age * 100;

hwe/scenario/default.json

@@ -0,0 +1,7 @@
+{
+    "stat":{
+        "total":150,
+        "min":10,
+        "max":75
+    }
+}

hwe/scenario/scenario_23.json

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

hwe/scenario/scenario_30.json

@@ -6,6 +6,11 @@
     ],
     "diplomacy":[
     ],
+    "stat":{
+        "total":220,
+        "min":10,
+        "max":95
+    },
     "general":[
         [0, "김일융", -1, 0, null, 88, 83, 79, 0, 160, 300, null, null],
         [0, "이승엽", -1, 0, null, 90, 108, 37, 0, 160, 300, null, "위압", "안녕하세요 국민타자 이승엽입니다."],
@@ -70,8 +75,8 @@
         [0, "정보명", -1, 0, null, 69, 31, 39, 0, 160, 300, null, null],
         [0, "이재곤", -1, 0, null, 40, 41, 39, 0, 160, 300, null, null],
         [0, "염종석", -1, 0, null, 83, 90, 93, 0, 160, 300, null, null],
-        [0, "황재균", -1, 0, null, 79, 77, 83, 0, 160, 300, null, "집중", "안녕하세요 섹머입니다"],
-        [0, "윤학길", -1, 0, null, 81, 76, 82, 0, 160, 300, null, null],
+        [0, "황재균", -1, 0, null, 79, 77, 83, 0, 160, 300, null, null, "안녕하세요 섹머입니다"],
+        [0, "윤학길", -1, 0, null, 81, 76, 82, 0, 160, 300, null, "집중"],
         [0, "가득염", -1, 0, null, 60, 67, 61, 0, 160, 300, null, null],
         [0, "조경환", -1, 0, null, 57, 78, 20, 0, 160, 300, null, null],
         [0, "강상수", -1, 0, null, 65, 66, 58, 0, 160, 300, null, null],

hwe/scenario/scenario_5.json

@@ -314,7 +314,7 @@
         [134,     "유도",1278,  0,    null, 35, 33, 68, 0, 168, 214, "재간",    null],
         [ 46,     "유벽",1279,  0,    null, 63, 71, 23, 0, 168, 210, "출세",    null],
         [ 75,     "유봉",1280,  0,    null, 60, 65, 62, 0, 188, 220, "출세",    null],
-        [ 75,     "유비",1281,  8,    null, 85, 75, 70,12, 161, 223, "왕좌", "인덕", "관우가 날 저버렸다니... 믿을 수 없다."],
+        [ 75,     "유비",1281,  8,    "업", 85, 75, 70,12, 161, 223, "왕좌", "인덕", "관우가 날 저버렸다니... 믿을 수 없다."],
         [ 75,    "유선1",1282,  0,    null, 24, 17, 21, 0, 207, 271, "대의",    null],
         [ 55,     "유순",1283,  5,    null, 67, 61, 54, 0, 184, 239, "출세",    null],
         [ 75,     "유심",1284,  0,    null, 63, 46, 70, 0, 238, 263, "왕좌",    null],

hwe/scenario/scenario_8.json

@@ -13,10 +13,10 @@
             "건업", "파양", "적벽", "여강", "오", "회계", "시상"
         ]],
         ["유비", "#008000", 10000, 10000, "형주를 제패하고 익주를 노리는 유비", 1000, "유가", 4, [
-            "강릉", "자동", "강하", "무릉", "장사", "영릉", "계양"
+            "강릉", "장판", "강하", "무릉", "장사", "영릉", "계양"
         ]],
         ["유장", "#483D8B", 10000, 10000, "장로를 막기 위해 유비를 끌어들인 유장", 1000, "유가", 4, [
-            "성도", "면죽", "덕양", "영안", "강주"
+            "성도", "면죽", "덕양", "영안", "자동", "강주"
         ]],
         ["장로", "#20B2AA", 10000, 10000, "익주 진출에 실패하고 조조에게 위협받는 장로", 1000, "오두미도", 2, [
             "한중", "양평"
@@ -131,7 +131,7 @@
         [ 48,     "마완",1097,  0,    null, 49, 64, 26, 0, 170, 211, "안전", "기병"],
         [ 19,     "마준",1098,  0,    null, 45, 63, 62, 0, 196, 260, "안전",    null],
         [ 71,     "마철",1099,  0,    null, 71, 60, 31, 0, 179, 211, "대의", "기병"],
-        [ 70,     "마초",1100,  6,    null, 78, 97, 40,12, 176, 226, "대의", "기병"],
+        [ 70,     "마초",1100,  6,  "한중", 78, 97, 40,12, 176, 226, "대의", "기병"],
         [131,    "마충1",1101,  2,    null, 67, 62, 51, 0, 186, 222, "재간",    null],
         [ 69,    "마충2",1102,  0,    null, 61, 68, 51, 0, 187, 249, "출세",    null],
         [ 71,     "마휴",1103,  0,    null, 71, 60, 32, 0, 178, 211, "대의", "기병"],

hwe/select_npc.php

@@ -7,8 +7,9 @@ include "func.php";
 $session = Session::requireLogin()->setReadOnly();
 $userID = Session::getUserID();
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 
-list($npcmode, $maxgeneral) = $db->queryFirstList('SELECT npcmode,maxgeneral FROM game LIMIT 1');
+list($npcmode, $maxgeneral) = $gameStor->getValuesAsArray(['npcmode', 'maxgeneral']);
 
 if(!$npcmode) {
     header('location:..');
@@ -24,15 +25,16 @@ $nations = $db->queryAllLists('SELECT `name`, scoutmsg, color FROM nation');
 <head>
 <title><?=UniqueConst::$serverName?>: NPC빙의</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='css/normalize.css?180505_2' type='text/css'>
-<link rel='stylesheet' href='../d_shared/common.css?180505_2' type='text/css'>
-<link rel='stylesheet' href='../css/config.css?180505_2' type='text/css'>
-<link rel='stylesheet' href='css/common.css?180505_2' type='text/css'>
-<link rel='stylesheet' href='css/select_npc.css?180505_2' type='text/css'>
-<script type="text/javascript" src="../d_shared/common_path.js"></script>
-<script type="text/javascript" src="../e_lib/jquery-3.2.1.min.js"></script>
-<script type="text/javascript" src="../js/common.js?180505_2"></script>
-<script src="js/select_npc.js?180505_4"></script>
+<?=WebUtil::printCSS('css/normalize.css')?>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('../css/config.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printCSS('css/select_npc.css')?>
+
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.2.1.min.js')?>
+<?=WebUtil::printJS('../js/common.js')?>
+<?=WebUtil::printJS('js/select_npc.js')?>
 
 </head>
 

hwe/sql/reset.sql

@@ -13,9 +13,6 @@ DROP TABLE IF EXISTS troop;
 # 락 테이블 삭제
 DROP TABLE IF EXISTS plock;
 
-# 게임 테이블 삭제
-DROP TABLE IF EXISTS game;
-
 # 메시지 테이블 삭제
 DROP TABLE IF EXISTS message;
 

hwe/sql/schema.sql

@@ -341,71 +341,6 @@ create table plock (
   PRIMARY KEY (no)
   ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4;
 
-##########################################################################
-## 게임 테이블
-##########################################################################
-
-CREATE TABLE `game` (
-	`no` ENUM('1') NOT NULL DEFAULT '1',
-	`startyear` INT(3) NOT NULL,
-	`year` INT(3) NOT NULL,
-	`month` INT(3) NOT NULL,
-	`refresh` INT(9) NULL DEFAULT '0',
-	`maxonline` INT(9) NULL DEFAULT '1',
-	`maxrefresh` INT(9) NULL DEFAULT '1',
-	`conlimit` INT(9) NULL DEFAULT '5',
-	`develcost` INT(4) NULL DEFAULT '20',
-	`online` INT(9) NULL DEFAULT '0',
-	`onlinenation` VARCHAR(256) NULL DEFAULT '',
-	`onlinegen` VARCHAR(1024) NULL DEFAULT '',
-	`msg` TEXT NULL DEFAULT '',
-	`maxgeneral` INT(3) NULL DEFAULT '100',
-	`genius` INT(2) NULL DEFAULT '3',
-	`maxnation` INT(3) NULL DEFAULT '50',
-	`gold_rate` INT(3) NULL DEFAULT '100',
-	`rice_rate` INT(3) NULL DEFAULT '100',
-	`city_rate` INT(3) NULL DEFAULT '50',
-	`turnterm` INT(3) NULL DEFAULT '60',
-	`killturn` INT(6) NULL DEFAULT '80',
-	`turntime` DATETIME NULL DEFAULT NULL,
-	`starttime` DATETIME NULL DEFAULT NULL,
-	`isUnited` INT(1) NULL DEFAULT '0',
-	`scenario` INT(4) NULL DEFAULT '0',
-	`scenario_text` VARCHAR(80) NULL DEFAULT '0',
-	`show_img_level` INT(2) NULL DEFAULT '0',
-	`extended_general` INT(1) NULL DEFAULT '0',
-	`fiction` INT(1) NULL DEFAULT '0',
-	`npcmode` INT(1) NULL DEFAULT '0',
-	`tnmt_auto` INT(2) NULL DEFAULT '0',
-	`tnmt_time` DATETIME NULL DEFAULT '2100-01-01 00:00:00',
-	`tournament` INT(2) NULL DEFAULT '0',
-	`phase` INT(2) NULL DEFAULT '0',
-	`tnmt_type` INT(2) NULL DEFAULT '0',
-	`tnmt_msg` CHAR(255) NULL DEFAULT '',
-	`tnmt_trig` INT(2) NULL DEFAULT '0',
-	`voteopen` INT(1) NULL DEFAULT '1',
-	`vote` TEXT NULL DEFAULT '',
-	`votecomment` TEXT NULL DEFAULT '',
-	`npccount` INT(4) NULL DEFAULT '0',
-	`bet0` INT(8) NULL DEFAULT '0',
-	`bet1` INT(8) NULL DEFAULT '0',
-	`bet2` INT(8) NULL DEFAULT '0',
-	`bet3` INT(8) NULL DEFAULT '0',
-	`bet4` INT(8) NULL DEFAULT '0',
-	`bet5` INT(8) NULL DEFAULT '0',
-	`bet6` INT(8) NULL DEFAULT '0',
-	`bet7` INT(8) NULL DEFAULT '0',
-	`bet8` INT(8) NULL DEFAULT '0',
-	`bet9` INT(8) NULL DEFAULT '0',
-	`bet10` INT(8) NULL DEFAULT '0',
-	`bet11` INT(8) NULL DEFAULT '0',
-	`bet12` INT(8) NULL DEFAULT '0',
-	`bet13` INT(8) NULL DEFAULT '0',
-	`bet14` INT(8) NULL DEFAULT '0',
-	`bet15` INT(8) NULL DEFAULT '0',
-	PRIMARY KEY (`no`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
-
 ###########################################################################
 ## 메시지 테이블
 ###########################################################################
@@ -672,3 +607,17 @@ CREATE TABLE `select_npc_token` (
 )
 DEFAULT CHARSET=utf8mb4
 ENGINE=MyISAM;
+
+###################
+# KV storage
+###################
+CREATE TABLE `storage` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`namespace` VARCHAR(40) NOT NULL,
+	`key` VARCHAR(40) NOT NULL,
+	`value` TEXT NOT NULL,
+	PRIMARY KEY (`id`),
+	UNIQUE INDEX `key` (`namespace`, `key`)
+)
+COLLATE='utf8mb4_general_ci'
+ENGINE=MyISAM

hwe/templates/msg_plate.php

@@ -1,53 +0,0 @@
-<?php
-//TODO: style을 css로 분리
-//TODO: msg를 div로 변경
-?>
-<table 
-    width="498px" 
-    border="1" 
-    bordercolordark="gray" 
-    bordercolorlight="black" 
-    cellpadding="0" 
-    cellspacing="0"
-    <?php if($msgType == 'private'): ?>
-        bgcolor="#CC6600" 
-    <?php elseif($msgType == 'national'): ?>
-        bgcolor="#336600" 
-    <?php else: /*$msgType == 'public'*/?>
-        bgcolor="#000055"   
-    <?php endif; ?>
-    style="font-size:13px;table-layout:fixed;word-break:break-all;"
-    data-id="<?=$id?>"
->
-    <tbody><tr>
-        <td width="64" height="64">
-            <?php if ($src['iconPath'] !== null): ?>
-                <img width='64' height='64' src="<?=$this->e(urlencode($src['iconPath']))?>">
-            <?php else: ?>
-                <img width='64' height='64' src="<?=$this->imagePath?>/default.jpg">
-            <?php endif; ?>
-        </td>
-        <td width="434px" valign="top">
-            <?php if($msgType == 'private'): ?>
-                <b>[
-                    <font color="<?=$src['color']?>"><?=$this->e($src['name'])?>:<?=$this->e($src['nation'])?></font>
-                ▶
-                    <font color="<?=$dest['color']?>"><?=$this->e($dest['name'])?>:<?=$this->e($dest['nation'])?></font>
-                ]</b>
-            <?php elseif($msgType == 'national'): ?>
-                <b>[
-                    <font color="<?=$src['color']?>"><?=$this->e($src['name'])?>:<?=$this->e($src['nation'])?></font>
-                ▶
-                    <font color="<?=$dest['color']?>"><?=$this->e($dest['nation'])?></font>
-                ]</b>
-            <?php else: ?>
-                <b>[
-                    <font color="<?=$src['color']?>"><?=$this->e($src['name'])?>:<?=$this->e($src['nation'])?>
-                ]</b>
-            <?php endif; ?>
-            <font size="1">&lt;<?=$datetime?>&gt;</font>
-            <br>
-            <?=$this->e($message)?>
-        </td>
-    </tr></tbody>
-</table>

hwe/turn.php

@@ -18,14 +18,14 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("턴반복", 1);
 
 $myActionCnt = $db->queryFirstField('SELECT con FROM general WHERE `owner`=%i', $userID);
-$conLimit = $db->queryFirstField('SELECT conlimit FROM game LIMIT 1');
 
-$con = checkLimit($myActionCnt, $conLimit);
+$con = checkLimit($myActionCnt);
 if($con >= 2) { 
     header('location:commandlist.php');
     exit();