kvstorage 버그 수정

KVStorage를 전역으로 이동

.gitignore

@@ -30,6 +30,7 @@ d_pic/*.png
 
 d_setting/*.php
 */d_setting/*.php
+*/d_setting/templates/*.php
 
 **/old/*
 test.php

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",

css/config.css

@@ -1,14 +1,16 @@
 @charset "utf-8";
 
-*       { margin: 0px; padding: 0px; }
-body    { color:white; background-color:black; border-width:1px; border-color:gray; }
-table   {
+body {
+    color:white; background-color:black; font-family: '맑은 고딕';
+}
+
+table {
     border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
     padding: 0px;
     font-size: 13px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕'; line-height: 110%;
+    font-family: '맑은 고딕';
 }
 th, td      {
     border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
@@ -16,21 +18,15 @@ th, td      {
     font-size: 13px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕'; line-height: 110%;
+    font-family: '맑은 고딕';
 }
 
 a.just_link {
     text-decoration: none;
 }
 
-div     {
-    margin:0px;
-    padding: 0px;
-    word-break: break-all;
-    font-family: '맑은 고딕';
-}
-
 .with_border{
+    margin:0;
     border: solid 1px;
     border-spacing: 0px;
     border-collapse: separate;
@@ -45,6 +41,8 @@ div     {
     line-height:50px;
     font-size: 30px; font-weight: bold;
     text-align: center;
+    color:white;
+    padding:0;
 }
 
 .legacy_layout div     {
@@ -53,20 +51,9 @@ div     {
     font-size: 13px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕'; line-height: 110%;
+    font-family: '맑은 고딕';;
 }
 
-font    { font-family: '맑은 고딕'; line-height: 110%; }
-/*
-input   {
-    width: 100px; height: 18px;
-    background-color: black; color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
-    line-height: 110%;
-}
-*/
-
 .obj_fill{
     display:block;
     width:100%;
@@ -77,28 +64,20 @@ button.with_skin {
     background-color: black; color: white;
     font-family: '맑은 고딕';
     font-size: 13px;
-    line-height: 110%;
+}
+
+button.with_skin:disabled {
+    background-color:#333333;
 }
 
 input.with_skin   {
     background-color: black; color: white;
     font-family: '맑은 고딕';
     font-size: 13px;
-    line-height: 110%;
 }
 
-select  {
-    width: 100px; height: 18px;
-    background-color: black; color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
-    line-height: 110%;
-}
-button  {
-    width: 100px; height: 20px;
-    background-color: black; color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
+input.with_skin:disabled {
+    background-color: #333333;
 }
 
 .font0  { font-size: 10px; }
@@ -106,4 +85,8 @@ button  {
 .font2  { font-size: 15px; }
 .font3  { font-size: 20px; }
 .font4  { font-size: 30px; }
-.font5  { font-size: 50px; }
+.font5  { font-size: 50px; }
+
+caption.section_title {
+    caption-side:top;
+}

css/entrance.css

@@ -1,5 +1,9 @@
 @charset "utf-8";
 
+body{
+    line-height: 1.3;
+}
+
 #server_notice {
     margin:10px 0;
     border: none;
@@ -55,77 +59,6 @@
     text-align:center;
 }
 
-/*Legacy*/
-
-
-#Entrance_00 {
-    width: 800px;
-    position: absolute; top: 50px; left: 50%;
-    margin-left: -400px;
-    border: none;
-}
-
-#Entrance_0004 {
-    width: 52px; height: 52px;
-    position: absolute; top: 0px; left: -62px;
-    border: 1px solid white;
-}
-
-#Entrance_0005 {
-    width: 160px; height: 600px;
-    position: absolute; top: 62px; left: -170px;
-}
-
-#Entrance_0006 {
-    width: 160px; height: 600px;
-    position: absolute; top: 62px; left: 810px;
-}
-
-
-
-#Entrance_0000 {
-    width: 800px; height: 134px;
-    position: absolute; top: 0px; left: 0px;
-}
-
-#Entrance_000000 {
-    width: 798px; height: 50px;
-    position: absolute; top: 0px; left: 0px;
-    font-size: 30px; font-weight: bold;
-}
-
-#Entrance_000001 {
-    width: 798px; height: 20px;
-    position: absolute; top: 52px; left: 0px;
-    border: none;
-}
-
-#Entrance_00000000 {
-    width: 98px; height: 20px;
-    position: absolute; top: 0px; left: 0px;
-}
-
-#Entrance_00000001 {
-    width: 398px; height: 20px;
-    position: absolute; top: 0px; left: 100px;
-}
-
-#Entrance_00000002 {
-    width: 178px; height: 20px;
-    position: absolute; top: 0px; left: 500px;
-}
-
-#Entrance_00000003 {
-    width: 118px; height: 20px;
-    position: absolute; top: 0px; left: 680px;
-}
-
-#Entrance_000002 {
-    width: 798px; height: 64px;
-    position: absolute; top: 74px; left: 0px;
-    border: none;
-}
-
 .Entrance_ServerList {
     width: 800px; height: 64px;
     border: none;
@@ -197,25 +130,4 @@
 
 .Entrance_Hwe {
     color: red; font-size: 15px; font-weight: bold;
-}
-
-#Entrance_0001 {
-    width: 800px; height: 130px;
-    position: absolute; top: 154px; left: 0px;
-}
-
-#Entrance_000100 {
-    width: 798px; height: 50px;
-    position: absolute; top: 0px; left: 0px;
-    font-size: 30px; font-weight: bold;
-}
-
-#Entrance_000101 {
-    width: 200px; height: 50px;
-    position: absolute; top: 65px; left: 150px;
-}
-
-#Entrance_000102 {
-    width: 200px; height: 50px;
-    position: absolute; top: 65px; left: 450px;
-}
+}

css/login.css

@@ -62,8 +62,21 @@ input::-webkit-input-placeholder {
 }
 
 
+.col-form-label{
+    text-align:center;
+}
+
 .terms{
-    max-height: 200px; overflow: auto;
+    max-height: 200px; overflow-y: auto;
+}
+
+.terms pre{
+    width:100%;
+    white-space: pre-wrap;       /* Since CSS 2.1 */
+    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    white-space: -pre-wrap;      /* Opera 4-6 */
+    white-space: -o-pre-wrap;    /* Opera 7 */
+    word-wrap: break-word;       /* Internet Explorer 5.5+ */
 }
 
 .vertical-center {
@@ -72,4 +85,32 @@ input::-webkit-input-placeholder {
 
     display: flex;
     align-items: center;
+}
+
+#btn_kakao_login{
+    cursor: pointer;
+    height:46px;
+    width:116px;
+    background-color: transparent;
+    color:transparent;
+    border:0;
+    background-size: 100%; /* To fill the dimensions of container (button), or */
+    background-repeat: no-repeat;
+    background-position: bottom center;
+    margin-top:5px;
+    background-image:url('../oauth_kakao/kakao_login_join.png');
+}
+
+#btn_kakao_login:hover {
+    background-image:url('../oauth_kakao/kakao_login_join_ov.png');
+} 
+
+#bottom_box{
+    position:fixed;
+    bottom:0;
+    width:100%;
+    left:0;
+}
+#bottom_box .container{
+    text-align:center;
 }

css/user_info.css

@@ -21,6 +21,7 @@
     right: 6px;
     margin:6px;
     height:40px;
+    line-height:40px;
 }
 
 #btn_delete_me{
@@ -37,15 +38,15 @@
 
 #image_upload_filename{
     position:absolute;
-    height:16px;
+    height:20px;
     left:10px;
     width:130px;
-    top:16px;
+    top:12px;
 }
 
 #image_upload_fake_btn{
-    top:16px;
-    height:20px;
+    top:12px;
+    height:22px;
     right:10px;
     position:absolute;
 }
@@ -53,8 +54,7 @@
 #image_upload{
     opacity: 0;
     position:absolute;
-    top:16px;
-    height:22px;
+    top:12px;
     left:0;
     height:20px;
     width:100%;
@@ -70,7 +70,6 @@
     bottom:0;
     left:0;
     width:50%;
-    height:20px;
 }
 
 #btn_remove_icon{
@@ -78,171 +77,10 @@
     bottom:0;
     right:0;
     width:50%;
-    height:20px;
 }
 
-#EntranceManage_00 {
-    width: 500px; height: 409px;
-    z-index: 2;
-}
-
-#EntranceManage_0000 {
-    width: 498px; height: 50px;
-}
-
-#EntranceManage_0001 {
-    width: 100px; height: 30px;
-}
-
-#EntranceManage_0002 {
-    width: 498px; height: 25px;
-}
-
-#EntranceManage_0003 {
-    width: 98px; height: 84px;
-    line-height: 84px;
-}
-
-#EntranceManage_0004 {
-    width: 148px; height: 84px;
-    line-height: 84px;
-}
-
-#EntranceManage_0005 {
-    width: 98px; height: 84px;
-    line-height: 84px;
-}
-
-#EntranceManage_0006 {
-    width: 148px; height: 84px;
-    text-align: left;
-}
-
-#EntranceManage_000600 {
-    width: 80px; height: 17px;
-}
-
-#EntranceManage_000601 {
-    width: 80px; height: 17px;
-}
-
-#EntranceManage_000602 {
-    width: 80px; height: 17px;
-}
-
-#EntranceManage_000603 {
-    width: 144px; height: 20px;
-}
-
-#EntranceManage_0007 {
-    width: 98px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0008 {
-    width: 148px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0009 {
-    width: 98px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0010 {
-    width: 148px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0011 {
-    width: 98px; height: 20px;
-}
-
-#EntranceManage_0012 {
-    width: 148px; height: 20px;
-}
-
-#EntranceManage_0013 {
-    width: 248px; height: 20px;
-}
-
-#EntranceManage_0014 {
-    width: 98px; height: 64px;
-    line-height: 64px;
-}
-
-#EntranceManage_0015 {
-    width: 148px; height: 64px;
-}
-
-#EntranceManage_001500 {
-    width: 64px; height: 64px;
-}
-
-#EntranceManage_001501 {
-    width: 64px; height: 64px;
-}
-
-#EntranceManage_0016 {
-    width: 248px; height: 64px;
-}
-
-#EntranceManage_001600 {
-    width: 100px; height: 16px;
-    display: none;
-}
-
-#EntranceManage_001601 {
-    width: 70px; height: 20px;
-}
-
-#EntranceManage_001602 {
-    width: 85px; height: 20px;
-}
-
-#EntranceManage_001603 {
-    width: 85px; height: 20px;
-}
-
-#EntranceManage_0017 {
-    width: 98px; height: 100px;
-    line-height: 100px;
-}
-
-#EntranceManage_0018 {
-    width: 398px; height: 100px;
-    text-align: left;
-}
-
-#EntranceManage_0019 {
-    width: 149px; height: 20px;
-}
-
-#EntranceManage_0020 {
-    width: 500px; height: 20px;
-    border: none;
-}
-
-#EntranceManage_002000 {
-    width: 500px;
-}
-
-#EntranceManage_00200000 {
-    width: 498px; height: 20px;
-}
-
-.EntranceManage_Sequence {
-    width: 48px; height: 20px;
-}
-
-.EntranceManage_Date {
-    width: 148px; height: 20px;
-}
-
-.EntranceManage_Amount {
-    width: 148px; height: 20px;
-}
-
-.EntranceManage_Cumul {
-    width: 148px; height: 20px;
-}
+#third_use_disallow{
+    display:none;
+    margin-left:10px;
+    width:40px;
+}

f_config/config.php

@@ -2,11 +2,14 @@
 namespace sammo;
 
 define('ROOT', realpath(__dir__.'/..'));
-
+date_default_timezone_set('Asia/Seoul');
 mb_internal_encoding("UTF-8");
 mb_http_output('UTF-8');
 mb_regex_encoding('UTF-8'); 
 
+ini_set("session.cache_expire", 10080);      // minutes
+ini_set("session.gc_maxlifetime", 604800);    // seconds
+
 function getFriendlyErrorType($type) 
 { 
     switch($type) 
@@ -79,6 +82,7 @@ function logExceptionByCustomHandler(\Throwable $e){
     ], Json::PRETTY);
 
     file_put_contents(ROOT.'/d_log/err_log.txt',"$data\n", FILE_APPEND);
+    echo $e->getTraceAsString();
     throw $e;
 }
 set_exception_handler('\\sammo\\logExceptionByCustomHandler');

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/j_install_status.php

@@ -24,7 +24,7 @@ $rootDB->error_handler = function($params){
     ]);
 };
 
-$memberCnt = $rootDB->queryFirstField('SELECT count(`NO`) from MEMBER');
+$memberCnt = $rootDB->queryFirstField('SELECT count(`NO`) from member');
 if($memberCnt == 0){
     Json::die([
         'step'=>'admin',

f_install/j_setup_db.php

@@ -216,6 +216,13 @@ $result = Util::generateFileUsingSimpleTemplate(
     true
 );
 
+$result = Util::generateFileUsingSimpleTemplate(
+    __dir__.'/templates/menu.orig.js',
+    ROOT.'/d_shared/menu.js',
+    [],
+    true
+);
+
 if ($result !== true) {
     Json::die([
         'result'=>false,

f_install/sql/common_schema.sql

@@ -25,6 +25,7 @@ CREATE TABLE `member` (
 	`EMAIL` VARCHAR(64) NULL DEFAULT NULL,
 	`PW` CHAR(128) NOT NULL,
 	`salt` CHAR(16) NOT NULL,
+	`third_use` INT(1) NOT NULL DEFAULT '0',
 	`NAME` VARCHAR(64) NOT NULL,
 	`PICTURE` VARCHAR(64) NULL DEFAULT 'default.jpg',
 	`IMGSVR` INT(1) NULL DEFAULT '0',
@@ -53,4 +54,18 @@ CREATE TABLE `member_log` (
 	INDEX `action` (`member_no`, `action_type`, `date`),
 	INDEX `member` (`member_no`, `date`)
 )
-ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+
+###################
+# 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

f_install/templates/RootDB.orig.php

@@ -29,6 +29,8 @@ class RootDB
         if (self::$uDB === null) {
             self::$uDB = new \MeekroDB(self::$host, self::$user, self::$password, self::$dbName, self::$port, self::$encoding);
             self::$uDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
+
+            self::$uDB->error_handler= function(){};
             self::$uDB->throw_exception_on_error = true;
             self::$uDB->throw_exception_on_nonsql_error = true;
         }

f_install/templates/menu.orig.js

@@ -0,0 +1,8 @@
+window.sammo_menu = [
+    ['/bbs/board', '삼모게시판', '_blank'],
+    ['/bbs/tip', '팁/강좌', '_blank'],
+    ['/bbs/news', '삼국 일보', '_blank'],
+    ['/bbs/history2', '개인 열전', '_blank'],
+    ['/bbs/history3', '국가 열전', '_blank'],
+    ['/bbs/patch', '패치 내역', '_blank']
+];

hwe/_119.php

@@ -5,15 +5,15 @@ include "lib.php";
 include "func.php";
 
 $session = Session::requireGameLogin()->setReadOnly();
-if($session->userGrade < 5) {
-    ?><!DOCTYPE html>
+if($session->userGrade < 4) {
+?>
 <!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 < 5) {
 }
 
 $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

@@ -6,7 +6,7 @@ include "func.php";
 
 
 $session = Session::requireGameLogin()->setReadOnly();
-if($session->userGrade < 5){
+if($session->userGrade < 4){
     header('location:_119.php');
     die();
 }
@@ -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,285 +22,327 @@ if(!$generalID){
 }
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
+$src = MessageTarget::buildQuick($session->generalID);
+
 switch($btn) {
     case "전체 접속허용":
-        $query = "update general set con=0";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('general', [
+            'con'=>0
+        ], true);
         break;
     case "전체 접속제한":
-        $query = "update general set con=1000";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('general', [
+            'con'=>1000
+        ], true);
         break;
     case "블럭 해제":
+        $db->update('general', [
+            'block'=>0
+        ], '`no` IN %li', $genlist);
         DB::db()->query('update general set block=0 where no IN %li', $genlist);
         break;
     case "1단계 블럭":
         $date = date('Y-m-d H:i:s');
-        $db = DB::db();
-        $db->query('update general set block=1,killturn=24 where no IN %li',$genlist);
-        //FIXME: subquery로 하는게 더 빠를 듯.
-        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
-        RootDB::db()->query('update MEMBER set block_num=block_num+1,block_date=%s where no IN %ls', $date, $uid);
+        $db->update('general', [
+            'block'=>1,
+            'killturn'=>24
+        ], '`no` IN %li', $genlist);
+        $uid = $db->queryFirstColumn('SELECT `owner` FROM general WHERE `no` IN %li', $genlist);
+        RootDB::db()->update('member',[
+            'block_num'=>$db->sqleval('block_num+1'),
+            'block_date'=>$date
+        ], 'id IN %li', $uid);
         break;
     case "2단계 블럭":
         $date = date('Y-m-d H:i:s');
-        $db = DB::db();
-        $db->query('update general set gold=0,rice=0,block=2,killturn=24 where no IN %li',$genlist);
+        $db->update('general', [
+            'gold'=>0,
+            'rice'=>0,
+            'block'=>2,
+            'killturn'=>24
+        ], '`no` IN %li', $genlist);
         $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
-        RootDB::db()->query('update MEMBER set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
+        RootDB::db()->update('member',[
+            'block_num'=>$db->sqleval('block_num+1'),
+            'block_date'=>$date
+        ], 'id IN %li', $uid);
         break;
     case "3단계 블럭":
         $date = date('Y-m-d H:i:s');
-        $db = DB::db();
-        $db->query('update general set gold=0,rice=0,block=3,killturn=24 where no IN %li',$genlist);
-        $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
-        RootDB::db()->query('update MEMBER set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
+        $db->update('general', [
+            'gold'=>0,
+            'rice'=>0,
+            'block'=>3,
+            'killturn'=>24
+        ], '`no` IN %li', $genlist);
+        $uid = $db->queryFirstColumn('SELECT `owner` from general where no IN %li', $genlist);
+        RootDB::db()->update('member',[
+            'block_num'=>$db->sqleval('block_num+1'),
+            'block_date'=>$date
+        ], 'id IN %li', $uid);
         break;
     case "무한삭턴":
-        DB::db()->query('update general set killturn=8000 where no IN %li',$genlist);
+        $db->update('general', [
+            'killturn'=>8000
+        ], '`no` IN %li', $genlist);
         break;
     case "강제 사망":
         $date = date('Y-m-d H:i:s');
-        DB::db()->query('update general set turn0=0,killturn=0,turntime=%s where no IN %li',$date, $genlist);
+        $db->update('general', [
+            'turn0'=>0,
+            'killturn'=>0,
+            'turntime'=>$date,
+        ], '`no` IN %li', $genlist);
         break;
     case "특기 부여":
-        $admin = DB::db()->queryFirstRow('select `year`, `month` from `game` where `no`=1');
+        list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
+        $text = "특기 부여!";
 
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            $msg = "특기 부여!";
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
-        }
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "select no,leader,power,intel from general where no='$genlist[$i]'";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $general = MYDB_fetch_array($result);
+        foreach($db->query("SELECT `no`,leader,power,intel,dex0,dex10,dex20,dex30,dex40 FROM general WHERE `no` IN %li", $genlist) as $general){    
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($general['no']), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
 
-            $special2 = getSpecial2($general['leader'], $general['power'], $general['intel']);
-
-            $query = "update general set specage2=age,special2='$special2' where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-            $log[0] = "<C>●</>특기 【<b><L>".getGenSpecial($special2)."</></b>】(을)를 익혔습니다!";
-            pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:특기 【<b><C>".getGenSpecial($special2)."</></b>】(을)를 습득");
-            pushGenLog($general, $log);
+            $specialWar = SpecialityConst::pickSpecialWar($general);
+            $db->update('general', [
+                'specage2'=>$db->sqleval('age'),
+                'special2'=>$specialWar
+            ], 'no=%i', $general['no']);
+            $specialWarName = SpecialityConst::WAR[$specialWar][0];
+            pushGeneralHistory($general, "<C>●</>{$year}년 {$month}월:특기 【<b><C>{$specialWarName}</></b>】(을)를 습득");
+            pushGenLog($general, ["<C>●</>특기 【<b><L>{$specialWarName}</></b>】(을)를 익혔습니다!"]);
         }
+        
         break;
     case "경험치1000":
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            $msg = $btn." 지급!";
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
-        }
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set experience=experience+1000 where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $text = $btn." 지급!";
+        foreach($genlist as $generalID){
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
         }
+        $db->update('general',[
+            'experience'=>$db->sqleval('experience+1000')
+        ], '`no` IN %li', $genlist);
+
         break;
     case "공헌치1000":
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            $msg = $btn." 지급!";
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
-        }
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set dedication=dedication+1000 where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $text = $btn." 지급!";
+        foreach($genlist as $generalID){
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
         }
+        $db->update('general',[
+            'dedication'=>$db->sqleval('dedication+1000')
+        ], '`no` IN %li', $genlist);
+
         break;
     case "보숙10000":
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            $msg = "보병숙련도+10000 지급!";
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
-        }
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set dex0=dex0+10000 where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $text = "보병숙련도+10000 지급!";
+        foreach($genlist as $generalID){
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
         }
+        $db->update('general',[
+            'dex0'=>$db->sqleval('dex0+10000')
+        ], '`no` IN %li', $genlist);
         break;
     case "궁숙10000":
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            $msg = "궁병숙련도+10000 지급!";
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
-        }
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set dex10=dex10+10000 where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $text = "궁병숙련도+10000 지급!";
+        foreach($genlist as $generalID){
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
         }
+        $db->update('general',[
+            'dex10'=>$db->sqleval('dex10+10000')
+        ], '`no` IN %li', $genlist);
         break;
     case "기숙10000":
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            $msg = "기병숙련도+10000 지급!";
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
-        }
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set dex20=dex20+10000 where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $src = MessageTarget::buildQuick($session->generalID);
+        $text = "기병숙련도+10000 지급!";
+        foreach($genlist as $generalID){
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
         }
+        $db->update('general',[
+            'dex20'=>$db->sqleval('dex20+10000')
+        ], '`no` IN %li', $genlist);
         break;
     case "귀숙10000":
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            $msg = "귀병숙련도+10000 지급!";
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
-        }
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set dex30=dex30+10000 where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $src = MessageTarget::buildQuick($session->generalID);
+        $text = "귀병숙련도+10000 지급!";
+        foreach($genlist as $generalID){
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
         }
+        $db->update('general',[
+            'dex30'=>$db->sqleval('dex30+10000')
+        ], '`no` IN %li', $genlist);
         break;
     case "차숙10000":
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            $msg = "차병숙련도+10000 지급!";
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
-        }
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set dex40=dex40+10000 where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $src = MessageTarget::buildQuick($session->generalID);
+        $text = "차병숙련도+10000 지급!";
+        foreach($genlist as $generalID){
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
         }
+        $db->update('general',[
+            'dex40'=>$db->sqleval('dex40+10000')
+        ], '`no` IN %li', $genlist);
         break;
     case "접속 허용":
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set con=0 where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        }
+        $db->update('general',[
+            'con'=>0
+        ], '`no` IN %li', $genlist);
         break;
     case "접속 제한":
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set con=1000 where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        }
+        $db->update('general',[
+            'con'=>1000
+        ], '`no` IN %li', $genlist);
         break;
     case "메세지 전달":
-        //TODO:새 갠메 시스템으로 변경
-        $date = date('Y-m-d H:i:s');
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
+        $text = $msg;
+        foreach($genlist as $generalID){
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
         }
         break;
     case "무기지급":
-        $date = date('Y-m-d H:i:s');
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            if($weap == 0) { $msg = "무기 회수!"; }
-            else { $msg = getWeapName($weap)." 지급!"; }
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
+
+        if($weap == 0) {
+            $text = "무기 회수!";
         }
-        for($i=0; $i < count($genlist); $i++) {
-            if($weap == 0) {
-                $query = "update general set weap='0' where no='$genlist[$i]'";
-            } else {
-                $query = "update general set weap='$weap' where no='$genlist[$i]' and weap<'$weap'";
-            }
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        else { 
+            $text = getWeapName($weap)." 지급!"; 
+        }
+
+        foreach($genlist as $generalID){
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
+        }
+
+        if($weap == 0){
+            $db->update('general', [
+                'weap'=>0
+            ], '`no` IN %li', $genlist);
+        }
+        else{
+            $db->update('general', [
+                'weap'=>$weap
+            ], '`no` IN %li AND weap < %i', $genlist, $weap);
         }
         break;
     case "책지급":
-        $date = date('Y-m-d H:i:s');
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            if($weap == 0) { $msg = "서적 회수!"; }
-            else { $msg = getBookName($weap)." 지급!"; }
-            // 상대에게 발송
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
+        if($weap == 0) {
+            $text = "책 회수!";
         }
-        for($i=0; $i < count($genlist); $i++) {
-            if($weap == 0) {
-                $query = "update general set book='0' where no='$genlist[$i]'";
-            } else {
-                $query = "update general set book='$weap' where no='$genlist[$i]' and book<'$weap'";
-            }
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        else { 
+            $text = getBookName($weap)." 지급!"; 
+        }
+
+        foreach($genlist as $generalID){
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
+        }
+
+        if($weap == 0){
+            $db->update('general', [
+                'book'=>0
+            ], '`no` IN %li', $genlist);
+        }
+        else{
+            $db->update('general', [
+                'book'=>$weap
+            ], '`no` IN %li AND book < %i', $genlist, $weap);
         }
         break;
     case "말지급":
-        $date = date('Y-m-d H:i:s');
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            if($weap == 0) { $msg = "말 회수!"; }
-            else { $msg = getHorseName($weap)." 지급!"; }
-            // 상대에게 발송
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
+        if($weap == 0) {
+            $text = "말 회수!";
         }
-        for($i=0; $i < count($genlist); $i++) {
-            if($weap == 0) {
-                $query = "update general set horse='0' where no='$genlist[$i]'";
-            } else {
-                $query = "update general set horse='$weap' where no='$genlist[$i]' and horse<'$weap'";
-            }
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        else { 
+            $text = getHorseName($weap)." 지급!"; 
+        }
+
+        foreach($genlist as $generalID){
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
+        }
+
+        if($weap == 0){
+            $db->update('general', [
+                'horse'=>0
+            ], '`no` IN %li', $genlist);
+        }
+        else{
+            $db->update('general', [
+                'horse'=>$weap
+            ], '`no` IN %li AND horse < %i', $genlist, $weap);
         }
         break;
     case "도구지급":
-        $date = date('Y-m-d H:i:s');
-        for($i=0; $i < count($genlist); $i++) {
-            $you = DB::db()->queryFirstRow('select `no`, `nation` from `general` where `no` = %i', $genlist[$i]);
-            if($weap == 0) { $msg = "특수도구 회수!"; }
-            else { $msg = getItemName($weap)." 지급!"; }
-            // 상대에게 발송
-            sendMessage('private', ['id'=>$generalID, 'nation_id'=>0], ['id'=>$you['no'], 'nation_id'=>$you['nation']], $msg);
+        if($weap == 0) {
+            $text = "특수도구 회수!";
         }
-        for($i=0; $i < count($genlist); $i++) {
-            if($weap == 0) {
-                $query = "update general set item='0' where no='$genlist[$i]'";
-            } else {
-                $query = "update general set item='$weap' where no='$genlist[$i]' and item<'$weap'";
-            }
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        else { 
+            $text = getItemName($weap)." 지급!"; 
+        }
+
+        foreach($genlist as $generalID){
+            $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
+            $msg->send(true);
+        }
+
+        if($weap == 0){
+            $db->update('general', [
+                'item'=>0
+            ], '`no` IN %li', $genlist);
+        }
+        else{
+            $db->update('general', [
+                'item'=>$weap
+            ], '`no` IN %li AND item < %i', $genlist, $weap);
         }
         break;
     case "NPC해제":
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set npc=1 where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        }
+        $db->update('general', [
+            'npc'=>1
+        ], '`no` IN %li', $genlist);
         break;
     case "하야입력":
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set turn0='00000000000045' where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        }
+        $db->update('general', [
+            'turn0'=>'00000000000045'
+        ], '`no` IN %li', $genlist);
         break;
     case "방랑해산":
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set turn0='00000000000047',turn1='00000000000056' where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        }
+        $db->update('general', [
+            'turn0'=>'00000000000047',
+            'turn1'=>'00000000000056'
+        ], '`no` IN %li', $genlist);
         break;
     case "NPC설정":
-        for($i=0; $i < count($genlist); $i++) {
-            $query = "update general set npc=2 where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        }
+        $db->update('general', [
+            'npc'=>2
+        ], '`no` IN %li', $genlist);
         break;
     case "00턴":
-        $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;
 
-        for($i=0; $i < count($genlist); $i++) {
-            $turntime = getRandTurn($admin['turnterm']);
-            $cutTurn = cutTurn($turntime, $admin['turnterm']);
-            $query = "update general set turntime='$cutTurn' where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        foreach($genlist as $generalID){
+            $turntime = getRandTurn($turnterm);
+            $cutTurn = cutTurn($turntime, $turnterm);
+            $db->update('general', [
+                'turntime'=>$curTurn
+            ], '`no` IN %li', $genlist);
         }
         break;
     case "랜덤턴":
-        $query = "select turnterm from game limit 1";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $admin = MYDB_fetch_array($result);
-
-        for($i=0; $i < count($genlist); $i++) {
-            $turntime = getRandTurn($admin['turnterm']);
-            $query = "update general set turntime='$turntime' where no='$genlist[$i]'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        foreach($genlist as $generalID){
+            $turntime = getRandTurn($turnterm);
+            $db->update('general', [
+                'turntime'=>$turntime
+            ], '`no` IN %li', $genlist);
         }
         break;
 }

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/_admin4_submit.php

@@ -31,21 +31,21 @@ switch($btn) {
         $db->query('update general set block=1,killturn=24 where no IN %li',$genlist);
         //FIXME: subquery로 하는게 더 빠를 듯.
         $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
-        RootDB::db()->query('update MEMBER set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
+        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
         break;
     case "2단계 블럭":
         $date = date('Y-m-d H:i:s');
         $db = DB::db();
         $db->query('update general set block=2,killturn=24 where no IN %li',$genlist);
         $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
-        RootDB::db()->query('update MEMBER set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
+        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
         break;
     case "3단계 블럭":
         $date = date('Y-m-d H:i:s');
         $db = DB::db();
         $db->query('update general set block=3,killturn=24 where no IN %li',$genlist);
         $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
-        RootDB::db()->query('update MEMBER set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
+        RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
         break;
     case "무한삭턴":
         DB::db()->query('update general set killturn=8000 where no IN %li',$genlist);

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>";
@@ -1630,17 +1629,16 @@ if($isgen == "장수공격" || $isgen == "성벽공격") {
 </table>
 </form>
 </body>
-<?php PrintElapsedTime(); ?>
 </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();
@@ -36,17 +33,17 @@ if ($con >= 2) {
 
 <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'>
+<title><?=UniqueConst::$serverName?>: 명장일람</title>
+<?=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;
@@ -166,7 +164,7 @@ for ($i=0; $i < 21; $i++) {
             echo "<td align=center>&nbsp;</td>";
         } else {
             $imageTemp = GetImageURL($gen['imgsvr']);
-            echo "<td align=center><img width='64' height='64' src={$imageTemp}/{$pic[$k]}></img></td>";
+            echo "<td align=center><img width='64' height='64' src={$imageTemp}/{$pic[$k]}></td>";
         }
     }
 
@@ -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(
@@ -267,7 +265,7 @@ for ($i=0; $i < 4; $i++) {
             echo "<td align=center>&nbsp;</td>";
         } else {
             $imageTemp = GetImageURL($gen['imgsvr']??0);
-            echo "<td align=center> width='64' height='64' src={$imageTemp}/{$pic[$k]}></img></td>";
+            echo "<td align=center><img width='64' height='64' src={$imageTemp}/{$pic[$k]}></img></td>";
         }
     }
 
@@ -340,11 +338,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 

hwe/a_emperior.php

@@ -18,14 +18,14 @@ increaseRefresh("왕조일람", 2);
 
 <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'>
+<title><?=UniqueConst::$serverName?>: 왕조일람</title>
+<?=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,11 +197,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 

hwe/a_emperior2.php

@@ -18,14 +18,14 @@ increaseRefresh("왕조일람", 2);
 
 <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'>
+<title><?=UniqueConst::$serverName?>: 왕조일람</title>
+<?=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,11 +198,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 

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();
@@ -41,15 +38,16 @@ if ($type <= 0 || $type > 15) {
 
 <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'>
-<script type="text/javascript" src="../e_lib/jquery-3.2.1.min.js"></script>
+<title><?=UniqueConst::$serverName?>: 장수일람</title>
+<?=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>
@@ -164,7 +162,7 @@ for ($j=0; $j < $gencount; $j++) {
     $imageTemp = GetImageURL($general['imgsvr']);
     echo "
     <tr>
-        <td align=center> width='64' height='64' src={$imageTemp}/{$general['picture']}></img></td>
+        <td align=center><img width='64' height='64' src={$imageTemp}/{$general['picture']}></img></td>
         <td align=center>$name</td>
         <td align=center>{$general['age']}세</td>
         <td align=center>".getGenChar($general['personal'])."</td>
@@ -190,11 +188,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 <script type="text/javascript">
 $(document).ready(function() {
     $("#viewType").val("<?=$type?>").attr("selected", "selected");

hwe/a_hallOfFame.php

@@ -14,17 +14,17 @@ increaseRefresh("명예의전당", 2);
 
 <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'>
+<title><?=UniqueConst::$serverName?>: 명예의 전당</title>
+<?=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,11 +114,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 

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("연감", 5);
+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 map,con,turntime from general where owner='{$userID}'";
+$query = "select con,turntime from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if ($con >= 2) {
     printLimitMsg($me['turntime']);
     exit();
@@ -77,21 +76,21 @@ if ($month <= 0) {
 
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>연감</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>
+<title><?=UniqueConst::$serverName?>: 연감</title>
+<?=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>
@@ -159,6 +158,5 @@ reloadWorldMap({
     neutralView:true
 });
 </script>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>

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>
@@ -28,14 +25,14 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 
 <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'>
+<title><?=UniqueConst::$serverName?>: 세력일람</title>
+<?=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,11 +241,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 
 </html>

hwe/a_npcList.php

@@ -26,14 +26,14 @@ $sel[$type] = "selected";
 
 <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'>
+<title><?=UniqueConst::$serverName?>: 빙의일람</title>
+<?=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,11 +120,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 
 </html>

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 map,con,turntime from general where owner='{$userID}'";
+$query = "select con,turntime from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
 
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($me['con']);
 if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 ?>
 <!DOCTYPE html>
@@ -29,12 +26,12 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 <head>
 <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="../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>
+<title><?=UniqueConst::$serverName?>: 세력도</title>
+<?=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)?>
@@ -67,15 +64,14 @@ $(function(){
     </tr>
     <tr>
         <td colspan=2 valign=top>
-            <?php getWorldHistoryRecent(34); ?>
+            <?=getWorldHistoryRecent(34)?>
         </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>
-<?php PrintElapsedTime(); ?>
 </body>
 
 </html>

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);
 
@@ -22,249 +21,174 @@ $refresh = [];
 $online = [];
 
 $curonline = getOnlineNum();
-$visibleLogs = min(11, count($log));
-for ($i=0; $i < $visibleLogs; $i++) {
-    $parse = explode("|", $log[count($log)-$visibleLogs+$i]);
-    $date[$i]    = trim($parse[0]);
-    $year[$i]    = trim($parse[1]);
-    $month[$i]   = trim($parse[2]);
-    $refresh[$i] = trim($parse[3]);
-    $online[$i]  = trim($parse[4]);
+foreach($log as $i=>$value){
+    $parse = Json::decode($value);
+    $date[$i]    = $parse[0];
+    $year[$i]    = $parse[1];
+    $month[$i]   = $parse[2];
+    $refresh[$i] = $parse[3];
+    $online[$i]  = $parse[4];
 }
-if ($game['maxrefresh'] == 0) {
-    $game['maxrefresh'] = 1;
+$year[] = $game_env['year'];
+$month[] = $game_env['month'];
+$date[] = date('Y-m-d H:i:s');
+
+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>
 <html>
 <head>
-<title>트래픽정보</title>
+<title><?=UniqueConst::$serverName?>: 트래픽정보</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=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
-for ($i=0; $i < $visibleLogs; $i++) {
-    $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
-for ($i=0; $i < $visibleLogs; $i++) {
-    $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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 
@@ -274,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] == "") {
@@ -28,10 +27,19 @@ if ($vote[0] == "") {
 <!DOCTYPE html>
 <html>
 <head>
-<title>설문조사</title>
+<title><?=UniqueConst::$serverName?>: 설문조사</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=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,27 +201,22 @@ 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 = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
-    if ($memCount == 0) {
-        $memCount = 1;
-    }
+    $memCount = max(1, $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2'));
 
     $totalVote = [];
-    $nationVoteCount = [[0]];
-    $nationVote = [[]];
+    $nationVoteCount = [];
+    $nationVote = [];
 
     foreach ($db->query("SELECT nation, vote, count(`no`) as cnt FROM general WHERE npc<2 GROUP BY nation, vote") as $row) {
         $nation = $row['nation'];
-        $vote = $row['vote'];
+        $ownVote = $row['vote'];
         $cnt = $row['cnt'];
 
-        if (!isset($totalVote[$vote])) {
-            $totalVote[$vote] = 0;
+        if (!isset($totalVote[$ownVote])) {
+            $totalVote[$ownVote] = 0;
         }
 
         if (!isset($nationVoteCount[$nation])) {
@@ -221,26 +224,29 @@ if ($admin['voteopen'] >= 1 || $session->userGrade >= 5) {
             $nationVote[$nation] = [];
         }
 
-        if (!isset($nationVote[$nation][$vote])) {
-            $nationVote[$nation][$vote] = 0;
+        if (!isset($nationVote[$nation][$ownVote])) {
+            $nationVote[$nation][$ownVote] = 0;
         }
 
-        $totalVote[$vote] += $cnt;
+        $totalVote[$ownVote] += $cnt;
         $nationVoteCount[$nation] += $cnt;
-        $nationVote[$nation][$vote] += $cnt;
+        $nationVote[$nation][$ownVote] += $cnt;
     }
 
     for ($i=0; $i < $voteTypeCount; $i++) {
-        $per = round(($totalVote[$i]??0) / $memCount * 100, 1);
+        $per = round(($totalVote[$i]??0) * 100 / $memCount, 1);
 //        if($per < 5) { $vote['cnt'] = "&nbsp;"; }
-        echo "
-                    <td width={$per}% align=center style=color:".getNewColor($i)."; bgcolor=".getVoteColor($i).">{$totalVote[$i]}</td>
-        ";
+?>
+        <?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>
     ";
@@ -263,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>
     ";
@@ -293,29 +300,38 @@ if ($admin['voteopen'] >= 2 || $session->userGrade >= 5) {
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
         $memCount = MYDB_num_rows($result);
 
+        
+
         $voteCount = $nationVoteCount[$nation['nation']] ?? 0;
-        $percentage = round($voteCount / $memCount * 100, 1);
+        if($memCount == 0){
+            $percentage = 100;
+        }
+        else{
+            $percentage = round($voteCount / $memCount * 100, 1);
+        }
+        
 
         echo "
     <tr>
         <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>
         ";
@@ -324,11 +340,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 

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();
@@ -58,18 +55,17 @@ if ($msg2 == "") {
 <!DOCTYPE html>
 <html>
 <head>
-<title>거래장</title>
+<title><?=UniqueConst::$serverName?>: 거래장</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
-
+<?=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)?>
@@ -299,6 +295,5 @@ for ($i=0; $i < $count; $i++) {
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>

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();
@@ -75,15 +73,15 @@ $sel[$type] = "selected";
 <html>
 
 <head>
-<title>감찰부</title>
+<title><?=UniqueConst::$serverName?>: 감찰부</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=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>
@@ -100,20 +98,23 @@ $sel[$type] = "selected";
 <?php
 switch ($type) {
     default:
-    case 0: $query = "select no,name from general where nation='{$me['nation']}' order by turntime desc"; break;
-    case 1: $query = "select no,name from general where nation='{$me['nation']}' order by recwar desc"; break;
-    case 2: $query = "select no,name from general where nation='{$me['nation']}' order by npc,binary(name)"; break;
-    case 3: $query = "select no,name from general where nation='{$me['nation']}' order by warnum desc"; break;
+    case 0: $query = "select no,name,npc from general where nation='{$me['nation']}' order by turntime desc"; break;
+    case 1: $query = "select no,name,npc from general where nation='{$me['nation']}' order by recwar desc"; break;
+    case 2: $query = "select no,name,npc from general where nation='{$me['nation']}' order by npc,binary(name)"; break;
+    case 3: $query = "select no,name,npc from general where nation='{$me['nation']}' order by warnum desc"; break;
 }
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $gencount = MYDB_num_rows($result);
-
+$npc = 0;
 for ($i=0; $i < $gencount; $i++) {
     $general = MYDB_fetch_array($result);
     // 선택 없으면 맨 처음 장수
     if ($gen == 0) {
         $gen = $general['no'];
     }
+	if($gen == $general['no']){
+		$npc = $general['npc'];
+	}
     if ($gen == $general['no']) {
         echo "
             <option selected value={$general['no']}>{$general['name']}</option>";
@@ -128,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>
@@ -153,11 +154,23 @@ for ($i=0; $i < $gencount; $i++) {
             <?=getBatResRecent($gen, 24)?>
         </td>
     </tr>
+<?php if($npc > 1): ?>
+    <tr>
+        <td align=center id=bg1><font color=orange size=3>개인 기록</font></td>
+        <td align=center id=bg1><font color=orange size=3>&nbsp;</font></td>
+    </tr>
+    <tr>
+        <td valign=top>
+            <?=getGenLogRecent($gen, 24)?>
+        </td>
+        <td valign=top>
+        </td>
+    </tr>
+<?php endif; ?>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>

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();
@@ -37,7 +40,13 @@ case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "itl"; $tp2 = "
 
 $str1 = getTournament($admin['tournament']);
 $str2 = getTournamentTime();
+if($str2){
+    $str2 = ', '.$str2;
+}
 $str3 = getTournamentTerm();
+if($str3){
+    $str3 = ', '.$str3;
+}
 
 ?>
 <!DOCTYPE html>
@@ -47,37 +56,32 @@ $str3 = getTournamentTerm();
 } ?>
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>베팅장</title>
-<style>
-body { color:white; background-color:black; border-width:1px; border-color:gray; }
-table { font-family:'맑은 고딕'; line-height:110%; }
-font { font-family:'맑은 고딕'; line-height:110%; }
-input { font-family:'맑은 고딕'; line-height:110%; height:20px }
-select { font-family:'굴림'; line-height:100%; }
-#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>
-
+<title><?=UniqueConst::$serverName?>: 베팅장</title>
+<?=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 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
 $query = "select npc,name,win from tournament where grp>=60 order by grp, grp_no";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 for ($i=0; $i < 1; $i++) {
-    $general = MYDB_fetch_array($result);
+    $general = MYDB_fetch_array($result)??[
+        'npc'=>0,
+        'name'=>'',
+        'win'=>0
+    ];
     if ($general['name'] == "") {
         $general['name'] = "-";
     }
@@ -102,7 +106,11 @@ for ($i=0; $i < 1; $i++) {
     $cent[$i] = "<font color=white>";
 }
 for ($i=0; $i < 2; $i++) {
-    $general = MYDB_fetch_array($result);
+    $general = MYDB_fetch_array($result)??[
+        'npc'=>0,
+        'name'=>'',
+        'win'=>0
+    ];
     if ($general['name'] == "") {
         $general['name'] = "-";
     }
@@ -143,7 +151,11 @@ for ($i=0; $i < 2; $i++) {
     $cent[$i] = "<font color=white>";
 }
 for ($i=0; $i < 4; $i++) {
-    $general = MYDB_fetch_array($result);
+    $general = MYDB_fetch_array($result)??[
+        'npc'=>0,
+        'name'=>'',
+        'win'=>0
+    ];
     if ($general['name'] == "") {
         $general['name'] = "-";
     }
@@ -184,7 +196,11 @@ for ($i=0; $i < 4; $i++) {
     $cent[$i] = "<font color=white>";
 }
 for ($i=0; $i < 8; $i++) {
-    $general = MYDB_fetch_array($result);
+    $general = MYDB_fetch_array($result)??[
+        'npc'=>0,
+        'name'=>'',
+        'win'=>0
+    ];
     if ($general['name'] == "") {
         $general['name'] = "-";
     }
@@ -225,7 +241,11 @@ for ($i=0; $i < 8; $i++) {
     $cent[$i] = "<font color=white>";
 }
 for ($i=0; $i < 16; $i++) {
-    $general = MYDB_fetch_array($result);
+    $general = MYDB_fetch_array($result)??[
+        'npc'=>0,
+        'name'=>'',
+        'win'=>0
+    ];
     if ($general['name'] == "") {
         $general['name'] = "-";
     }
@@ -268,10 +288,12 @@ for ($i=0; $i < 16; $i++) {
 }
 
 for ($i=0; $i < 16; $i++) {
-    $bet[$i]  = @round($admin['bet'] /  $admin["bet{$i}"], 2);
-    if ($bet[$i] == 0) {
+    if($admin["bet{$i}"] == 0){
         $bet[$i] = "∞";
     }
+    else{
+        $bet[$i]  = round($admin['bet'] /  $admin["bet{$i}"], 2);
+    }
 }
 
 for ($i=0; $i < 16; $i++) {
@@ -280,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 "
@@ -359,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>
@@ -374,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>";
 
@@ -401,10 +423,9 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>

hwe/b_chiefboard.php

@@ -25,15 +25,15 @@ if($me['level'] < 5) {
 <!DOCTYPE html>
 <html>
 <head>
-<title>기밀실</title>
+<title><?=UniqueConst::$serverName?>: 기밀실</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=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,11 +65,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 

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,
@@ -58,13 +53,24 @@ $nation = MYDB_fetch_array($result);
 
 $lv = getNationChiefLevel($nation['level']);
 $turn = [];
-$gen = [];
+
 for($i=12; $i >= $lv; $i--) {
     $turn[$i] = getCoreTurn($nation, $i);
 
     $query = "select name,turntime,npc from general where level={$i} and nation='{$me['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gen[$i] = MYDB_fetch_array($result);
+    $gen[$i] = MYDB_fetch_array($result)??[
+        'npc'=>0,
+        'name'=>'',
+        'turntime'=>''
+    ];
+}
+for($i= $lv - 1; $i>=5; $i--){
+    $gen[$i] = [
+        'npc'=>0,
+        'name'=>'',
+        'turntime'=>''
+    ];
 }
 
 ?>
@@ -72,9 +78,9 @@ for($i=12; $i >= $lv; $i--) {
 <html>
 <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'>
+<title><?=UniqueConst::$serverName?>: 사령부</title>
+<?=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');
@@ -85,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
@@ -105,35 +111,27 @@ for($i=12; $i >= $lv; $i--) {
     $turntime[$i] = substr($gen[$i]['turntime'], 14);
 }
 
-
 //FIXME: 각 칸을 div로 놓으면 네개씩 출력하는 삽질이 필요없다.
 
 for($k=0; $k < 2; $k++) {
     $l4 = 12 - $k;  $l3 = 10 - $k;  $l2 =  8 - $k;  $l1 =  6 - $k;
 
-    if(!isset($gen[$l4])){
-        $gen[$l4] = [
-            'npc'=>0,
-            'name'=>0
-        ];
-    }
-
-    if    ($gen[$l4]['npc'] >= 2) { $gen[$l4]['name'] = "<font color=cyan>".$gen[$l4]['name']."</font>"; }
-    elseif($gen[$l4]['npc'] == 1) { $gen[$l4]['name'] = "<font color=skyblue>".$gen[$l4]['name']."</font>"; }
-    if    ($gen[$l3]['npc'] >= 2) { $gen[$l3]['name'] = "<font color=cyan>".$gen[$l3]['name']."</font>"; }
-    elseif($gen[$l3]['npc'] == 1) { $gen[$l3]['name'] = "<font color=skyblue>".$gen[$l3]['name']."</font>"; }
-    if    ($gen[$l2]['npc'] >= 2) { $gen[$l2]['name'] = "<font color=cyan>".$gen[$l2]['name']."</font>"; }
-    elseif($gen[$l2]['npc'] == 1) { $gen[$l2]['name'] = "<font color=skyblue>".$gen[$l2]['name']."</font>"; }
-    if    ($gen[$l1]['npc'] >= 2) { $gen[$l1]['name'] = "<font color=cyan>".$gen[$l1]['name']."</font>"; }
-    elseif($gen[$l1]['npc'] == 1) { $gen[$l1]['name'] = "<font color=skyblue>".$gen[$l1]['name']."</font>"; }
+    if    ($gen[$l4]['npc'] >= 2) { $gen[$l4]['name'] = "<font color=cyan>".($gen[$l4]['name']??'')."</font>"; }
+    elseif($gen[$l4]['npc'] == 1) { $gen[$l4]['name'] = "<font color=skyblue>".($gen[$l4]['name']??'')."</font>"; }
+    if    ($gen[$l3]['npc'] >= 2) { $gen[$l3]['name'] = "<font color=cyan>".($gen[$l3]['name']??'')."</font>"; }
+    elseif($gen[$l3]['npc'] == 1) { $gen[$l3]['name'] = "<font color=skyblue>".($gen[$l3]['name']??'')."</font>"; }
+    if    ($gen[$l2]['npc'] >= 2) { $gen[$l2]['name'] = "<font color=cyan>".($gen[$l2]['name']??'')."</font>"; }
+    elseif($gen[$l2]['npc'] == 1) { $gen[$l2]['name'] = "<font color=skyblue>".($gen[$l2]['name']??'')."</font>"; }
+    if    ($gen[$l1]['npc'] >= 2) { $gen[$l1]['name'] = "<font color=cyan>".($gen[$l1]['name']??'')."</font>"; }
+    elseif($gen[$l1]['npc'] == 1) { $gen[$l1]['name'] = "<font color=skyblue>".($gen[$l1]['name']??'')."</font>"; }
 
     echo "
     <tr>
         <td align=center id=bg1>.</td>
-        <td colspan=2 align=center id=bg1><b>".getLevel($l4, $nation['level'])." : {$gen[$l4]['name']}</b></td>
-        <td colspan=2 align=center id=bg1><b>".getLevel($l3, $nation['level'])." : {$gen[$l3]['name']}</b></td>
-        <td colspan=2 align=center id=bg1><b>".getLevel($l2, $nation['level'])." : {$gen[$l2]['name']}</b></td>
-        <td colspan=2 align=center id=bg1><b>".getLevel($l1, $nation['level'])." : {$gen[$l1]['name']}</b></td>
+        <td colspan=2 align=center id=bg1><b>".getLevel($l4, $nation['level'])." : ".($gen[$l4]['name']??'')."</b></td>
+        <td colspan=2 align=center id=bg1><b>".getLevel($l3, $nation['level'])." : ".($gen[$l3]['name']??'')."</b></td>
+        <td colspan=2 align=center id=bg1><b>".getLevel($l2, $nation['level'])." : ".($gen[$l2]['name']??'')."</b></td>
+        <td colspan=2 align=center id=bg1><b>".getLevel($l1, $nation['level'])." : ".($gen[$l1]['name']??'')."</b></td>
         <td align=center id=bg1>.</td>
     </tr>
     ";
@@ -144,14 +142,14 @@ for($k=0; $k < 2; $k++) {
         $turndate[$l2] = substr($totaldate[$l2]??'', 11, 5);
         $turndate[$l1] = substr($totaldate[$l1]??'', 11, 5);
         $j = $i + 1;
-        $td4 = $turndate[$l4] ?: "-";
-        $td3 = $turndate[$l3] ?: "-";
-        $td2 = $turndate[$l2] ?: "-";
-        $td1 = $turndate[$l1] ?: "-";
-        $tn4 = $turn[$l4][$i] ?? "-";
-        $tn3 = $turn[$l3][$i] ?? "-";
-        $tn2 = $turn[$l2][$i] ?? "-";
-        $tn1 = $turn[$l1][$i] ?? "-";
+        $td4 = $turndate[$l4]??"-";
+        $td3 = $turndate[$l3]??"-";
+        $td2 = $turndate[$l2]??"-";
+        $td1 = $turndate[$l1]??"-";
+        $tn4 = $turn[$l4][$i]??"-";
+        $tn3 = $turn[$l3][$i]??"-";
+        $tn2 = $turn[$l2][$i]??"-";
+        $tn1 = $turn[$l1][$i]??"-";
         echo "
     <tr>
         <td width=28  align=center id=bg0><b>$j</b></td>
@@ -166,10 +164,10 @@ for($k=0; $k < 2; $k++) {
         <td width=28  align=center id=bg0><b>$j</b></td>
     </tr>
         ";
-        if($totaldate[$l4] != "") { $totaldate[$l4] = addTurn($totaldate[$l4], $admin['turnterm']); }
-        if($totaldate[$l3] != "") { $totaldate[$l3] = addTurn($totaldate[$l3], $admin['turnterm']); }
-        if($totaldate[$l2] != "") { $totaldate[$l2] = addTurn($totaldate[$l2], $admin['turnterm']); }
-        if($totaldate[$l1] != "") { $totaldate[$l1] = addTurn($totaldate[$l1], $admin['turnterm']); }
+        if($totaldate[$l4]??'') { $totaldate[$l4] = addTurn($totaldate[$l4], $admin['turnterm']); }
+        if($totaldate[$l3]??'') { $totaldate[$l3] = addTurn($totaldate[$l3], $admin['turnterm']); }
+        if($totaldate[$l2]??'') { $totaldate[$l2] = addTurn($totaldate[$l2], $admin['turnterm']); }
+        if($totaldate[$l1]??'') { $totaldate[$l1] = addTurn($totaldate[$l1], $admin['turnterm']); }
     }
     if($k == 0) {
         echo "<form action=processing.php method=post><tr><td colspan=5 align=right>";
@@ -185,11 +183,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 

hwe/b_currentCity.php

@@ -25,23 +25,39 @@ $query = "select nation,level,spy from nation where nation='{$me['nation']}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $myNation = MYDB_fetch_array($result);
 
+$templates = new \League\Plates\Engine('templates');
+
 ?>
 <!DOCTYPE html>
 <html>
 
 <head>
-<title>도시정보</title>
+<title><?=UniqueConst::$serverName?>: 도시정보</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<style>
+#general_list tr td{
+    text-align:center;
+}
 
+#general_list tr td:last-child{
+    text-align:left;
+    padding-left:1em;
+}
+
+.general_turn_text{
+    font-size:x-small;
+}
+</style>
 </head>
 
 <body>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 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=998>
             <form name=cityselect method=get>도시선택 :
@@ -159,44 +175,44 @@ if($city['trade'] == 0) {
 }
 ?>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 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; id=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>
     <tr>
-        <td align=center width=48 id=bg1>주민</td>
+        <td align=center width=48 class=bg1>주민</td>
         <td align=center width=112><?=$city['pop']?>/<?=$city['pop2']?></td>
-        <td align=center width=48 id=bg1>농업</td>
+        <td align=center width=48 class=bg1>농업</td>
         <td align=center width=108><?=$city['agri']?>/<?=$city['agri2']?></td>
-        <td align=center width=48 id=bg1>상업</td>
+        <td align=center width=48 class=bg1>상업</td>
         <td align=center width=108><?=$city['comm']?>/<?=$city['comm2']?></td>
-        <td align=center width=48 id=bg1>치안</td>
+        <td align=center width=48 class=bg1>치안</td>
         <td align=center width=108><?=$city['secu']?>/<?=$city['secu2']?></td>
-        <td align=center width=48 id=bg1>수비</td>
+        <td align=center width=48 class=bg1>수비</td>
         <td align=center width=108><?=$city['def']?>/<?=$city['def2']?></td>
-        <td align=center width=48 id=bg1>성벽</td>
+        <td align=center width=48 class=bg1>성벽</td>
         <td align=center width=108><?=$city['wall']?>/<?=$city['wall2']?></td>
     </tr>
     <tr>
-        <td align=center id=bg1>민심</td>
+        <td align=center class=bg1>민심</td>
         <td align=center><?=$city['rate']?></td>
-        <td align=center id=bg1>시세</td>
+        <td align=center class=bg1>시세</td>
         <td align=center><?=$city['trade']?>%</td>
-        <td align=center id=bg1>인구</td>
+        <td align=center class=bg1>인구</td>
         <td align=center><?=round($city['pop']/$city['pop2']*100, 2)?>%</td>
-        <td align=center id=bg1>태수</td>
+        <td align=center class=bg1>태수</td>
         <td align=center><?=$gen1['name']??'-'?></td>
-        <td align=center id=bg1>군사</td>
+        <td align=center class=bg1>군사</td>
         <td align=center><?=$gen2['name']??'-'?></td>
-        <td align=center id=bg1>시중</td>
+        <td align=center class=bg1>시중</td>
         <td align=center><?=$gen3['name']??'-'?></td>
     </tr>
     <tr>
-        <td align=center id=bg1>장수</td>
+        <td align=center class=bg1>장수</td>
         <td colspan=11>
 <?php
     $query = "select name, npc from general where city='{$city['city']}' and nation='{$city['nation']}'";    // 장수 목록
@@ -211,6 +227,26 @@ if($city['trade'] == 0) {
         </td>
     </tr>
 </table>
+
+
+<br>
+<table align=center class='tb_layout bg0'>
+<thead>
+    <tr>
+        <td width=64 align=center class=bg1>얼 굴</td>
+        <td width=98 align=center class=bg1>이 름</td>
+        <td width=48 align=center class=bg1>통솔</td>
+        <td width=48 align=center class=bg1>무력</td>
+        <td width=48 align=center class=bg1>지력</td>
+        <td width=78 align=center class=bg1>관 직</td>
+        <td width=28 align=center class=bg1>守</td>
+        <td width=78 align=center class=bg1>병 종</td>
+        <td width=78 align=center class=bg1>병 사</td>
+        <td width=48 align=center class=bg1>훈련</td>
+        <td width=48 align=center class=bg1>사기</td>
+        <td width=310 align=center class=bg1>명 령</td>
+    </tr></thead><tbody class='bg0' id='general_list'>
+
 <?php
 $query = "select npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level,nation,crewtype,crew,train,atmos,term,turn0,turn1,turn2,turn3,turn4,turn5 from general where city='{$city['city']}' order by dedication desc";    // 장수 목록
 $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -223,127 +259,116 @@ foreach(getAllNationStaticInfo() as $nation){
     $nationlevel[$nation['nation']] = $nation['level'];
 }
 
-if($gencount != 0) {
-    echo "
-<br>
-<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-    <tr>
-        <td width=64 align=center id=bg1>얼 굴</td>
-        <td width=98 align=center id=bg1>이 름</td>
-        <td width=48 align=center id=bg1>통솔</td>
-        <td width=48 align=center id=bg1>무력</td>
-        <td width=48 align=center id=bg1>지력</td>
-        <td width=78 align=center id=bg1>관 직</td>
-        <td width=28 align=center id=bg1>守</td>
-        <td width=78 align=center id=bg1>병 종</td>
-        <td width=78 align=center id=bg1>병 사</td>
-        <td width=48 align=center id=bg1>훈련</td>
-        <td width=48 align=center id=bg1>사기</td>
-        <td width=310 align=center id=bg1>명 령</td>
-    </tr>";
-}
 
 for($j=0; $j < $gencount; $j++) {
     $general = MYDB_fetch_array($genresult);
 
+    $nationInfo = getNationStaticInfo($general['nation']);
+
+    if($general['nation'] != 0 && $general['nation'] == $myNation['nation']){
+        $ourGeneral = true;
+    }
+    else{
+        $ourGeneral = false;
+    }
+
+    $isNPC = $general['npc']>1;
+    $wounded = $general['injury'];
+    
+
+    $name = $general['name'];
+    $nameText = formatName($name, $general['npc']);
+
+    $leadership = $general['leader'];
+    $power = $general['power'];
+    $intel = $general['intel'];
+
+    $leadershipText = formatWounded($leadership, $general['injury']);
+    $powerText = formatWounded($power, $general['injury']);
+    $intelText = formatWounded($intel, $general['injury']);
+
+    $level = $general['level'];
+    $levelText = getLevel($general['level']);
+
     if($general['level'] == 12) {
-        $lbonus = $nationlevel[$general['nation']] * 2;
+        $leadershipBonus = $nationInfo['level'] * 2;
     } elseif($general['level'] >= 5) {
-        $lbonus = $nationlevel[$general['nation']];
+        $leadershipBonus = $nationInfo['level'];
     } else {
-        $lbonus = 0;
+        $leadershipBonus = 0;
     }
-    if($lbonus > 0) {
-        $lbonus = "<font color=cyan>+{$lbonus}</font>";
-    } else {
-        $lbonus = "";
+    $leadershipBonusText = formatLeadershipBonus($leadershipBonus);
+
+    if($ourGeneral){
+        $defenceMode = $general['mode'];
+        $defenceModeText = formatDefenceMode($defenceMode);
+        $crewType = $general['crewtype'];
+        $crewTypeText = GameUnitConst::byId($crewType)->name;
+        $crew = $general['crew'];
+        $train = $general['train'];
+        $atmos = $general['atmos'];
+    }
+    else{
+        $defenceMode = 0;
+        $defenceModeText = '';
+        $crewType = 0;
+        $crewTypeText = '';
+        $crew = $general['crew'];
+        $train = -1;
+        $atmos = -1;
     }
 
-    if($general['injury'] > 0) {
-        $leader = intdiv($general['leader'] * (100 - $general['injury']), 100);
-        $power = intdiv($general['power'] * (100 - $general['injury']), 100);
-        $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
-        $leader = "<font color=red>{$leader}</font>{$lbonus}";
-        $power = "<font color=red>{$power}</font>";
-        $intel = "<font color=red>{$intel}</font>";
-    } else {
-        $leader = "{$general['leader']}{$lbonus}";
-        $power = "{$general['power']}";
-        $intel = "{$general['intel']}";
-    }
+    $nation = $general['nation'];
+    $nationName = $nationInfo['name'];
 
-    if($general['npc'] >= 2) { $general['name'] = "<font color=cyan>{$general['name']}</font>"; }
-    elseif($general['npc'] == 1) { $general['name'] = "<font color=skyblue>{$general['name']}</font>"; }
-    $imageTemp = GetImageURL($general['imgsvr']);
-    echo "
-    <tr>
-        <td align=center height=64></td>
-        <td align=center>{$general['name']}</td>
-        <td align=center>$leader</td>
-        <td align=center>$power</td>
-        <td align=center>$intel</td>
-        <td align=center>".getLevel($general['level'])."</td>";
-    //아국장수이거나 보는 사람이 운영자일때 보여줌
-    if(($general['nation'] != 0 && $general['nation'] == $myNation['nation']) || $session->userGrade >= 5) {
-        switch($general['mode']) {
-        case 0: $mode = "×"; break;
-        case 1: $mode = "○"; break;
-        case 2: $mode = "◎"; break;
+    if($ourGeneral && !$isNPC){
+        $turnText = [];
+        foreach(getTurn($general, 1) as $turnRawIdx=>$turn){
+            $turnIdx = $turnRawIdx+1;
+            $turnText[] = "{$turnIdx} : $turn";
         }
-
-        echo "
-        <td align=center>$mode</td>
-        <td align=center>".GameUnitConst::byId($general['crewtype'])->name."</td>
-        <td align=center>{$general['crew']}</td>
-        <td align=center>{$general['train']}</td>
-        <td align=center>{$general['atmos']}</td>";
-        if($general['npc'] >= 2) {
-            echo "
-        <td>NPC 장수";
-        } else {
-            echo "
-        <td>
-            <font size=1>";
-            $turn = getTurn($general, 1);
-
-            for($i=0; $i < 4; $i++) {
-                $k = $i+1;
-                echo "
-                    &nbsp;&nbsp;$k : $turn[$i]<br>";
-            }
-            echo "
-            </font>";
-        }
-    } elseif($general['nation'] != 0) {
-        echo "
-        <td align=center>?</td>
-        <td align=center>?</td>
-        <td align=center>{$general['crew']}</td>
-        <td align=center>?</td>
-        <td align=center>?</td>
-        <td>【{$nationname[$general['nation']]}】 장수";
-    } else {
-        echo "
-        <td align=center>?</td>
-        <td align=center>?</td>
-        <td align=center>{$general['crew']}</td>
-        <td align=center>?</td>
-        <td align=center>?</td>
-        <td>&nbsp; 재 야";
+        $turnText = join('<br>', $turnText);
     }
-
-    echo "
-        </td>
-    </tr>";
+    else{
+        $turnText = '';
+    }
+    
+    echo $templates->render('cityGeneral', [
+        'ourGeneral'=>$ourGeneral,
+        'isNPC'=>$isNPC,
+        'wounded'=>$wounded,
+        'name'=>$name,
+        'nameText'=>$nameText,
+        'leadership'=>$leadership,
+        'leadershipText'=>$leadershipText,
+        'leadershipBonus'=>$leadershipBonus,
+        'leadershipBonusText'=>$leadershipBonusText,
+        'level'=>$level,
+        'levelText'=>$levelText,
+        'power'=>$power,
+        'powerText'=>$powerText,
+        'intel'=>$intel,
+        'intelText'=>$intelText,
+        'defenceMode'=>$defenceMode,
+        'defenceModeText'=>$defenceModeText,
+        'crewType'=>$crewType,
+        'crewTypeText'=>$crewTypeText,
+        'crew'=>$crew,
+        'train'=>$train,
+        'atmos'=>$atmos,
+        'nation'=>$nation,
+        'nationName'=>$nationName,
+        'turnText'=>$turnText
+    ]);
 }
 ?>
+</tbody>
 </table>
 
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 

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();
@@ -48,32 +45,30 @@ if ($me['level'] >= 5) {
 <html>
 <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'>
+<title><?=UniqueConst::$serverName?>: 내무부</title>
+<?=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 colspan=9 align=center bgcolor=blue>외 교 관 계</td></tr>
     <tr>
-        <td width=100 align=center id=bg1>국 가 명</td>
-        <td width=50  align=center id=bg1>국력</td>
-        <td width=40  align=center id=bg1>장수</td>
-        <td width=40  align=center id=bg1>속령</td>
-        <td width=80  align=center id=bg1>상태</td>
-        <td width=60  align=center id=bg1>기간</td>
-        <td width=100 align=center id=bg1>종 료 시 점</td>
-        <td align=center id=bg1>비 고</td>
+        <td width=100 align=center class=bg1>국 가 명</td>
+        <td width=50  align=center class=bg1>국력</td>
+        <td width=40  align=center class=bg1>장수</td>
+        <td width=40  align=center class=bg1>속령</td>
+        <td width=80  align=center class=bg1>상태</td>
+        <td width=60  align=center class=bg1>기간</td>
+        <td width=100 align=center class=bg1>종 료 시 점</td>
+        <td align=center class=bg1>비 고</td>
     </tr>
 <?php
-$query = "select year,month from game limit 1";
-$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,65 +213,62 @@ if ($budgetricediff > 0) {
 }
 
 ?>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 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>
-    <tr><td colspan=2 id=bg1>국가 방침 <input type=text <?=$read?> maxlength=500 style=color:white;background-color:black;width:830px; name=msg value='<?=$nation['msg']?>'><input type=<?=$btn?> name=btn value=국가방침></td></tr>
-    <tr><td colspan=2 id=bg1>임관 권유 <input type=text <?=$read?> maxlength=500 style=color:white;background-color:black;width:830px; name=scoutmsg value='<?=$nation['scoutmsg']?>'><input type=<?=$btn?> name=btn value=임관권유></td></tr>
+    <tr><td colspan=2 class=bg1>국가 방침 <textarea <?=$read?> maxlength=1000 rows="5" style="color:white;background-color:black;width:830px;" name=msg><?=$nation['msg']?></textarea><input type=<?=$btn?> name=btn value=국가방침></td></tr>
+    <tr><td colspan=2 class=bg1>임관 권유 <input type=text <?=$read?> maxlength=500 style=color:white;background-color:black;width:830px; name=scoutmsg value='<?=$nation['scoutmsg']?>'><input type=<?=$btn?> name=btn value=임관권유></td></tr>
     <tr><td colspan=2>900 x 200px 넘는 크기를 점유할 시 통보없이 제한될 수 있습니다.</td></tr>
     <tr><td colspan=2 height=10></td></tr>
     <tr><td colspan=2 align=center bgcolor=green>예 산 &amp; 정 책</td></tr>
     <tr>
         <td colspan=2>
-            <table width=998 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
-<?php
-echo "
+            <table width=998 class='tb_layout bg0'>
                 <tr>
-                    <td colspan=2 align=center id=bg1>자금 예산</td>
-                    <td colspan=2 align=center id=bg1>병량 예산</td>
+                    <td colspan=2 align=center class=bg1>자금 예산</td>
+                    <td colspan=2 align=center class=bg1>병량 예산</td>
                 </tr>
                 <tr>
-                    <td width=248 align=right id=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
-                    <td width=248 align=center>{$nation['gold']}</td>
-                    <td width=248 align=right id=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
-                    <td width=248 align=center>{$nation['rice']}</td>
+                    <td width=248 align=right class=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
+                    <td width=248 align=center><?=$nation['gold']?></td>
+                    <td width=248 align=right class=bg1>현 재&nbsp;&nbsp;&nbsp;</td>
+                    <td width=248 align=center><?=$nation['rice']?></td>
                 </tr>
                 <tr>
-                    <td align=right id=bg1>단기수입&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$deadIncome</td>
-                    <td align=right id=bg1>둔전수입&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$riceincomeList[1]</td>
+                    <td align=right class=bg1>단기수입&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center>+<?=$deadIncome?></td>
+                    <td align=right class=bg1>둔전수입&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center>+<?=$riceincomeList[1]?></td>
                 </tr>
                 <tr>
-                    <td align=right id=bg1>세 금&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$goldincomeList[0]</td>
-                    <td align=right id=bg1>세 곡&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$riceincomeList[0]</td>
+                    <td align=right class=bg1>세 금&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center>+<?=$goldincomeList[0]?></td>
+                    <td align=right class=bg1>세 곡&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center>+<?=$riceincomeList[0]?></td>
                 </tr>
                 <tr>
-                    <td align=right id=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$goldincome / -$goldoutcome</td>
-                    <td align=right id=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>+$riceincome / -$riceoutcome</td>
+                    <td align=right class=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center>+<?=$goldincome?> / -<?=$goldoutcome?></td>
+                    <td align=right class=bg1>수입 / 지출&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center>+<?=$riceincome?> / -<?=$riceoutcome?></td>
                 </tr>
                 <tr>
-                    <td align=right id=bg1>국고 예산&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>{$budgetgold} ({$budgetgolddiff})</td>
-                    <td align=right id=bg1>병량 예산&nbsp;&nbsp;&nbsp;</td>
-                    <td align=center>{$budgetrice} ({$budgetricediff})</td>
-                </tr>";
-?>
+                    <td align=right class=bg1>국고 예산&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center><?=$budgetgold?> (<?=$budgetgolddiff?>)</td>
+                    <td align=right class=bg1>병량 예산&nbsp;&nbsp;&nbsp;</td>
+                    <td align=center><?=$budgetrice?> (<?=$budgetricediff?>)</td>
+                </tr>
                 <tr>
-                    <td align=right id=bg1>세율 (5 ~ 30%)&nbsp;&nbsp;&nbsp;</td>
+                    <td align=right class=bg1>세율 (5 ~ 30%)&nbsp;&nbsp;&nbsp;</td>
                     <td align=center><input type=text <?=$read?> name=rate style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['rate']?>>% <input type=<?=$btn?> name=btn value=세율></td>
-                    <td align=right id=bg1>봉급 지급율 (20 ~ 200%)&nbsp;&nbsp;&nbsp;</td>
+                    <td align=right class=bg1>봉급 지급율 (20 ~ 200%)&nbsp;&nbsp;&nbsp;</td>
                     <td align=center><input type=text <?=$read?> name=bill style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['bill']?>>% <input type=<?=$btn?> name=btn value=지급율></td>
                 </tr>
                 <tr>
-                    <td align=right id=bg1>기밀 권한 (1 ~ 99년)&nbsp;&nbsp;&nbsp;</td>
+                    <td align=right class=bg1>기밀 권한 (1 ~ 99년)&nbsp;&nbsp;&nbsp;</td>
                     <td align=center><input type=text <?=$read?> name=secretlimit style=text-align:right;color:white;background-color:black; size=3 maxlength=3 value=<?=$nation['secretlimit']?>>년 <input type=<?=$btn?> name=btn value=기밀권한></td>
-                    <td align=right id=bg1>임관&전쟁 변경 가능</td>
+                    <td align=right class=bg1>임관&amp;전쟁 변경 가능</td>
                     <td align=center>무제한</td>
                 </tr>
                 <tr>
@@ -307,10 +297,9 @@ if ($nation['war'] == 0) {
     <tr><td colspan=2 height=10></td></tr>
 </form>
 </table>
-<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
+<table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>

hwe/b_diplomacy.php

@@ -8,15 +8,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);
-
-$query = "select no,nation,map from general where owner='{$userID}'";
+$query = "select no,nation from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
 
@@ -25,7 +22,6 @@ $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""
 $nationcount = MYDB_num_rows($result);
 $nationnum = [];
 $nationname = [];
-$nationcolor = [];
 
 $nationStr = "";
 $powerStr = "";
@@ -41,7 +37,6 @@ for($i=0; $i < $nationcount; $i++) {
 
     $nationnum[] = $nation['nation'];
     $nationname[$nation['nation']] = $nation['name'];
-    $nationcolor[$nation['nation']] = $nation['color'];
 
     $nationStr .= "<font color=cyan>◆</font> <font style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</font><br>";
     $powerStr .= "국력 {$nation['power']}<br>";
@@ -64,9 +59,10 @@ foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE confl
     $sum = array_sum($conflict);
 
     foreach ($conflict as $nationID=>$killnum) {
-        $conflict['percent'] = round(100*$killnum / $sum, 1);
-        $conflict['name'] = $nationname[$nationID];
-        $conflict['color'] = $nationcolor[$nationID];
+        $conflict[$nationID] = ['killnum'=>$killnum];
+        $conflict[$nationID]['percent'] = round(100*$killnum / $sum, 1);
+        $conflict[$nationID]['name'] = $nationname[$nationID];
+        $conflict[$nationID]['color'] = getNationStaticInfo($nationID)['color'];
     }
 
     $realConflict[] = [$cityID, $cityName, $conflict];
@@ -79,12 +75,12 @@ foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE confl
 <head>
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<title>중원정보</title>
-<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>
+<title><?=UniqueConst::$serverName?>: 중원 정보</title>
+<?=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(){
 
@@ -95,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 "
@@ -120,7 +116,7 @@ if($nationcount != 0) {
 
 for($i=0; $i < $nationcount; $i++) {
     echo "
-        <td align=center width={$width} style=background-color:{$nationcolor[$nationnum[$i]]};color:".newColor($nationcolor[$nationnum[$i]]).";>{$nationname[$nationnum[$i]]}</td>";
+        <td align=center width={$width} style=background-color:".getNationStaticInfo($nationnum[$i])['color'].";color:".newColor(getNationStaticInfo($nationnum[$i])['color']).";>{$nationname[$nationnum[$i]]}</td>";
 }
 echo "
     </tr>";
@@ -137,7 +133,7 @@ for($i=0; $i < $nationcount; $i++) {
     }
     echo "
     <tr>
-        <td align=center style=background-color:{$nationcolor[$nationnum[$i]]};color:".newColor($nationcolor[$nationnum[$i]]).";>{$nationname[$nationnum[$i]]}</td>";
+        <td align=center style=background-color:".getNationStaticInfo($nationnum[$i])['color'].";color:".newColor(getNationStaticInfo($nationnum[$i])['color']).";>{$nationname[$nationnum[$i]]}</td>";
 
     for($k=0; $k < $nationcount; $k++) {
         if($i == $k) {
@@ -180,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;'
-                class='bg0'
-            >
+        <td style='width:948px;position:relative;'>
+            <table class='tb_layout bg0' style='width:100%;'>
             <?php foreach($conflict as $item): ?>
                 <tr>
                     <td 
@@ -212,12 +190,10 @@ for($i=0; $i < $nationcount; $i++) {
                         align=right 
                         style='color:<?=newColor($item['color'])?>;background-color:<?=$item['color']?>;'
                     ><?=$item['name']?>&nbsp;</td>
-                    <td width=48 align=right><?=$item['percent']?>%&nbsp;</td>
-                    <td 
-                        width='<?=$item['percent']?>%'
-                        style='background-color:<?=$item['color']?>;'
-                    ></td>
-                    <td width=*></td>
+                    <td width=48 align=right><?=(float)$item['percent']?> %&nbsp;</td>
+                    <td width=*><div
+                        style='display:inline-block;width:<?=$item['percent']?>%;background-color:<?=$item['color']?>;'
+                    >&nbsp;</div></td>
                 </tr>
             <?php endforeach; ?>
             </table>
@@ -231,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>
@@ -239,18 +215,17 @@ for($i=0; $i < $nationcount; $i++) {
         <td width=698 height=420>
             <?=getMapHtml()?>
         </td>
-        <td width=98 valign=top><?=$nationStr?></td>
+        <td width=101 valign=top><?=$nationStr?></td>
         <td width=78 valign=top><?=$powerStr?></td>
         <td width=58 valign=top><?=$genStr?></td>
-        <td width=58 valign=top><?=$cityStr?></td>
+        <td width=55 valign=top><?=$cityStr?></td>
     </tr>
 </table>
 <br>
 
-<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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>

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();
@@ -54,14 +51,14 @@ $sel[$type] = "selected";
 } ?>
 <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'>
+<title><?=UniqueConst::$serverName?>: 암행부</title>
+<?=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,10 +203,9 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>

hwe/b_myBossInfo.php

@@ -30,9 +30,9 @@ if($meLevel == 0) {
 
 <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'>
+<title><?=UniqueConst::$serverName?>: 인사부</title>
+<?=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>
@@ -81,18 +81,18 @@ echo "
 ";
 for($i=12; $i >= $lv; $i-=2) {
     $i1 = $i;   $i2 = $i - 1;
-    $imageTemp1 = GetImageURL($level[$i1]['imgsvr']);
-    $imageTemp2 = GetImageURL($level[$i2]['imgsvr']);
-    echo "
+    $imageTemp1 = GetImageURL($level[$i1]['imgsvr']??0);
+    $imageTemp2 = GetImageURL($level[$i2]['imgsvr']??0);
+    ?>
     <tr>
-        <td width=98 align=center id=bg1><font size=4>".getLevel($i1, $nation['level'])."</font></td>
-        <td width=64 height=64 style='background:no-repeat center url(\"{$imageTemp1}/{$level[$i1]['picture']}\");background-size:64px;'></td>
-        <td width=332><font size=4>";echo $level[$i1]['name']==''?"-":$level[$i1]['name']; echo " ({$level[$i1]['belong']}년)</font></td>
-        <td width=98 align=center id=bg1><font size=4>".getLevel($i2, $nation['level'])."</font></td>
-        <td width=64 height=64 style='background:no-repeat center url(\"{$imageTemp2}/{$level[$i2]['picture']}\");background-size:64px;'></td>
-        <td width=332><font size=4>";echo $level[$i2]['name']==''?"-":$level[$i2]['name']; echo " ({$level[$i2]['belong']}년)</font></td>
+        <td width=98 align=center id=bg1><font size=4><?=getLevel($i1, $nation['level'])?></font></td>
+        <td width=64 height=64 style='background:no-repeat center url("<?=$imageTemp1?>/<?=$level[$i1]['picture']??'default.jpg'?>");background-size:64px;'></td>
+        <td width=332><font size=4><?=$level[$i1]['name']??'-'?>(<?=$level[$i1]['belong']??'-'?>년)</font></td>
+        <td width=98 align=center id=bg1><font size=4><?=getLevel($i2, $nation['level'])?></font></td>
+        <td width=64 height=64 style='background:no-repeat center url("<?=$imageTemp2?>/<?=$level[$i2]['picture']??'default.jpg'?>");background-size:64px;'></td>
+        <td width=332><font size=4><?=$level[$i2]['name']??'-'?>(<?=$level[$i2]['belong']??'-'?>년)</font></td>
     </tr>
-    ";
+    <?php
 }
 
 echo "
@@ -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>
@@ -205,7 +205,10 @@ if($meLevel >= 5 && $nation['l11set'] == 0) {
     $query = "select name,city from general where nation='{$me['nation']}' and level='11'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
-    echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
+    if($general){
+        echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
+    }
+    
 }
 echo "
         </td>
@@ -257,7 +260,9 @@ for($i=10; $i >= $lv; $i--) {
         $query = "select name,city from general where nation='{$me['nation']}' and level={$i}";
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $general = MYDB_fetch_array($result);
-        echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
+        if($general){
+            echo "{$general['name']} 【".CityConst::byID($general['city'])->name."】";
+        }
     }
     echo "</td></form>";
     if($i % 2 == 1) { echo "</tr>"; }
@@ -265,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) {
@@ -500,10 +505,9 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>

hwe/b_myCityInfo.php

@@ -37,14 +37,14 @@ $sel = [$type => "selected"];
 
 <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'>
+<title><?=UniqueConst::$serverName?>: 세력도시</title>
+<?=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,11 +188,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 
 </html>

hwe/b_myGenInfo.php

@@ -37,14 +37,14 @@ $sel = [$type => "selected"];
 
 <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'>
+<title><?=UniqueConst::$serverName?>: 세력장수</title>
+<?=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,11 +191,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 
 </html>

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);
@@ -26,14 +27,14 @@ if($me['level'] == 0) {
 
 <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'>
+<title><?=UniqueConst::$serverName?>: 세력정보</title>
+<?=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,11 +155,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 
 </html>

hwe/b_myPage.php

@@ -5,16 +5,13 @@ include "lib.php";
 include "func.php";
 
 $btn = Util::getReq('btn');
-$map = Util::getReq('map', 'int', 0);
 $mode = Util::getReq('mode', 'int', 2);
 $tnmt = Util::getReq('tnmt', 'int', 1);
+//$detachNPC = Util::getReq('detachNPC', 'bool');
+$detachNPC = false;
 
 extractMissingPostToGlobals();
 
-if($map < 0 || $map > 2){
-    $map = 0;
-}
-
 if($mode < 0 || $mode > 2){
     $mode = 2;
 }
@@ -28,89 +25,94 @@ $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("내정보", 1);
 
-$query = "select myset from general where owner='{$userID}'";
+$query = "select no,npc,mode,tnmt,myset from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
+
 if ($me['myset'] > 0) {
     $submit = 'submit';
 } else {
     $submit = 'hidden';
 }
 
-if ($btn == "설정저장" && $me['myset'] > 0) {
+if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
     if ($me['myset'] > 1) {
         $submit = 'submit';
     } else {
         $submit = 'hidden';
     }
 
+    $me['myset'] -= 1;
+
     $db->update('general', [
         'myset'=>$db->sqleval('myset-1'),
-        'map'=>$map,
         'mode'=>$mode,
         'tnmt'=>$tnmt
     ], 'owner=%i', $userID);
-}
 
-$query = "select no,map,mode,tnmt,myset from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
+    if($me['npc'] == 1 && $detachNPC){
+        $turnterm = $gameStor->turnterm;
+
+        if($turnterm < 10){
+            $targetKillTurn = 30 / $turnterm;
+        }
+        else{
+            $targetKillTurn = 60 / $turnterm;
+        }
+        $db->update('general', [
+            'killturn'=>$targetKillTurn
+        ], 'owner=%i AND npc=1', $userID);
+
+        $me['killturn']=$targetKillTurn;
+    }
+}
 
 ?>
 <!DOCTYPE html>
 <html>
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>내정보</title>
-<link href="../d_shared/common.css" rel="stylesheet">
-<link rel=stylesheet href="css/common.css">
-<script type="text/javascript">
-function go(type) {
-    if(type == 0){ 
-        location.replace('c_vacation.php');
-    }
-}
-</script>
+<title><?=UniqueConst::$serverName?>: 내정보</title>
+<?=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(); ?>
             <?php myInfo2(); ?>
         </td>
-        <td width=50% valign=top>
+        <td width=50% valign=top style="padding-left:4ch;">
             <form name=form1 action=b_myPage.php method=post>
-                &nbsp;&nbsp;&nbsp;&nbsp;지도수준 【
-                <input type=radio name=map value=0 <?=$me['map']==0?"checked":""; ?>>상세
-                <input type=radio name=map value=1 <?=$me['map']==1?"checked":""; ?>>간단
-                <input type=radio name=map value=2 <?=$me['map']==2?"checked":""; ?>>생략
-                】<br><br>
-                &nbsp;&nbsp;&nbsp;&nbsp;토너먼트 【
+                토너먼트 【
                 <input type=radio name=tnmt value=0 <?=$me['tnmt']==0?"checked":""; ?>>수동참여
                 <input type=radio name=tnmt value=1 <?=$me['tnmt']==1?"checked":""; ?>>자동참여
                 】<br>
-                &nbsp;&nbsp;&nbsp;&nbsp;∞<font color=orange>개막직전 남는자리가 있을경우 랜덤하게 참여합니다.</font><br><br>
-                &nbsp;&nbsp;&nbsp;&nbsp;수비 【
+               ∞<font color=orange>개막직전 남는자리가 있을경우 랜덤하게 참여합니다.</font><br><br>
+                수비 【
                 <input type=radio name=mode  value=2 <?=$me['mode']==2?"checked":""; ?>>◎(훈사80)
                 <input type=radio name=mode  value=1 <?=$me['mode']==1?"checked":""; ?>>○(훈사60)
                 <input type=radio name=mode  value=0 <?=$me['mode']==0?"checked":""; ?>>×
                 】<br><br>
-                &nbsp;&nbsp;&nbsp;&nbsp;<input type=<?=$submit?> name=btn style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px; value=설정저장><br>
-                &nbsp;&nbsp;&nbsp;&nbsp;∞<font color=orange>설정저장은 이달중 <?=$me['myset']?>회 남았습니다.</font><br><br>
+                <input type=<?=$submit?> name=btn style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px; value=설정저장><br>
+                ∞<font color=orange>설정저장은 이달중 <?=$me['myset']?>회 남았습니다.</font><br><br>
             </form>
-            &nbsp;&nbsp;&nbsp;&nbsp;휴 가 신 청<br>
-            &nbsp;&nbsp;&nbsp;&nbsp;<input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px; value=휴가신청 onclick='go(0)'>
+            휴 가 신 청<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>-->
         </td>
     </tr>
     <tr>
@@ -138,11 +140,10 @@ function go(type) {
         </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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 

hwe/b_nationboard.php

@@ -20,15 +20,15 @@ $me = MYDB_fetch_array($result);
 <!DOCTYPE html>
 <html>
 <head>
-<title>회의실</title>
+<title><?=UniqueConst::$serverName?>: 회의실</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=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,11 +60,10 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 

hwe/b_nationrule.php

@@ -15,15 +15,15 @@ increaseRefresh("국법", 1);
 <!DOCTYPE html>
 <html>
 <head>
-<title>국법</title>
+<title><?=UniqueConst::$serverName?>: 국법</title>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<link rel='stylesheet' href='../d_shared/common.css' type='text/css'>
-<link rel='stylesheet' href='css/common.css' type='text/css'>
+<?=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>
 
@@ -52,7 +52,6 @@ if($me['level'] >= 5) {
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>
 </table>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 

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();
@@ -43,25 +42,16 @@ case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "itl"; $tp2 = "
 } ?>
 <head>
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
-<title>토너먼트</title>
-<style>
-body { color:white; background-color:black; border-width:1px; border-color:gray; }
-table { font-family:'맑은 고딕'; line-height:110%; }
-font { font-family:'맑은 고딕'; line-height:110%; }
-input { font-family:'맑은 고딕'; line-height:110%; height:20px }
-select { font-family:'굴림'; line-height:100%; }
-#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>
-
+<title><?=UniqueConst::$serverName?>: 토너먼트</title>
+<?=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 = [];
@@ -176,10 +166,16 @@ if ($session->userGrade >= 5) {
 
 $str1 = getTournament($admin['tournament']);
 $str2 = getTournamentTime();
+if($str2){
+    $str2 = ', '.$str2;
+}
 $str3 = getTournamentTerm();
+if($str3){
+    $str3 = ', '.$str3;
+}
 ?>
     <tr><td colspan=8>운영자 메세지 : <font color=orange size=5><?=$admin['tnmt_msg']?></font></td></tr>
-    <tr><td colspan=8 align=center><font color=white size=6><?=$tnmt_type?> (<?=$str1.", ".$str2.", ".$str3?>)</font></td></tr>
+    <tr><td colspan=8 align=center><font color=white size=6><?=$tnmt_type?> (<?=$str1.$str2.$str3?>)</font></td></tr>
     <tr><td colspan=8 align=center id=bg2><font color=magenta size=5>16강 승자전</font></td></tr>
     <tr><td height=10 colspan=8 align=center></td></tr>
 <?php
@@ -187,7 +183,7 @@ $str3 = getTournamentTerm();
 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";
@@ -397,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){
@@ -438,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>";
 
@@ -464,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>";
 
@@ -500,10 +498,9 @@ 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>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>

hwe/b_troop.php

@@ -25,24 +25,23 @@ $troopcount = MYDB_num_rows($result);
 <html>
 <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'>
-
+<title><?=UniqueConst::$serverName?>: 부대편성</title>
+<?=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++) {
@@ -123,7 +122,9 @@ for($i=0; $i < $troopcount; $i++) {
     }
 }
 
-if($me['troop'] == 0) {
+if ($troopcount == 0) {
+}
+else if($me['troop'] == 0) {
     echo"
 <input type=submit name=btn value='부 대 가 입'>";
 } else {
@@ -137,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>";
@@ -153,12 +154,11 @@ 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>
 </form>
-<?php PrintElapsedTime(); ?>
 </body>
 </html>
 

hwe/c_auction.php

@@ -24,6 +24,9 @@ $term = Util::getReq('term', 'int');
 $stuff = Util::getReq('stuff', 'int');
 $sel = Util::getReq('sel', 'int');
 
+$msg = '';
+$msg2 = '';
+
 extractMissingPostToGlobals();
 
 //로그인 검사
@@ -31,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), "");
@@ -53,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_dipcenter.php

@@ -32,37 +32,43 @@ if($me['level'] < 5) {
 }
 
 if($btn == "국가방침") {
-    $msg = BadTag2Code(addslashes(SQ2DQ($msg)));
-    $query = "update nation set msg='$msg' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $msg == mb_substr($msg, 0, 1000);
+    //$msg = StringUtil::
+    $db->update('nation', [
+        'msg'=>BadTag2Code($msg)
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "임관권유") {
-    $scoutmsg = BadTag2Code(addslashes(SQ2DQ($scoutmsg)));
-    $query = "update nation set scoutmsg='$scoutmsg' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $scoutmsg == mb_substr($msg, 0, 500);
+    $db->update('nation', [
+        'scoutmsg'=>BadTag2Code($scoutmsg)
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "세율") {
     if($rate < 5)  { $rate = 5; }
     if($rate > 30) { $rate = 30; }
     $query = "update nation set rate='$rate' where nation='{$me['nation']}'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 } elseif($btn == "지급율") {
-    if($bill < 20)  { $bill = 20; }
-    if($bill > 200) { $bill = 200; }
-    $query = "update nation set bill='$bill' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $bill = Util::valueFit($bill, 20, 200);
+    $db->update('nation', [
+        'bill'=>$bill
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "기밀권한") {
-    if($secretlimit < 1)   { $secretlimit = 1; }
-    if($secretlimit > 99) { $secretlimit = 99; }
-    $query = "update nation set secretlimit='$secretlimit' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $secretlimit = Util::valueFit($secretlimit, 1, 99);
+    $db->update('nation', [
+        'secretlimit'=>$secretlimit
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "임관 금지") {
-    $query = "update nation set scout='1' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('nation', [
+        'scout'=>1
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "임관 허가") {
-    $query = "update nation set scout='0' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('nation', [
+        'scout'=>0
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "전쟁 금지") {
-    $query = "update nation set war='1' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('nation', [
+        'war'=>1
+    ], 'nation=%i',$me['nation']);
 } elseif($btn == "전쟁 허가") {
     $query = "update nation set war='0' where nation='{$me['nation']}'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

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 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),"");
@@ -41,17 +40,20 @@ if($meLevel < 5){
 
 
 if($btn == "임명") {
-    $query = "select no,nation,level,leader,power,intel from general where no='$genlist'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
+    if($genlist !== 0){
+        $query = "select no,nation,level,leader,power,intel from general where no='$genlist'";
+        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $general = MYDB_fetch_array($result);
 
-    if(!$general){
-        header('location:b_myBossInfo.php');
-        exit();
+        if(!$general){
+            header('location:b_myBossInfo.php');
+            exit();
+        }
     }
+        
 
     //임명할사람이 군주이면 불가, 내가 수뇌부이어야함, 공석아닌때는 국가가 같아야함
-    if($general['level'] == 12 || $meLevel < 5 || ($general['nation'] != $me['nation'] && $genlist != 0)) {
+    if($meLevel < 5 || ($general['nation'] != $me['nation'] && $genlist != 0) || ($general['level'] == 12 && $genlist != 0)) {
         
         header('location:b_myBossInfo.php');
         exit();
@@ -74,13 +76,13 @@ if($btn == "임명") {
 }
 
 //나와 대상 장수는 국가가 같아야 함
-if($me['nation'] != $general['nation']){
+if($genlist != 0 && $me['nation'] != $general['nation']){
     header('location:b_myBossInfo.php');
     exit();
 }
 
 if($btn == "추방") {
-    $query = "select name,l{$meLevel}set,chemi from nation where nation='{$me['nation']}'";
+    $query = "select name,l{$meLevel}set,chemi,color from nation where nation='{$me['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $nation = MYDB_fetch_array($result);
 
@@ -165,7 +167,24 @@ if($btn == "추방") {
             case 4: $str = "날 추방했으니 그 복수로 적국에 정보를 팔아 넘겨야겠군요. 그럼 이만."; break;
             }
 
-            PushMsg(1, 0, $general['picture'], $general['imgsvr'], "{$general['name']}:", $nation['color'], $nation['name'], $nation['color'], $str);
+            $src = new MessageTarget(
+                $general['no'], 
+                $general['name'],
+                $general['nation'],
+                $nation['name'],
+                $nation['color'],
+                GetImageURL($general['imgsvr'], $general['picture'])
+            );
+            $msg = new Message(
+                Message::MSGTYPE_PUBLIC, 
+                $src,
+                $src,
+                $str,
+                new \DateTime(),
+                new \DateTime('9999-12-31'),
+                []
+            );
+            $msg->send();
         }
 
         //국가 기술력 그대로
@@ -191,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_nationboard.php

@@ -7,6 +7,7 @@ include "func.php";
 $title = Util::getReq('title');
 $msg = Util::getReq('msg');
 $num = Util::getReq('num', 'int');
+$reply = Util::getReq('reply');
 
 extractMissingPostToGlobals();
 

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),"");
@@ -60,7 +59,7 @@ if($btn == '참가') {
     }
     $map = [];
     for($i=0; $i < 8; $i++) {
-        if($occupied[$i] == 0) {
+        if(!Util::array_get($occupied[$i])) {
             $map[] = $i;
         }
     }
@@ -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_troop.php

@@ -40,8 +40,9 @@ if($btn == "부 대 창 설" && $name != "" && $me['troop'] == 0) {
         'troop'=>0
     ], 'no=%i AND troop=(SELECT troop FROM troop WHERE no = %i)', $gen, $me['no']);
 } elseif($btn == "부 대 가 입" && $troop != 0) {
-    $troop = $db->queryFirstField('SELECT troop FROM troop WHERE no = %i', $troop);
-    if($troop){
+    $troopLeader = $db->queryFirstField('SELECT `no` FROM troop WHERE troop=%i', $troop);
+    $troopLeaderNation = $db->queryFirstField('SELECT `nation` FROM `general` WHERE `no`=%i AND `nation`=%i', $troopLeader, $me['nation']);
+    if($troopLeaderNation){
         $db->update('general', [
             'troop'=>$troop
         ], 'no=%i', $me['no']);

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,22 +67,25 @@ 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),"");
     $me = MYDB_fetch_array($result);
+    if(!$me){
+        echo "로그인 되어있지 않습니다.";
+        return;
+    }
     $turn = getTurn($me, 2);
 
-    echo "<table width=300 height=700 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
+    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

@@ -3,13 +3,67 @@
 html, body{
     background-color:black;
     color:white;
+    line-height:1.3;
 }
 
-table { font-family:'맑은 고딕'; line-height:110%; }
-font { font-family:'맑은 고딕'; line-height:110%; }
-input { font-family:'맑은 고딕'; line-height:110%; height:20px }
+table { font-family:'맑은 고딕'; }
+font { font-family:'맑은 고딕'; }
+input { font-family:'맑은 고딕'; 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

@@ -9,6 +9,11 @@
 }
 /*임시용 끝*/
 
+#message_board{
+    height:1370px;
+    position:relative;
+}
+
 #message_board section{
     overflow-y:auto;
     overflow-x:hidden;
@@ -17,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;
@@ -56,7 +61,7 @@
     float:left;
     width:64px;
     height:64px;
-    border-right:groove 0.1em;
+    border-right:solid 1px gray;
 }
 
 .msg_time{
@@ -70,29 +75,47 @@
     color:white;
 }
 
+.message_input_form{
+    position:relative;
+}
+
 #msg_input{
     color:white;
     background-color:black;
     font-size:12px;
-    width:720px;
+    width:715px;
+    margin:0 2px;
     height:15px;
 }
 
+#msg_submit{
+    position:absolute;
+    right:0;
+    margin-right:2px;
+}
+
 #mailbox_list{
+    float:left;
     color:white;
     background-color:black;
     font-size:12px;
     width:160px;
+    height:20px;
 }
 
 .board_header{
     color:white;
-    border:groove 0.1em;
+    border:solid 1px gray;
 }
 
 .board_side{
-    width:50%;
-    float:left;
+    position:absolute;
+    height:1370px;
+    width:498px;
+    overflow-y: hidden;
+    border-left:solid 1px;
+    border-right:solid 1px;
+    border-bottom:solid 1px;
 }
 
 .msg_body{

hwe/css/select_npc.css

@@ -0,0 +1,48 @@
+.container{
+    width:1000px;
+    margin:0 auto;
+}
+
+.card_holder{
+    text-align:center;
+}
+.general_card{
+    width:100px;
+    display:inline-block;
+}
+
+.general_card h4 {
+    margin:0;
+}
+
+.general_card p {
+    margin:0;
+}
+
+
+.general_card .select_btn {
+    width:100%;
+}
+
+.general_card label {
+    display: block;
+    padding-left: 15px;
+    text-indent: -15px;
+  }
+  
+.general_card input {
+    width: 13px;
+    height: 13px;
+    padding: 0;
+    margin:0;
+    vertical-align: bottom;
+    position: relative;
+    top: -1px;
+    *overflow: hidden;
+}
+
+
+#outdate_token{
+    color:red;
+    display:none;
+}

hwe/d_setting/DB.orig.php

@@ -27,6 +27,8 @@ class DB{
         if(self::$uDB === null){
             self::$uDB = new \MeekroDB(self::$host,self::$user,self::$password,self::$dbName,self::$port,self::$encoding);
             self::$uDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
+
+            self::$uDB->error_handler= function(){};
             self::$uDB->throw_exception_on_error = true;
             self::$uDB->throw_exception_on_nonsql_error = true;
         }

hwe/d_setting/UniqueConst.orig.php

@@ -3,6 +3,7 @@ namespace sammo;
 
 class UniqueConst{
     public static $serverID = '_tK_serverID_';
+    public static $serverName = '_tK_serverName_';
 
     private function __construct(){}
 

hwe/d_setting/templates/allButton.php.orig

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

hwe/func.php

@@ -18,7 +18,6 @@ require_once 'func_time_event.php';
 require_once('func_template.php');
 require_once('func_message.php');
 require_once('func_map.php');
-require_once('func_diplomacy.php');
 require_once('func_command.php');
 
 /**
@@ -90,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;
@@ -174,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 "공 백 지";
@@ -212,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>
 ";
@@ -259,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),"");
@@ -290,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 {
@@ -334,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 {
@@ -375,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>
 ";
@@ -436,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),"");
@@ -557,15 +553,13 @@ function commandTable() {
     } else {
         addCommand("인재탐색(랜덤경험, 자금$develcost)", 29, 0);
     }
-    //TODO:등용장 재 디자인
-    //xxx:등용장 일단 끔
-    /*
+
     if($me['level'] >= 1 && $city['supply'] != 0) {
         addCommand("등용(자금{$develcost5}+장수가치)", 22);
     } else {
         addCommand("등용(자금{$develcost5}+장수가치)", 22, 0);
     }
-    */
+    
     if($me['no'] == $troop['no'] && $citycount > 0 && $city['supply'] != 0 && $city['nation'] == $me['nation']) {
         addCommand("집합(통솔경험)", 26);
     } else {
@@ -647,7 +641,13 @@ function commandTable() {
     if($me['level'] == 12) {
         addCommand("선양", 54);
         if($citycount != 0) {
-            addCommand("방랑", 47);
+            if ($admin['year'] + 3 < $admin['startyear']) {
+                addCommand("방랑", 47, 0);
+            }
+            else{
+                addCommand("방랑", 47);
+            }
+            
             addCommand("해산", 56, 0);
         } else {
             addCommand("방랑", 47, 0);
@@ -672,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),"");
@@ -724,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);
@@ -774,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),"");
@@ -874,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>";
 }
@@ -999,104 +997,107 @@ function generalInfo2($no) {
     if($dex30 > 100) { $dex30 = 100; }
     if($dex40 > 100) { $dex40 = 100; }
 
-    $general['dex0']  = getDexCall($general['dex0']);
-    $general['dex10'] = getDexCall($general['dex10']);
-    $general['dex20'] = getDexCall($general['dex20']);
-    $general['dex30'] = getDexCall($general['dex30']);
-    $general['dex40'] = getDexCall($general['dex40']);
+    $general['dex0_text']  = getDexCall($general['dex0']);
+    $general['dex10_text'] = getDexCall($general['dex10']);
+    $general['dex20_text'] = getDexCall($general['dex20']);
+    $general['dex30_text'] = getDexCall($general['dex30']);
+    $general['dex40_text'] = getDexCall($general['dex40']);
 
-    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>
+    $general['dex0_short'] = sprintf('%.1fK', $general['dex0']/1000);
+    $general['dex10_short'] = sprintf('%.1fK', $general['dex10']/1000);
+    $general['dex20_short'] = sprintf('%.1fK', $general['dex20']/1000);
+    $general['dex30_short'] = sprintf('%.1fK', $general['dex30']/1000);
+    $general['dex40_short'] = sprintf('%.1fK', $general['dex40']/1000);
+
+    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=3 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>　　{$general['dex0']}</td>
-        <td width=366 align=center>".bar($dex0, 16)."</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 style='text-align:center;'>".bar($dex0, 16)."</td>
     </tr>
     <tr height=16>
-        <td align=center id=bg1><b>궁병</b></td>
-        <td>　　{$general['dex10']}</td>
-        <td align=center>".bar($dex10, 16)."</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 style='text-align:center;'>".bar($dex10, 16)."</td>
     </tr>
     <tr height=16>
-        <td align=center id=bg1><b>기병</b></td>
-        <td>　　{$general['dex20']}</td>
-        <td align=center>".bar($dex20, 16)."</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 style='text-align:center;'>".bar($dex20, 16)."</td>
     </tr>
     <tr height=16>
-        <td align=center id=bg1><b>귀병</b></td>
-        <td>　　{$general['dex30']}</td>
-        <td align=center>".bar($dex30, 16)."</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 style='text-align:center;'>".bar($dex30, 16)."</td>
     </tr>
     <tr height=16>
-        <td align=center id=bg1><b>차병</b></td>
-        <td>　　{$general['dex40']}</td>
-        <td align=center>".bar($dex40, 16)."</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 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);
     }
@@ -1105,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() {
@@ -1129,23 +1127,6 @@ function nationMsg() {
     echo "<font color=orange>".$nation['msg']."</font>";
 }
 
-
-function PushMsg($type, $nation, $picture, $imgsvr, $from, $fromcolor, $to, $tocolor, $msg) {
-    if($nation == 0) { $nation = 0; }
-    if($fromcolor == "") { $fromcolor = "#FFFFFF"; }
-    if($to == "") { $to = "재야"; }
-    if($tocolor == "") { $tocolor = "#FFFFFF"; }
-
-    $date = date('Y-m-d H:i:s');
-    if($type == 1) { $file = "_all_msg.txt"; }
-    else { $file = "_nation_msg{$nation}.txt"; }
-    $fp = fopen("logs/{$file}", "a");
-    //로그 파일에 기록
-    $str = "{$type}|".StringUtil::padStringAlignRight($from,12," ")."|".StringUtil::padStringAlignRight($to,12," ")."|".$date."|".$msg."|".$fromcolor."|".$tocolor."|".$picture."|".$imgsvr;
-    fwrite($fp, "{$str}\n");
-    fclose($fp);
-}
-
 function msgprint($msg, $name, $picture, $imgsvr, $when, $num, $type) {
     $db = DB::db();
     $connect=$db->get();
@@ -1162,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++) {
@@ -1180,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=댓글달기>
@@ -1265,14 +1246,14 @@ function cutDay($date, int $turnterm) {
 function increaseRefresh($type="", $cnt=1) {
     //FIXME: 로그인, 비로그인 시 처리가 명확하지 않음
     $session = Session::getInstance();
+    $userID = $session->userID;
     $generalID = $session->generalID;
 
     $date = date('Y-m-d H:i:s');
 
     $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', [
@@ -1281,14 +1262,14 @@ function increaseRefresh($type="", $cnt=1) {
             'connect'=>$db->sqleval('connect + %i', $cnt),
             'refcnt'=>$db->sqleval('refcnt + %i', $cnt),
             'refresh'=>$db->sqleval('refresh + %i', $cnt)
-        ], 'owner=%i', $generalID);
+        ], 'owner=%i', $userID);
     }
 
     $date = date('Y_m_d H:i:s');
     $date2 = substr($date, 0, 10);
     $online = getOnlineNum();
     file_put_contents(
-        "logs/_{$date2}_refresh.txt",
+        __dir__."/logs/_{$date2}_refresh.txt",
         sprintf(
             "%s, %s, %s, %s, %s, %d\n",
             $date,
@@ -1325,7 +1306,7 @@ function increaseRefresh($type="", $cnt=1) {
     }
     if($str != "") {
         file_put_contents(
-            "logs/_{$date2}_ipcheck.txt",
+            __dir__."/logs/_{$date2}_ipcheck.txt",
             sprintf(
                 "%s, %s, %s%s\n",
                 $session->userName,
@@ -1340,49 +1321,49 @@ 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);
 
     $date = date('Y-m-d H:i:s');
     //일시|년|월|총갱신|접속자|최다갱신자
     file_put_contents(__dir__."/logs/_traffic.txt",
-        StringUtil::padStringAlignRight($date,20," ")
-        ."|".StringUtil::padStringAlignRight($game['year'],3," ")
-        ."|".StringUtil::padStringAlignRight($game['month'],2," ")
-        ."|".StringUtil::padStringAlignRight($game['refresh'],8," ")
-        ."|".StringUtil::padStringAlignRight($online,5," ")
-        ."|".StringUtil::padStringAlignRight($user['name']."(".$user['refresh'].")",20," ")
+        Json::encode([
+            $date,
+            $game_env['year'],
+            $game_env['month'],
+            $game_env['refresh'],
+            $online,
+            $user['name']."(".$user['refresh'].")"
+        ])."\n"
     , FILE_APPEND);
 }
 
 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 = [];
@@ -1524,7 +1513,7 @@ function checkTurn() {
 
     // 파일락 획득
     //FIXME:이미 DB 테이블로 lock을 시도하는데 이게 따로 필요한가?
-    $fp = fopen('lock.txt', 'r');
+    $fp = fopen(__dir__.'/lock.txt', 'r');
     if(!flock($fp, LOCK_EX)) {
          return; 
         }
@@ -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,17 +1698,8 @@ 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;
 
-    // 3턴 전 시간
-    $letterdate = subTurn($date, $admin['turnterm'], 3);
-    //기한 지난 외교 메세지 지움(3개월 유지)
-    //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', '.__LINE__);
-    for($i=0; $i < 5; $i++) {
-        $query = "update nation set dip{$i}='',dip{$i}_who='0',dip{$i}_type='0',dip{$i}_when='' where dip{$i}_when < '$letterdate'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    }
     // 부상 과도 제한
     $query = "update general set injury='80' where injury>'80'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1740,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]);
@@ -1751,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'";
@@ -1795,25 +1766,25 @@ function addAge() {
 
 function turnDate($curtime) {
     $db = DB::db();
-    $connect=$db->get();
-
-    $query = "select startyear,starttime,turnterm,year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $admin = $gameStor->getValues(['startyear', 'starttime', 'turnterm', 'year', 'month']);
 
     $turn = $admin['starttime'];
     $curturn = cutTurn($curtime, $admin['turnterm']);
-    $num = 0;
-    $term = $admin['turnterm']*60;
-    $num = intdiv((strtotime($curturn) - strtotime($turn)), $term);
+    $term = $admin['turnterm'];
+    
+    $num = intdiv((strtotime($curturn) - strtotime($turn)), $term*60);
 
-    $year = $admin['startyear'] + intdiv($num, 12);
-    $month = 1 + (12+$num) % 12;
+    $date = $admin['startyear'] * 12;
+    $date += $num;
+    
+    $year = intdiv($date, 12);
+    $month = 1 + $date % 12;    
 
     // 바뀐 경우만 업데이트
     if($admin['month'] != $month || $admin['year'] != $year) {
-        $query = "update game set year='$year',month='$month'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gameStor->year = $year;
+        $gameStor->month = $month;
     }
 
     return [$year, $month];
@@ -1822,16 +1793,14 @@ 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) {
-        $type = rand() % 6; //  0 : 전력전, 1 : 통솔전, 2 : 일기토, 3 : 설전
-        //전력전 50%, 통, 일, 설 각 17%
+        $type = rand() % 5; //  0 : 전력전, 1 : 통솔전, 2 : 일기토, 3 : 설전
+        //전력전 40%, 통, 일, 설 각 20%
         if($type > 3) { $type = 0; }
         startTournament($admin['tnmt_trig'], $type);
     }
@@ -1919,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),"");
@@ -2169,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 = [];
@@ -2178,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개 등장
@@ -2213,11 +2180,11 @@ function uniqueItem($general, $log, $vote=0) {
                 $occupied[$gen[$type]] = 1;
             }
             for($i=7; $i <= 26; $i++) {
-                if($occupied[$i] == 0) {
+                if(!Util::array_get($occupied[$i])) {
                     $item[] = $i;
                 }
             }
-            $it = $item[rand() % count($item)];
+            $it = $item[rand() % count($item)]??0;
 
             $query = "update general set {$type}='$it' where no='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -2227,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[0] = "<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[0] = "<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[0] = "<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[0] = "<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[0] = "<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[0] = "<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[0] = "<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[0] = "<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[0] = "<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[0] = "<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[0] = "<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[0] = "<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[0] = "<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[0] = "<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[0] = "<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[0] = "<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;
@@ -2380,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() {
@@ -2436,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']);
 
@@ -2471,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),"");
@@ -2585,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 = [];
@@ -2678,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

@@ -1,7 +1,8 @@
 <?php
 namespace sammo;
 
-function getTurn($general, $type, $font=1) {
+function getTurn(array $general, $type, $font=1) {
+    //TODO: 왜 'Type' 인가. 그냥 count로 하자.
     $str = [];
     $db = DB::db();
     $connect=$db->get();
@@ -456,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']}'";
@@ -529,16 +529,18 @@ 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(intval($command[0]) == 0 && $session->userGrade < 5) {
+        } elseif($command[0] == 0) {
             $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         } else {
-            $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn='{$admin['killturn']}' where no='{$general['no']}'";
+            $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: 운영자 같이 사망하면 안되는 인물에 대한 처리가 필요
+
         //연속턴 아닌경우 텀 리셋
         if($general['term']%100 != $command[0]) {
             $query = "update general set term=0 where no='{$general['no']}'";
@@ -548,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; //농업
@@ -570,7 +572,7 @@ function processCommand($no) {
             case 17: process_17($general); break; //소집해제
 
             case 21: process_21($general); break; //이동
-            //case 22: process_22($general); break; //등용 //TODO:등용장 재 디자인
+            case 22: process_22($general); break; //등용 //TODO:등용장 재 디자인
             case 25: process_25($general); break; //임관
             case 26: process_26($general); break; //집합
             case 28: process_28($general); break; //귀환
@@ -681,19 +683,21 @@ where nation='{$general['nation']}'
 
 
 function command_Single($turn, $command) {
+    if(!$turn){
+        header('location:commandlist.php');
+        return;
+    }
+
     $db = DB::db();
-    $connect=$db->get();
     $userID = Session::getUserID();
 
     $command = EncodeCommand(0, 0, 0, $command);
 
-    $count = count($turn);
-    $str = "con=con";
-    for($i=0; $i < $count; $i++) {
-        $str .= ",turn{$turn[$i]}='{$command}'";
+    $setValues = [];
+    foreach($turn as $turnIdx){
+        $setValues["turn{$turnIdx}"] = $command;
     }
-    $query = "update general set {$str} where owner='{$userID}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('general', $setValues, 'owner=%i',$userID);
     
     header('location:commandlist.php');
 }

hwe/func_converter.php

@@ -397,9 +397,6 @@ function getBill(int $dedication) : int{
 }
 
 function getCost(int $armtype) : int {
-    //FIXME: 정말로 side effect가 없으려면 query는 밖으로 이동해야함.
-    //TODO: 병종 값이 column으로 들어있는건 전혀 옳지 않음. key->value 형태로 바꿔야함
-
     return GameUnitConst::byID($armtype)->cost;
 }
 

hwe/func_diplomacy.php

@@ -1,224 +0,0 @@
-<?php
-namespace sammo;
-
-function checkScoutAvailable($messageInfo, $general, $srcGeneral, $startyear, $year){
-    $nationID = $messageInfo['src']['nationID'];
-
-    $srcNation = DB::db()->queryFirstRow('SELECT `level`, `scout` FROM `nation` WHERE `nation` = %i', $nationID);
-
-    $realNationID = $srcGeneral['nation'];
-
-    
-
-    if($general['level'] == 12) {
-        return [false, "군주입니다."];
-    } 
-    if(!$srcNation || $srcNation['level'] == 0) {
-        return [false, "없는 국가이거나 방랑군입니다."];
-    } 
-    if($realNationID != $nationID){
-        return [false, "권유자의 소속이 바뀌었습니다."];
-    }
-    if($srcNation['scout'] != 0) {
-        return [false, "임관 금지중입니다."];
-    } 
-    if($year < $startyear+3) {
-        return [false, "초반 제한중입니다."];
-    } 
-    if(strpos($general['nations'], ",{$nationID},") > 0) {
-        return [false, "이미 임관했었던 국가입니다."];
-    }
-
-    return [true, null];
-    
-}
-
-function acceptScout($messageInfo, $general, $msgResponse){
-    $me = $general;
-    $you = DB::db()->queryFirstRow('SELECT `no`, `name`, `nation` FROM `general` WHERE `no` = %i', $messageInfo['src']['id']);
-
-    list($startyear, $year, $month, $killturn) = Util::convertDictToArray(DB::db()->queryFirstRow('SELECT `startyear`, `year`, `month`, `killturn` FROM `game` LIMIT 1'), ['startyear', 'year', 'month', `killturn`]);
-
-    list($avaliableScout, $reason) = checkScoutAvailable($messageInfo, $general, $you, $startyear, $year);
-
-    if(!$msgResponse || !$avaliableScout){
-        return declineScout($messageInfo, $reason);
-    }
-
-    $nation = getNationStaticInfo($messageInfo['src']['nationID']);
-    $generalID = $me['no'];
-    $nationID = $nation['nation'];
-    $nationName = $nation['name'];
-    $myName = $me['name'];
-    
-    $mylog = [];
-    $youlog = [];
-    $alllog = [];
-
-    $youlog[] = "<C>●</><Y>{$myName}</> 등용에 성공했습니다.";
-    $alllog[] = "<C>●</>{$month}월:<Y>{$myName}</>(이)가 <D><b>{$nationName}</b></>(으)로 <S>망명</>하였습니다.";
-    $mylog[] = "<C>●</><D>{$nationName}</>(으)로 망명하여 수도로 이동합니다.";
-    pushGeneralHistory($you, "<C>●</>{$year}년 {$month}월:<Y>{$myName}</> 등용에 성공");
-    pushGeneralHistory($me, "<C>●</>{$year}년 {$month}월:<D>{$nationName}</>(으)로 망명");
-
-    $me['nations'] .= "{$nationID},";
-
-    $updateMe = [
-        'belong'=>1,
-        'nation'=>$nationID,
-        'level'=>1,
-        'city'=>$nation['capital'],
-        'troop'=>0
-    ];
-
-
-    //처리가 조금 다름.
-
-    $db = DB::db();
-
-
-    if($me['level'] > 0){
-        $updateOldNation = [
-            'totaltech' => $db->sqleval('`tech`*greatest(10, `gennum`-1)'),
-            'gennum' => $db->sqleval('greatest(10, `gennum`-1)')
-        ];
-
-        if($me['gold'] > 1000){
-            $updateOldNation['gold'] = $db->sqleval('`gold` + %i', $me['gold'] - 1000);
-            $updateMe['gold'] = 1000;
-        }
-        if($me['rice'] > 1000){
-            $updateOldNation['rice'] = $db->sqleval('`rice` + %i', $me['rice'] - 1000);
-            $updateMe['rice'] = 1000;
-        }
-
-        $updateMe['betray'] = $db->sqleval('`betray` + 1');
-        $updateMe['dedication'] = $db->sqleval('dedication*(1-0.1*betray)');
-        $updateMe['experience'] = $db->sqleval('experience*(1-0.1*betray)');
-
-        $db->update('nation', $updateOldNation, 'nation = %i', $messageInfo['dest']['nationID']);
-    }
-    else{
-        $updateMe['dedication'] = $db->sqleval('dedication + 100');
-        $updateMe['experience'] = $db->sqleval('experience + 100');
-    }
-
-    if($me['npc'] < 2){
-        $updateMe['killturn'] = $killturn;
-    }
-
-    $db->update('general', $updateMe, 'no = %i', $generalID);
-
-    $db->query('UPDATE nation set '.
-        'gennum = greatest(10, (SELECT count(`id`) from general where `nation` = %i_nation)), '.
-        'totaltech = tech * greatest(10, (SELECT count(`id`) from general where `nation` = %i_nation)) '.
-        'where nation=%i_nation', ['nation'=>$nationID]);
-
-    //태수 군사 시중 해제
-    switch($me['level']) {
-    case 4:
-        $db->query('update city set gen1=0 where gen1=%i', $generalID);
-        break;
-    case 3:
-        $db->query('update city set gen3=0 where gen2=%i', $generalID);
-        break;
-    case 2:
-        $db->query('update city set gen3=0 where gen2=%i', $generalID);
-        break;
-    }
-
-    $db->query('UPDATE general left join troop on troop.troop = general.troop set general.troop = 0 where troop.no = %i', $generalID);
-    $db->query('delete from troop where no = %i', $generalID);
-
-    $db->query('UPDATE `message` SET `valid_until`=\'1234-11-22 11:22:33\' WHERE `id` = %i', $messageInfo['id']);
-    $msg = "{$nationName}(으)로 등용 제의 수락";
-    sendRawMessage('private', false, $general['no'], $messageInfo['src'], $messageInfo['dest'], $msg, null, null, ['parent'=>$messageInfo['id']]);
-
-    pushGenLog($me, $mylog);
-    pushGenLog($you, $youlog);
-    pushGeneralPublicRecord($alllog, $year, $month);
-    pushWorldHistory($alllog, $year, $month);
-
-    return [true, 'success'];
-}
-
-function declineScout($messageInfo, $reason=null){
-    $me = [
-        'no'=>$messageInfo['dest']['id'],
-        'name'=>$messageInfo['dest']['name']
-    ];
-    $you = ['no'=>$messageInfo['src']['id']];
-
-    $nation = getNationStaticInfo($messageInfo['src']['nationID']);
-    $generalID = $me['no'];
-    $nationID = $nation['nation'];
-    $nationName = $nation['name'];
-    $myName = $me['name'];
-
-    $mylog = [];
-    $youlog = [];
-    
-
-    $nationName = $messageInfo['src']['nation'];
-    if($reason){
-        $mylog[] = "<C>●</>{$reason} 등용 수락 불가.";
-        $msg = "{$nationName}(으)로 등용 제의 수락 불가";
-    }
-    else{
-        $youlog[] = "<C>●</><Y>{$me['name']}</>(이)가 등용을 거부했습니다.";
-        $mylog[] = "<C>●</><D>{$nationName}</>(으)로 망명을 거부했습니다.";
-        $msg = "{$nationName}(으)로 등용 제의 거부";
-    }
-    
-    $db = DB::db();
-    $db->query('UPDATE `message` SET `valid_until`=\'1234-11-22 11:22:33\' WHERE `id` = %i', $messageInfo['id']);
-
-    sendRawMessage('private', false, $you['no'], $messageInfo['src'], $messageInfo['dest'], $msg, null, null, ['parent'=>$messageInfo['id']]);
-
-    pushGenLog($me, $mylog);
-    pushGenLog($you, $youlog);
-
-    return [true, 'success'];
-}
-
-function acceptAlly($messageInfo, $general, $msgResponse){
-    return [false, 'NYI'];
-}
-
-function declineAlly($messageInfo, $general, $msgResponse){
-
-}
-
-function acceptBreakAlly($messageInfo, $general, $msgResponse){
-
-}
-
-function declineBreakAlly($messageInfo, $general, $msgResponse){
-
-}
-
-function acceptStopWar($messageInfo, $general, $msgResponse){
-
-}
-
-function declineStopWar($messageInfo, $general, $msgResponse){
-
-}
-
-
-function acceptMergeNations($messageInfo, $general, $msgResponse){
-
-}
-
-function declineMergeNations($messageInfo, $general, $msgResponse){
-
-}
-
-
-function acceptSurrender($messageInfo, $general, $msgResponse){
-
-}
-
-function declineSurrender($messageInfo, $general, $msgResponse){
-
-}

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

@@ -5,7 +5,7 @@ namespace sammo;
 
 function delStepLog() {
     $date = date('Y_m_d');
-    @unlink("logs/_{$date}_steplog.txt");
+    @unlink(__dir__."/logs/_{$date}_steplog.txt");
 }
 
 function pushRawFileLog($path, $lines){
@@ -50,81 +50,81 @@ function eraseTnmtFightLogAll(){
 }
 
 function eraseTnmtFightLog(int $group){
-    $filepath = "logs/fight{$group}.txt";
+    $filepath = __dir__."/logs/fight{$group}.txt";
     if(file_exists($filepath)){
         @unlink($filepath);
     }
 }
 
 function pushTnmtFightLog(int $group, $log) {
-    pushRawFileLog("logs/fight{$group}.txt", $log);
+    pushRawFileLog(__dir__."/logs/fight{$group}.txt", $log);
 }
 
 function getTnmtFightLogAll(int $group) {
-    return join('<br>',getFormattedFileLogAll("logs/fight{$group}.txt"));
+    return join('<br>',getFormattedFileLogAll(__dir__."/logs/fight{$group}.txt"));
 }
 
 function pushSabotageLog($log) {
-    pushRawFileLog("logs/_sabotagelog.txt", $log);
+    pushRawFileLog(__dir__."/logs/_sabotagelog.txt", $log);
 }
 
 function getSabotageLogRecent($count) {
-    return join('<br>', getFormattedFileLogRecent("logs/_sabotagelog.txt", $count, 150));
+    return join('<br>', getFormattedFileLogRecent(__dir__."/logs/_sabotagelog.txt", $count, 150));
 }
 
 function pushProcessLog($log) {
     $date = date('Y_m_d');
-    pushRawFileLog("logs/_{$date}_processlog.txt", $log);
+    pushRawFileLog(__dir__."/logs/_{$date}_processlog.txt", $log);
 }
 
 
 function pushStepLog($log) {
     $date = date('Y_m_d');
-    pushRawFileLog("logs/_{$date}_steplog.txt", $log);
+    pushRawFileLog(__dir__."/logs/_{$date}_steplog.txt", $log);
 }
 
 function pushLockLog($log) {
     $date = date('Y_m_d');
-    pushRawFileLog("logs/_{$date}_locklog.txt", $log);
+    pushRawFileLog(__dir__."/logs/_{$date}_locklog.txt", $log);
 }
 
 function pushAdminLog($log) {
-    pushRawFileLog("logs/_adminlog.txt", $log);
+    pushRawFileLog(__dir__."/logs/_adminlog.txt", $log);
 }
 
 function pushAuctionLog($log) {
-    pushRawFileLog("logs/_auctionlog.txt", $log);
+    pushRawFileLog(__dir__."/logs/_auctionlog.txt", $log);
 }
 
 function getAuctionLogRecent(int $count) {
-    return join('<br>', array_reverse(getFormattedFileLogRecent("logs/_auctionlog.txt", $count, 300)));
+    return join('<br>', array_reverse(getFormattedFileLogRecent(__dir__."/logs/_auctionlog.txt", $count, 300)));
 }
 
 function pushGenLog($general, $log) {
     $no = Util::toInt($general['no']);
-    pushRawFileLog("logs/gen{$no}.txt", $log);
+    pushRawFileLog(__dir__."/logs/gen{$no}.txt", $log);
 }
 
 function getGenLogRecent(int $no, int $count) {
-    return join('<br>', array_reverse(getFormattedFileLogRecent("logs/gen{$no}.txt", $count, 300)));
+    return join('<br>', array_reverse(getFormattedFileLogRecent(__dir__."/logs/gen{$no}.txt", $count, 300)));
 }
 
 function pushBatRes($general, $log) {
     $no = Util::toInt($general['no']);
-    pushRawFileLog("logs/batres{$no}.txt", $log);
+    pushRawFileLog(__dir__."/logs/batres{$no}.txt", $log);
 }
 
 function getBatResRecent(int $no, int $count) {
-    return join('<br>', array_reverse(getFormattedFileLogRecent("logs/batres{$no}.txt", $count, 300)));
+    return join('<br>', array_reverse(getFormattedFileLogRecent(__dir__."/logs/batres{$no}.txt", $count, 300)));
 }
 
 function pushBatLog($general, $log) {
     $no = Util::toInt($general['no']);
-    pushRawFileLog("logs/batlog{$no}.txt", $log);
+    pushRawFileLog(__dir__."/logs/batlog{$no}.txt", $log);
 }
 
 function getBatLogRecent(int $no, int $count) {
-    return join('<br>', array_reverse(getFormattedFileLogRecent("logs/batlog{$no}.txt", $count, 300)));
+    return join('<br>', array_reverse(getFormattedFileLogRecent(__dir__."/logs/batlog{$no}.txt", $count, 300)));
 }
 
 //DB-based
@@ -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;
 }
 
@@ -51,8 +47,8 @@ function Submit($url, $msg="", $msg2="") {
     echo "a";   // 파폭 버그 때문
     echo "
 <form method=post name=f1 action='{$url}'>
-    <input type=hidden name=msg value='{$msg}'>
-    <input type=hidden name=msg2 value='{$msg2}'>
+    <input type=hidden name=msg value=\"{$msg}\">
+    <input type=hidden name=msg2 value=\"{$msg2}\">
 </form>
 <script>f1.submit();</script>
     ";
@@ -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

@@ -51,22 +51,28 @@ function getWorldMap($req){
     }
 
     $session = Session::getInstance();
-    $generalID = $session->generalID;
+    $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);
 
-    if($generalID && ($req->showMe || !$req->neutralView)){
-        $city = $db->queryFirstRow(
-                'select `city`, `nation` from `general` where `no`=%i',
-                 $generalID);
+    $general = $db->queryFirstRow(
+        'select `no`, `city`, `nation` from `general` where `owner`=%i',
+         $userID);
 
-        $myCity = Util::toInt($city['city']);
-        $myNation = Util::toInt($city['nation']);
+
+    if($general && ($req->showMe || !$req->neutralView)){
+        if($session->generalID !== $general['no']){
+            $session->logoutGame()->loginGame();
+        }
+
+        $myCity = Util::toInt($general['city']);
+        $myNation = Util::toInt($general['nation']);
 
         if(!$req->showMe){
             $myCity = null;

hwe/func_message.php

@@ -48,58 +48,6 @@ function getMailboxList(){
 
 //Legacy
 
-// type : xx,xx(불가침기간,타입)
-// who : xxxx,xxxx(발신인, 수신인)
-function DecodeMsg($msg, $type, $who, $date, $bg, $num=0) {
-    $db = DB::db();
-    $connect=$db->get();
-    $userID = Session::getUserID();
-
-    //FIXME: 폐기
-    $query = "select no,nation,name,picture,level from general where owner='{$userID}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $me = MYDB_fetch_array($result);
-
-    // 1 : 전메, 2 : 아국->타국, 3 : 타국->아국
-    // 4 : 합병, 5 : 통합, 6 : 불가침, 7 : 종전, 8 : 파기
-    // 9 : 자신->타인, 10 : 타인 -> 자신, 11 : 등용
-    $category = $type % 100;
-    $term = intdiv($type, 100);
-    $from = intdiv($who, 10000);
-    $to = $who % 10000;
-
-    $query = "select name,picture,imgsvr,nation from general where no='$from'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $sndr = MYDB_fetch_array($result);
-
-    $sndrnation = getNationStaticInfo($sndr['nation']);
-
-    switch($bg) {
-        case 2:
-        case 4: $bgcolor = "#CC6600"; break;
-    }
-
-    if($category == 6) {
-        $query = "select reserved from diplomacy where me='{$sndr['nation']}' and you='{$me['nation']}'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $dip = MYDB_fetch_array($result);
-
-        ShowMsg($bgcolor, $category, $sndr['picture'], $sndr['imgsvr'], "{$sndr['name']}:{$sndrnation['name']}▶", $sndrnation['color'], $sndr['name'], $sndrnation['color'], $msg, $date, $num, $from, $term, $me['level'], $dip['reserved']);
-    } elseif($category <= 8) {
-        $rcvrnation = getNationStaticInfo($to);
-
-        ShowMsg($bgcolor, $category, $sndr['picture'], $sndr['imgsvr'], "{$sndr['name']}:{$sndrnation['name']}▶", $sndrnation['color'], $rcvrnation['name'], $rcvrnation['color'], $msg, $date, $num, $from, $term, $me['level']);
-    } elseif($category <= 11) {
-        $query = "select name,picture,nation from general where no='$to'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $rcvr = MYDB_fetch_array($result);
-
-        $rcvrnation = getNationStaticInfo($rcvr['nation']);
-        ShowMsg($bgcolor, $category, $sndr['picture'], $sndr['imgsvr'], "{$sndr['name']}:{$sndrnation['name']}▶", $sndrnation['color'], "{$rcvr['name']}:{$rcvrnation['name']}", $rcvrnation['color'], $msg, $date, $num, $from, $term);
-    }
-}
-
-
 function moveMsg($table, $msgtype, $msgnum, $msg, $type, $who, $when, $column, $value) {
     $db = DB::db();
     $connect=$db->get();
@@ -108,78 +56,3 @@ function moveMsg($table, $msgtype, $msgnum, $msg, $type, $who, $when, $column, $
     $query = "update {$table} set {$msgtype}{$msgnum}='$msg',{$msgtype}{$msgnum}_type='$type',{$msgtype}{$msgnum}_who='$who',{$msgtype}{$msgnum}_when='$when' where {$column}='$value'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 }
-
-function MsgDip($bg) {
-    $db = DB::db();
-    $connect=$db->get();
-    $userID = Session::getUserID();
-
-    $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);
-
-    $query = "select dip0,dip1,dip2,dip3,dip4,dip0_who,dip1_who,dip2_who,dip3_who,dip4_who,dip0_when,dip1_when,dip2_when,dip3_when,dip4_when,dip0_type,dip1_type,dip2_type,dip3_type,dip4_type from nation where nation='{$me['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    if($nation['dip0']) { echo "\n"; DecodeMsg($nation['dip0'], $nation['dip0_type'], $nation['dip0_who'], $nation['dip0_when'], $bg, 0); }
-    if($nation['dip1']) { echo "\n"; DecodeMsg($nation['dip1'], $nation['dip1_type'], $nation['dip1_who'], $nation['dip1_when'], $bg, 1); }
-    if($nation['dip2']) { echo "\n"; DecodeMsg($nation['dip2'], $nation['dip2_type'], $nation['dip2_who'], $nation['dip2_when'], $bg, 2); }
-    if($nation['dip3']) { echo "\n"; DecodeMsg($nation['dip3'], $nation['dip3_type'], $nation['dip3_who'], $nation['dip3_when'], $bg, 3); }
-    if($nation['dip4']) { echo "\n"; DecodeMsg($nation['dip4'], $nation['dip4_type'], $nation['dip4_who'], $nation['dip4_when'], $bg, 4); }
-}
-
-function ShowMsg($bgcolor, $type, $picture, $imgsvr, $me, $mycolor, $you, $youcolor, $msg, $date, $num=0, $who=0, $when=0, $level=0, $note="") {
-    if($msg == "") return;
-
-    $msg = Tag2Code($msg);
-
-    $site = ""; $form = ""; $form2 = "";
-    if($type == 11 || ($type >= 4 && $type <= 8 && $level >= 5)) {
-        $corebutton = "&nbsp;<input type=submit name=ok value=수락 onclick='return confirm(\"정말 수락하시겠습니까?\")'><input type=submit name=ok value=거절 onclick='return confirm(\"정말 거절하시겠습니까?\")'>";
-    } else {
-        $corebutton = "&nbsp;【수락】【거절】";
-    }
-    if($type == 6) {
-        $corebutton .= "<br>비고: {$note}";
-    }
-    switch($type) {
-    case  1: $sign = ""; $corebutton = ""; break;
-    case  2: $sign = ""; $corebutton = ""; break;
-    case  3: $sign = ""; $corebutton = ""; break;
-    case  4: $sign = ""; $site = "d_surrender.php"; break;
-    case  5: $sign = ""; $site = "d_merge.php";     break;
-    case  6: $sign = ""; $site = "d_ally.php";      break;
-    case  7: $sign = ""; $site = "d_cease.php";     break;
-    case  8: $sign = ""; $site = "d_cancel.php";    break;
-    case  9: $sign = ""; $corebutton = ""; break;
-    case 10: $sign = ""; $corebutton = ""; break;
-    case 11: $sign = ""; $site = "d_scout.php"; break;
-    }
-    $imageTemp = GetImageURL($imgsvr);
-    $naming = "[<font color=$mycolor>$me</font>{$sign}<font color=$youcolor>$you</font>]";
-    $picture = "<img width='64' height='64' src={$imageTemp}/{$picture}>";
-    if($site != "") {
-        $form = "<form name=scout method=post action={$site}>";
-        $form2 = "</form>";
-    }
-    if($num >= 0) { $num = "<input type=hidden name=num value=$num>"; }
-    else { $num = ""; }
-    if($who > 0) { $who = "<input type=hidden name=gen value=$who>"; }
-    else { $who = ""; }
-    if($when > 0) { $when = "<input type=hidden name=when value=$when>"; }
-    else { $when = ""; }
-    echo "
-        <table width=498 border=1  bordercolordark=gray bordercolorlight=black cellpadding=0 cellspacing=0 bgcolor='$bgcolor' style=font-size:13px;table-layout:fixed;word-break:break-all;>
-            <tr>
-                <td width=64 height=64>$picture</td>
-                $form
-                <td width=434 valign=top><b>$naming</b><font size=1><$date></font> <br>{$msg}{$corebutton}</td>
-                $num
-                $who
-                $when
-                $form2
-            </tr>
-        </table>
-    ";
-}

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;
@@ -192,7 +191,15 @@ function processAI($no) {
 
     $query = "select nation,level,tech,gold,rice,rate,type,color,name,war from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error("processAI03 ".MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
+    $nation = MYDB_fetch_array($result)??[
+        'nation'=>0,
+        'color'=>'#000000',
+        'name'=>'재야',
+        'level'=>0,
+        'gold'=>0,
+        'rice'=>0,
+        'tech'=>0,
+    ];
 
     $coreCommand = array();
     if($general['level'] >= 5) {
@@ -261,6 +268,7 @@ function processAI($no) {
     }
 
     $tech = getTechCost($nation['tech']);
+    $resrc = $tech * 700;//XXX: 왜 700이지?
 
     if($general['atmos'] >= 90 && $general['train'] >= 90) {
         if($general['mode'] == 0) {
@@ -276,20 +284,26 @@ function processAI($no) {
 
     //운영자메시지 출력 하루 6번..?
     //특별 메세지 있는 경우 출력 하루 4번
-    switch($admin['turnterm']) {
-    case 0: $term = 1; break;
-    case 1: $term = 1; break;
-    case 2: $term = 2; break;
-    case 3: $term = 3; break;
-    case 4: $term = 6; break;
-    case 5: $term = 12; break;
-    case 6: $term = 30; break;
-    case 7: $term = 60; break;
-    }
-    if($general['npcid'] == 2000 && rand()%(24*$term) < 6) {
-        PushMsg(1, 0, $general['picture'], $general['imgsvr'], "{$general['name']}:", $nation['color'], $nation['name'], $nation['color'], $general['npcmsg']);
-    } elseif($general['npcmsg'] != "" && rand()%(24*$term) < 3) {
-        PushMsg(1, 0, $general['picture'], $general['imgsvr'], "{$general['name']}:", $nation['color'], $nation['name'], $nation['color'], $general['npcmsg']);
+    $term = $admin['turnterm'];
+    if($general['npcmsg'] && Util::randBool($term / (6*60))) {
+        $src = new MessageTarget(
+            $general['no'], 
+            $general['name'],
+            $general['nation'],
+            $nation['name'],
+            $nation['color'],
+            GetImageURL($general['imgsvr'], $general['picture'])
+        );
+        $msg = new Message(
+            Message::MSGTYPE_PUBLIC, 
+            $src,
+            $src,
+            $general['npcmsg'],
+            new \DateTime(),
+            new \DateTime('9999-12-31'),
+            []
+        );
+        $msg->send();
     }
 
     //재야인경우
@@ -464,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),"");
@@ -571,33 +585,98 @@ function processAI($no) {
                     if(rand() % 2 == 0) { $type = "gold"; $type2 = 1; }
                     else { $type = "rice"; $type2 = 2; }
 
-                    if($nation[$type] < 1000) {  // 몰수
+                    if($nation[$type] < $type2*3000) {  // 몰수
                         // 몰수 대상
-                        $query = "select no,{$type} from general where nation='{$general['nation']}' and no!='{$general['no']}' and {$type}>3000 order by {$type} desc limit 0,1";
-                        $result = MYDB_query($query, $connect) or Error("processAI10 ".MYDB_error($connect),"");
-                        $SelGen = MYDB_fetch_array($result);
-                        if($SelGen['no'] != 0) {
-                            $amount = intdiv($SelGen[$type], 5000)*10 + 10;
-                            if($amount > 100) $amount = 100;
+                        list($npcGenID, $npcGenValue) = $db->queryFirstList(
+                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND %b>3000 AND npc >= 2 ORDER BY %b DESC LIMIT 1',
+                            $type,
+                            $general['nation'],
+                            $general['no'],
+                            $type,
+                            $type
+                        );
+
+                        list($userGenID, $userGenValue) = $db->queryFirstList(
+                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND %b>3000 AND npc < 2 ORDER BY %b DESC LIMIT 1',
+                            $type,
+                            $general['nation'],
+                            $general['no'],
+                            $type,
+                            $type
+                        );
+
+                        if($npcGenID === null && $userGenID === null){
+                            $genID = 0;
+                            $genValue = 0;
+                        }
+                        else if($npcGenID === null || $userGenValue > $npcGenValue * 4){
+                            $genID = $userGenID;
+                            $genValue = $userGenValue;
+                        }
+                        else{
+                            $genID = $npcGenID;
+                            $genValue = $npcGenValue;
+                        }
+
+                        if($genID){
+                            $amount = min(100, intdiv($genValue, 5000)*10 + 10);
                             // 몰수
-                            $command = EncodeCommand($type2, $SelGen['no'], $amount, 24);    // 금,쌀 1000단위 몰수
+                            $command = EncodeCommand($type2, $genID, $amount, 24);    // 금,쌀 1000단위 몰수
                         }
                     } else {    // 포상
                         // 포상 대상
-                        $query = "select no from general where nation='{$general['nation']}' and no!='{$general['no']}' and killturn>=5 order by {$type} limit 0,1";
-                        $result = MYDB_query($query, $connect) or Error("processAI10 ".MYDB_error($connect),"");
-                        $SelGen = MYDB_fetch_array($result);
-                        if($SelGen['no'] != 0) {
-                            $amount = intdiv(($nation[$type]-GameConst::$baserice), 5000)*10 + 10;
-                            if($amount > 100) $amount = 100;
+                        list($npcGenID, $npcGenValue, $npcLeadership) = $db->queryFirstList(
+                            'SELECT `no`, %b, leader FROM general WHERE nation=%i AND `no`!=%i AND npc >= 2 AND killturn > 5 AND (leader >= 40 OR %b < %i) ORDER BY %b ASC LIMIT 1',
+                            $type,
+                            $general['nation'],
+                            $general['no'],
+                            $type,
+                            $resrc,
+                            $type
+                        );
+
+                        list($userGenID, $userGenValue) = $db->queryFirstList(
+                            'SELECT `no`, %b FROM general WHERE nation=%i AND `no`!=%i AND npc < 2 AND killturn > 5  AND (leader >= 40 OR %b < %i) ORDER BY %b ASC LIMIT 1',
+                            $type,
+                            $general['nation'],
+                            $general['no'],
+                            $type,
+                            ($type=='gold')?21000:3000,
+                            $type
+                        );
+
+                        if($npcGenID === null && $userGenID === null){
+                            $genID = 0;
+                        }
+                        else if($npcGenID === null || ($userGenValue !== null && $userGenValue < $npcGenValue * 3)){
+                            $genID = $userGenID;
+                        }
+                        else{
+                            $genID = $npcGenID;
+                        }
+
+                        if ($genID) {
+                            if($genID === $npcGenID){
+                                $amount = min(100, intdiv(($nation[$type]-($type=='rice'?(GameConst::$baserice):(GameConst::$basegold))), 5000)*10 + 10);
+                                if($npcLeadership < 40){
+                                    $amount = min($amount, intdiv($resrc, 1000)*10 + 10);
+                                }
+                                
+                            }
+                            else{
+                                $amount = min(100, intdiv(($nation[$type]-($type=='rice'?(GameConst::$baserice):(GameConst::$basegold))), 2000)*10 + 10);
+                            }
+                            
                             // 포상
-                            $command = EncodeCommand($type2, $SelGen['no'], $amount, 23);    // 금 1000단위 포상
+                            $command = EncodeCommand($type2, $genID, $amount, 23);    // 금,쌀 1000단위 포상
                         }
                     }
                 }
             }
-            $query = "update nation set l{$general['level']}turn0='$command' where nation='{$general['nation']}'";
-            MYDB_query($query, $connect) or Error("processAI09 ".MYDB_error($connect),"");
+            if(isset($command)){
+                $query = "update nation set l{$general['level']}turn0='$command' where nation='{$general['nation']}'";
+                MYDB_query($query, $connect) or Error("processAI09 ".MYDB_error($connect),"");
+            }
         }
     }
 
@@ -635,6 +714,41 @@ function processAI($no) {
             MYDB_query($query, $connect) or Error("processAI23 ".MYDB_error($connect),"");
             return;
         }
+
+        if($general['leader'] < 40){
+            //무지장인데
+            
+            if(
+                (($nation['rice'] - GameConst::$baserice) * 3 <= $general['rice'] && $general['rice'] >= $resrc + 2100) ||
+                ($general['rice'] >= 11000)
+            ){
+                //쌀을 많이 들고 있다면
+                $amount = $general['rice'] * 0.9;
+                $amount = intdiv(Util::valueFit($amount, $resrc + 700, 10000), 100);
+
+                $command = EncodeCommand(0, 2, $amount, 44);  //헌납
+                $db->update('general', [
+                    'turn0'=>$command
+                ], 'no=%i',$general['no']);
+                return;
+            }
+
+            if(
+                (($nation['gold'] - GameConst::$basegold) * 3 <= $general['gold'] && $general['gold'] >= $resrc + 2100) ||
+                ($general['gold'] >= 12000)
+            ){
+                //금을 많이 들고 있다면
+                $amount = $general['gold'] * 0.9;
+                $amount = intdiv(Util::valueFit($amount, $resrc + 700, 10000), 100);
+                
+                $command = EncodeCommand(0, 1, $amount, 44);  //헌납
+                $db->update('general', [
+                    'turn0'=>$command
+                ], 'no=%i',$general['no']);
+                return;
+            }
+        }
+
         //국가 병량이 없을때 바로 헌납
         if($nation['rice'] < 2000 && $general['rice'] > 200) {
             $amount = intdiv($general['rice'] - 200, 100) + 1;
@@ -653,7 +767,7 @@ function processAI($no) {
 //    ┃조┃        ┃쌀삼
 //   0┗━┻━━━━┻━━━> G
 //       100       700
-        $resrc = $tech * 700;
+        
         $target = array();
         // 평시거나 초반아니면서 공격가능 없으면서 병사 있으면 해제(25%)
         if($dipState == 0 && $isStart == 0 && $attackable == 0 && $general['crew'] > 0 && rand()% 100 < 25) {
@@ -663,11 +777,11 @@ function processAI($no) {
             if($general['gold'] + $general['rice'] < 200) { $command = EncodeCommand(0, 0, 0, 9); } //금쌀없으면 조달9
             elseif($general['rice'] > 100 && $city['rate'] < 95) { $command = EncodeCommand(0, 0, 0, 4); } //우선 선정
             elseif($general['gold'] < 100) {                                      //금없으면 쌀팜
-                $amount = intdiv(($general['rice'] - $general['gold']), 100 / 2);   // 100단위
+                $amount = intdiv(($general['rice'] - $general['gold'])/2, 100);   // 100단위
                 $command = EncodeCommand(0, 1, $amount, 49);                    //팜
             } elseif($general['gold'] < 700 && $general['rice'] < 700) { $command = EncodeCommand(0, 0, 0, 1); } //금쌀되면 내정
             elseif($general['rice'] < 100) {                                      //쌀없으면 쌀삼
-                $amount = intdiv(($general['gold'] - $general['rice']), 100 / 2);  // 100단위
+                $amount = intdiv(($general['gold'] - $general['rice'])/2, 100);  // 100단위
                 $command = EncodeCommand(0, 2, $amount, 49);                    //삼
             } elseif($genType >= 2) { $command = EncodeCommand(0, 0, 0, 1); } //내정장일때 내정
             else {
@@ -743,12 +857,12 @@ function processAI($no) {
                         else { $command = EncodeCommand(0, 0, 0, 1); }
                     } elseif($general['rice'] < $resrc && $general['rice'] <= $general['gold']) {
                         //금이 더 많으면 매매
-                        $amount = intdiv(($general['gold'] - $general['rice']), 100 / 2);  // 100단위
+                        $amount = intdiv(($general['gold'] - $general['rice']) / 2, 100);  // 100단위
                         if($amount > 0) { $command = EncodeCommand(0, 2, $amount, 49); }//삼
                         else { $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1); }   // 내정, 조달
                     } elseif($general['gold'] < $resrc && $general['rice'] > $general['gold']) {
                         //쌀이 더 많으면 매매
-                        $amount = intdiv(($general['rice'] - $general['gold']), 100 / 2);  // 100단위
+                        $amount = intdiv(($general['rice'] - $general['gold']) / 2, 100);  // 100단위
                         if($amount > 0) { $command = EncodeCommand(0, 1, $amount, 49); }//팜
                         else { $command = EncodeCommand(0, 0, 0, (rand()%2)*8 + 1); }   // 내정, 조달
                     //자원, 병사 모두 충족
@@ -777,11 +891,11 @@ function processAI($no) {
             elseif($general['rice'] > $resrc && $city['rate'] < 95 && $city['front'] == 0) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
             elseif($general['rice'] > $resrc && $city['rate'] < 50 && $city['front'] == 1) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
             elseif($general['gold'] < $resrc) {                                   // 금없으면 쌀팜
-                $amount = intdiv(($general['rice'] - $general['gold']), 100 / 2);   // 100단위
+                $amount = intdiv(($general['rice'] - $general['gold'])/2, 100);   // 100단위
                 if($amount > 0) { $command = EncodeCommand(0, 1, $amount, 49); }// 팜
                 else { $command = EncodeCommand(0, 0, 0, 9); }                  // 조달
             } elseif($general['rice'] < $resrc) {                                 // 쌀없으면 쌀삼
-                $amount = intdiv(($general['gold'] - $general['rice']), 100 / 2);   // 100단위
+                $amount = intdiv(($general['gold'] - $general['rice'])/2, 100);   // 100단위
                 if($amount > 0) { $command = EncodeCommand(0, 2, $amount, 49); }// 팜
                 else { $command = EncodeCommand(0, 0, 0, 9); }                  // 조달
             } elseif($genType >= 2) { $command = EncodeCommand(0, 0, 0, 1); } //내정장일때 내정
@@ -930,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

@@ -13,6 +13,9 @@ namespace sammo;
  * @return int|float 계산된 능력치
  */
 function getGeneralLeadership(&$general, $withInjury, $withItem, $withStatAdjust, $useFloor = true){
+	if($general === null){
+		return 0;
+	}
     $leadership = $general['leader'];
     if($withInjury){
         $leadership *= (100 - $general['injury']) / 100;
@@ -47,6 +50,9 @@ function getGeneralLeadership(&$general, $withInjury, $withItem, $withStatAdjust
  * @return int|float 계산된 능력치
  */
 function getGeneralPower(&$general, $withInjury, $withItem, $withStatAdjust, $useFloor = true){
+	if($general === null){
+		return 0;
+	}
     $power = $general['power'];
     if($withInjury){
         $power *= (100 - $general['injury']) / 100;
@@ -78,6 +84,10 @@ function getGeneralPower(&$general, $withInjury, $withItem, $withStatAdjust, $us
  * @return int|float 계산된 능력치
  */
 function getGeneralIntel(&$general, $withInjury, $withItem, $withStatAdjust, $useFloor = true){
+	if($general === null){
+		return 0;
+	}
+	
     $intel = $general['intel'];
     if($withInjury){
         $intel *= (100 - $general['injury']) / 100;
@@ -177,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 = [];
@@ -184,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"; }
@@ -278,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 = [];
@@ -285,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 = "기술 연구";
 
@@ -378,6 +386,7 @@ function process_3(&$general) {
 
 function process_4(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -385,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),"");
@@ -469,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 = [];
@@ -476,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"; }
@@ -521,7 +527,7 @@ function process_5(&$general, $type) {
         // 태수 보정
         if($general['level'] == 4 && $general['no'] == $city['gen1']) { $score *= 1.05; }
 
-        $rd = randF();
+        $rd = Util::randF();
         $r = CriticalRatioDomestic($general, 1);
         // 특기보정 : 수비, 축성
         if($type == 1 && $general['special'] == 11) { $r['succ'] += 0.1; $score *= 1.1; $admin['develcost'] *= 0.8; }
@@ -570,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 = [];
@@ -577,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),"");
@@ -661,6 +666,7 @@ function process_7(&$general) {
 
 function process_8(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -668,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";
 
@@ -760,6 +764,7 @@ function process_8(&$general) {
 
 function process_9(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -767,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),"");
@@ -850,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 = [];
@@ -860,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),"");
@@ -1006,7 +1008,7 @@ function process_11(&$general, $type) {
         $exp = $crew;
         $ded = $crew;
         // 숙련도 증가
-        addGenDex($general['no'], GameConst::$maxatmos, GameConst::$maxtrain, $armtype, $crew);
+        addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $armtype, $crew);
         // 성격 보정
         $exp = CharExperience($exp, $general['personal']);
         $ded = CharDedication($ded, $general['personal']);
@@ -1036,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 = [];
@@ -1043,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']);
 
@@ -1075,7 +1076,7 @@ function process_13(&$general) {
         $exp = 100;
         $ded = 70;
         // 숙련도 증가
-        addGenDex($general['no'], GameConst::$maxatmos, GameConst::$maxtrain, $general['crewtype'], Util::round($general['crew']/100));
+        addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $general['crewtype'], Util::round($general['crew']/100));
         // 성격 보정
         $exp = CharExperience($exp, $general['personal']);
         $ded = CharDedication($ded, $general['personal']);
@@ -1105,6 +1106,7 @@ function process_13(&$general) {
 
 function process_14(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1112,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']);
 
@@ -1139,14 +1139,14 @@ function process_14(&$general) {
 //    } elseif(intdiv($general['crewtype'], 10) == 4) {
 //        $log[] = "<C>●</>{$admin['month']}월:병기는 사기 진작이 불가능합니다. <1>$date</>";
     } else {
-        $score = Util::round(getGeneralLeadership($general, true, true, true)*100 / $general['crew'] * GameConst::$trainAtmos);
+        $score = Util::round(getGeneralLeadership($general, true, true, true)*100 / $general['crew'] * GameConst::$atmosDelta);
         $gold = $general['gold'] - Util::round($general['crew']/100);
 
         $log[] = "<C>●</>{$admin['month']}월:사기치가 <C>$score</> 상승했습니다. <1>$date</>";
         $exp = 100;
         $ded = 70;
         // 숙련도 증가
-        addGenDex($general['no'], GameConst::$maxatmos, GameConst::$maxtrain, $general['crewtype'], Util::round($general['crew']/100));
+        addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $general['crewtype'], Util::round($general['crew']/100));
         // 성격 보정
         $exp = CharExperience($exp, $general['personal']);
         $ded = CharDedication($ded, $general['personal']);
@@ -1167,6 +1167,7 @@ function process_14(&$general) {
 
 function process_15(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1174,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),"");
@@ -1221,7 +1220,7 @@ function process_15(&$general) {
         $exp = 100 * 3;
         $ded = 70 * 3;
         // 숙련도 증가
-        addGenDex($general['no'], GameConst::$maxatmos, GameConst::$maxtrain, $general['crewtype'], Util::round($general['crew']/100 * 3));
+        addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $general['crewtype'], Util::round($general['crew']/100 * 3));
         // 성격 보정
         $exp = CharExperience($exp, $general['personal']);
         $ded = CharDedication($ded, $general['personal']);
@@ -1240,6 +1239,7 @@ function process_15(&$general) {
 
 function process_16(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1247,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),"");
@@ -1309,7 +1307,7 @@ function process_16(&$general) {
         $query = "update city set state=43,term=3 where city='{$destcity['city']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         // 숙련도 증가
-        addGenDex($general['no'], GameConst::$maxatmos, GameConst::$maxtrain, $general['crewtype'], Util::round($general['crew']/100));
+        addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $general['crewtype'], Util::round($general['crew']/100));
         // 전투 처리
         $dead = processWar($general, $destcity);
 
@@ -1333,6 +1331,7 @@ function process_16(&$general) {
 
 function process_17(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1340,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</>";
@@ -1374,6 +1371,7 @@ function process_17(&$general) {
 
 function process_21(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1383,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];
@@ -1435,6 +1433,7 @@ function process_21(&$general) {
 
 function process_26(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1444,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),"");
@@ -1501,6 +1498,7 @@ function process_26(&$general) {
 
 function process_28(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1510,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']);
 
@@ -1567,6 +1563,7 @@ function process_28(&$general) {
 
 function process_30(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1574,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),"");
@@ -1635,6 +1630,7 @@ function process_30(&$general) {
 
 function process_31(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1643,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']);
@@ -1673,7 +1667,16 @@ function process_31(&$general) {
         $typecount = [];
         for($i=0; $i < $gencount; $i++) {
             $gen = MYDB_fetch_array($result);
-            if($gen['crew'] != 0) { $typecount[$gen['crewtype']]++; $crew += $gen['crew']; }
+            if($gen['crew'] != 0) {
+                if(!key_exists($gen['crewtype'], $typecount)){
+                    $typecount[$gen['crewtype']] = 1;
+                }
+                else{
+                    $typecount[$gen['crewtype']]+=1;
+                }
+                
+                $crew += $gen['crew'];
+            }
         }
         if(!key_exists($destination, $dist)) {
             $alllog[] = "<C>●</>{$admin['month']}월:누군가가 <G><b>{$city['name']}</b></>(을)를 살피는 것 같습니다.";
@@ -1689,13 +1692,9 @@ function process_31(&$general) {
             $log[] = "<C>●</>{$admin['month']}월:<G><b>{$city['name']}</b></>의 많은 정보를 얻었습니다. <1>$date</>";
             $msg[] = "【<S>병종</>】";
 
-            foreach(GameUnitConst::all() as $unit){
-                if($typecount[$unit->id] == 0){
-                    continue;
-                }
-
-                $unitStr = mb_substr($unit->name, 0, 2); 
-                $msg[] = "{$unitStr}:{$typecount[$unit->id]}";
+            foreach($typecount as $crewtype=>$cnt){
+                $crewtypeText = mb_substr(GameUnitConst::byID($crewtype)->name, 0, 2);
+                $msg[] = "{$crewtypeText}:{$cnt}";
             }
 
             $log[] = join(' ', $msg);
@@ -1743,6 +1742,9 @@ function process_31(&$general) {
         { 
             $cities = array_map('intval', explode("|", $nation['spy'])); 
         }
+        else{
+            $cities = [];
+        }
         $exist = 0;
         for($i=0; $i < count($cities); $i++) {
             if(intdiv($cities[$i], 10) == $destination) {
@@ -1768,6 +1770,7 @@ function process_31(&$general) {
 
 function process_41(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1775,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;
@@ -1803,7 +1804,7 @@ function process_41(&$general) {
     } elseif($crewexp == 0) {
         $log[] = "<C>●</>{$admin['month']}월:병사가 모자랍니다. 단련 실패. <1>$date</>";
     } else {
-        $type = intdiv($general['crewtype'], 10) * 10;
+        $type = intdiv($general['crewtype'], 10);
         switch($type) {
         case 0: $crewstr = '보병'; break;
         case 1: $crewstr = '궁병'; break;
@@ -1814,17 +1815,17 @@ function process_41(&$general) {
 
         if($ratio < 33) {
             // 숙련도 증가
-            addGenDex($general['no'], GameConst::$maxatmos, GameConst::$maxtrain, $general['crewtype'], $crewexp);
+            addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $general['crewtype'], $crewexp);
             $log[] = "<C>●</>{$admin['month']}월:$crewstr 숙련도 향상이 <span class='ev_failed'>지지부진</span>했습니다. <1>$date</>";
         } elseif($ratio < 66) {
             $exp = $exp * 2;
             // 숙련도 증가
-            addGenDex($general['no'], GameConst::$maxatmos, GameConst::$maxtrain, $general['crewtype'], $crewexp * 2);
+            addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $general['crewtype'], $crewexp * 2);
             $log[] = "<C>●</>{$admin['month']}월:$crewstr 숙련도가 향상되었습니다. <1>$date</>";
         } else {
             $exp = $exp * 3;
             // 숙련도 증가
-            addGenDex($general['no'], GameConst::$maxatmos, GameConst::$maxtrain, $general['crewtype'], $crewexp * 3);
+            addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $general['crewtype'], $crewexp * 3);
             $log[] = "<C>●</>{$admin['month']}월:$crewstr 숙련도가 <S>일취월장</>했습니다. <1>$date</>";
         }
 
@@ -1837,6 +1838,7 @@ function process_41(&$general) {
 
 function process_42(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1844,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;
@@ -2058,6 +2058,7 @@ function process_42(&$general) {
 
 function process_43(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $genlog = [];
@@ -2066,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];
@@ -2149,6 +2148,7 @@ function process_43(&$general) {
 
 function process_44(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2156,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),"");
@@ -2240,6 +2238,7 @@ function process_44(&$general) {
 
 function process_48(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2247,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']);
 
@@ -2348,6 +2345,7 @@ function process_48(&$general) {
 
 function process_49(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2356,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']);
 
@@ -2485,6 +2481,7 @@ function process_49(&$general) {
 
 function process_50(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2492,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;
@@ -2512,6 +2507,7 @@ function process_50(&$general) {
 
 function process_99(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2519,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),"");
@@ -173,7 +171,24 @@ function process_24(&$general) {
             case 4: $str = "몰수로 인한 사기 저하는 몰수로 얻은 물자보다 더 손해란걸 모른단 말인가!"; break;
             }
 
-            PushMsg(1, 0, $gen['picture'], $gen['imgsvr'], "{$gen['name']}:", $nation['color'], $nation['name'], $nation['color'], $str);
+            $src = new MessageTarget(
+                $gen['no'], 
+                $gen['name'],
+                $gen['nation'],
+                $nation['name'],
+                $nation['color'],
+                GetImageURL($gen['imgsvr'], $gen['picture'])
+            );
+            $msg = new Message(
+                Message::MSGTYPE_PUBLIC, 
+                $src,
+                $src,
+                $str,
+                new \DateTime(),
+                new \DateTime('9999-12-31'),
+                []
+            );
+            $msg->send();
         }
 
         $genlog[] = "<C>●</>$dtype {$amount}을 몰수 당했습니다.";
@@ -216,6 +231,7 @@ function process_24(&$general) {
 
 function process_27(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -232,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),"");
@@ -291,76 +305,93 @@ function process_27(&$general) {
 
 
 function process_51(&$general) {
+
     $db = DB::db();
-    $connect=$db->get();
-
-    $log = [];
-    $alllog = [];
-    $history = [];
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $date = substr($general['turntime'],11,5);
+    list($year, $month, $turnterm) = $gameStor->getValuesAsArray(['year','month','turnterm']);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
-
-    $query = "select nation,supply from city where city='{$general['city']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($result);
-
-    $query = "select name,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    $command = DecodeCommand($nation["l{$general['level']}turn0"]);
-    $which = $command[1];
-
-    $query = "select nation,name,dip0,dip0_type,dip0_who,dip0_when,dip1,dip1_type,dip1_who,dip1_when,dip2,dip2_type,dip2_who,dip2_when,dip3,dip3_type,dip3_who,dip3_when,dip4,dip4_type,dip4_who,dip4_when from nation where nation='$which'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $younation = MYDB_fetch_array($result);
-
-    if($younation['nation'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:멸망한 국가입니다. 권고 실패. <1>$date</>";
-    } elseif($general['level'] < 5) {
-        $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 권고 실패. <1>$date</>";
-    } elseif($city['nation'] != $general['nation']) {
-        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. 권고 실패. <1>$date</>";
-    } elseif($city['supply'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. 권고 실패. <1>$date</>";
-    } else {
-        $log[] = "<C>●</>{$admin['month']}월:<D><b>{$younation['name']}</b></>으로 항복 권고 서신을 보냈습니다.<1>$date</>";
-        $exp = 5;
-        $ded = 5;
-
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
-
-        // 상대에게 발송
-        //먼저 삭제된 칸 중 가장 오래된 칸 찾음
-        $deleted = 4;
-        for($i=0; $i < 5; $i++) {
-            if($younation["dip{$i}"] == "") { $deleted = $i; }
-        }
-        //기존 메세지 한칸씩 뒤로 미룸
-        for($i=$deleted-1; $i >=0; $i--) {
-            moveMsg("nation", "dip", $i+1, $younation["dip{$i}"], $younation["dip{$i}_type"], $younation["dip{$i}_who"], $younation["dip{$i}_when"], "nation", $younation['nation']);
-        }
-        //권고 서신시 장수번호/상대국 번호
-        $me = $general['no'] * 10000 + $younation['nation'];
-        $date = date('Y-m-d H:i:s');
-        $query = "update nation set dip0='{$nation['name']}의 항복 권고 서신',dip0_type='4',dip0_who='$me',dip0_when='$date' where nation='{$younation['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        $query = "update general set dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-//        $log = checkAbility($general, $log);
+    if($general['level'] < 5 || $general['nation']==0) {
+        pushGenLog($general, ["<C>●</>{$month}월:수뇌부가 아닙니다. 권고 실패. <1>$date</>"]);
+        return;
     }
 
-    pushGenLog($general, $log);
+    $supply = $db->queryFirstField('SELECT supply FROM city WHERE city=%i AND nation=%i', $general['city'], $general['nation']);
+    $myTurn = $db->queryFirstField('SELECT %b FROM nation WHERE nation=%i', "l{$general['level']}turn0", $general['nation']);
+    
+    $command = DecodeCommand($myTurn);
+    $which = $command[1];
+
+    $srcNation = getNationStaticInfo($general['nation']);
+    $destNation = getNationStaticInfo($which);
+
+    if($destNation['nation'] == 0) {
+        pushGenLog($general, ["<C>●</>{$month}월:멸망한 국가입니다. 권고 실패. <1>$date</>"]);
+        return;
+    } 
+    
+    if($supply === null) {
+        pushGenLog($general, ["<C>●</>{$month}월:아국이 아닙니다. 권고 실패. <1>$date</>"]);
+        return;
+    } 
+    
+    if($supply === 0) {
+        pushGenLog($general, ["<C>●</>{$month}월:고립된 도시입니다. 권고 실패. <1>$date</>"]);
+        return;
+    }
+    
+    $exp = 5;
+    $ded = 5;
+
+    // 성격 보정
+    $exp = CharExperience($exp, $general['personal']);
+    $ded = CharDedication($ded, $general['personal']);
+
+    // 상대에게 발송
+    $src = new MessageTarget(
+        $general['no'], 
+        $general['name'], 
+        $srcNation['nation'], 
+        $srcNation['name'], 
+        $srcNation['color'], 
+        GetImageURL($general['imgsvr'], $general['picture'])
+    );
+
+    $dest = new MessageTarget(
+        0,
+        '',
+        $destNation['nation'],
+        $destNation['name'],
+        $destNation['color']
+    );
+
+    $now = new \DateTime($date);
+    $validUntil = new \DateTime($date);
+    $validMinutes = max(30, $turnterm*3);
+    $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
+    
+    $msg = new DiplomaticMessage(
+        Message::MSGTYPE_DIPLOMACY,
+        $src,
+        $dest,
+        "{$srcNation['name']}의 항복 권고 서신",
+        $now,
+        $validUntil,
+        ['action'=>DiplomaticMessage::TYPE_SURRENDER]
+    );
+    $msg->send();
+
+    $db->update('general', [
+        'dedication'=>$db->sqleval('dedication+%i', $ded),
+        'experience'=>$db->sqleval('experience+%i', $exp)
+    ], 'no=%i', $general['no']);
+
+    pushGenLog($general, ["<C>●</>{$month}월:<D><b>{$destNation['name']}</b></>으로 항복 권고 서신을 보냈습니다.<1>$date</>"]);
 }
 
 function process_52(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -369,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),"");
@@ -473,159 +502,193 @@ function process_52(&$general) {
 
 function process_53(&$general) {
     $db = DB::db();
-    $connect=$db->get();
-
-    $log = [];
-    $alllog = [];
-    $history = [];
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $date = substr($general['turntime'],11,5);
+    list($year, $month, $turnterm) = $gameStor->getValuesAsArray(['year','month','turnterm']);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    if($general['level'] < 5 || $general['nation']==0) {
+        pushGenLog($general, ["<C>●</>{$month}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>"]);
+        return;
+    }
+    
+    $supply = $db->queryFirstField('SELECT supply FROM city WHERE city=%i AND nation=%i', $general['city'], $general['nation']);
+    $myTurn = $db->queryFirstField('SELECT %b FROM nation WHERE nation=%i', "l{$general['level']}turn0", $general['nation']);
 
-    $query = "select nation,supply from city where city='{$general['city']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($result);
-
-    $query = "select name,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    $command = DecodeCommand($nation["l{$general['level']}turn0"]);
+    $command = DecodeCommand($myTurn);
     $which = $command[1];
 
-    $query = "select nation,name,dip0,dip0_type,dip0_who,dip0_when,dip1,dip1_type,dip1_who,dip1_when,dip2,dip2_type,dip2_who,dip2_when,dip3,dip3_type,dip3_who,dip3_when,dip4,dip4_type,dip4_who,dip4_when from nation where nation='$which'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $younation = MYDB_fetch_array($result);
+    $srcNation = getNationStaticInfo($general['nation']);
+    $destNation = getNationStaticInfo($which);
 
-    if($younation['nation'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:멸망한 국가입니다. 제의 실패. <1>$date</>";
-    } elseif($general['level'] < 5) {
-        $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>";
-    } elseif($city['nation'] != $general['nation']) {
-        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. 제의 실패. <1>$date</>";
-    } elseif($city['supply'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. 제의 실패. <1>$date</>";
-    } else {
-        $log[] = "<C>●</>{$admin['month']}월:<D><b>{$younation['name']}</b></>(으)로 통합 제의 서신을 보냈습니다.<1>$date</>";
-        $exp = 5;
-        $ded = 5;
-
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
-
-        // 상대에게 발송
-        //먼저 삭제된 칸 중 가장 오래된 칸 찾음
-        $deleted = 4;
-        for($i=0; $i < 5; $i++) {
-            if($younation["dip{$i}"] == "") { $deleted = $i; }
-        }
-        //기존 메세지 한칸씩 뒤로 미룸
-        for($i=$deleted-1; $i >=0; $i--) {
-            moveMsg("nation", "dip", $i+1, $younation["dip{$i}"], $younation["dip{$i}_type"], $younation["dip{$i}_who"], $younation["dip{$i}_when"], "nation", $younation['nation']);
-        }
-        //권고 서신시 장수번호/상대국 번호
-        $me = $general['no'] * 10000 + $younation['nation'];
-        $date = date('Y-m-d H:i:s');
-        $query = "update nation set dip0='{$nation['name']}의 통합 제의 서신',dip0_type='5',dip0_who='$me',dip0_when='$date' where nation='{$younation['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        $query = "update general set dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-//        $log = checkAbility($general, $log);
+    if($destNation['nation'] == 0) {
+        pushGenLog($general, ["<C>●</>{$month}월:멸망한 국가입니다. 제의 실패. <1>$date</>"]);
+        return;
+    } 
+    
+    if($supply === null) {
+        pushGenLog($general, ["<C>●</>{$month}월:아국이 아닙니다. 제의 실패. <1>$date</>"]);
+        return;
     }
-    pushGenLog($general, $log);
+    
+    if($supply === 0) {
+        pushGenLog($general, ["<C>●</>{$month}월:고립된 도시입니다. 제의 실패. <1>$date</>"]);
+        return;
+    }
+
+    $exp = 5;
+    $ded = 5;
+
+    // 성격 보정
+    $exp = CharExperience($exp, $general['personal']);
+    $ded = CharDedication($ded, $general['personal']);
+
+    // 상대에게 발송
+    $src = new MessageTarget(
+        $general['no'], 
+        $general['name'], 
+        $srcNation['nation'], 
+        $srcNation['name'], 
+        $srcNation['color'], 
+        GetImageURL($general['imgsvr'], $general['picture'])
+    );
+
+    $dest = new MessageTarget(
+        0,
+        '',
+        $destNation['nation'],
+        $destNation['name'],
+        $destNation['color']
+    );
+
+    $now = new \DateTime($date);
+    $validUntil = new \DateTime($date);
+    $validMinutes = max(30, $turnterm*3);
+    $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
+    
+    $msg = new DiplomaticMessage(
+        Message::MSGTYPE_DIPLOMACY,
+        $src,
+        $dest,
+        "{$srcNation['name']}의 통합 제의 서신",
+        $now,
+        $validUntil,
+        ['action'=>DiplomaticMessage::TYPE_MERGE]
+    );
+    $msg->send();
+
+    $db->update('general', [
+        'dedication'=>$db->sqleval('dedication+%i', $ded),
+        'experience'=>$db->sqleval('experience+%i', $exp)
+    ], 'no=%i', $general['no']);
+
+    pushGenLog($general, ["<C>●</>{$month}월:<D><b>{$destNation['name']}</b></>(으)로 통합 제의 서신을 보냈습니다.<1>$date</>"]);
 }
 
 
 function process_61(&$general) {
     $db = DB::db();
-    $connect=$db->get();
-
-    $log = [];
-    $alllog = [];
-    $history = [];
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $date = substr($general['turntime'],11,5);
+    list($year, $month, $turnterm) = $gameStor->getValuesAsArray(['year','month','turnterm']);
 
-    $query = "select year,month,develcost,turnterm from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
-
-    $query = "select nation,supply from city where city='{$general['city']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($result);
-
-    $query = "select gold,rice,name,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    $command = DecodeCommand($nation["l{$general['level']}turn0"]);
-    $when = $command[2];
-    $which = $command[1];
-
-    if($when < 1) { $when = 1; }
-    elseif($when > 20) { $when = 20; }
-
-    $query = "select nation,name,dip0,dip0_type,dip0_who,dip0_when,dip1,dip1_type,dip1_who,dip1_when,dip2,dip2_type,dip2_who,dip2_when,dip3,dip3_type,dip3_who,dip3_when,dip4,dip4_type,dip4_who,dip4_when from nation where nation='$which'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $younation = MYDB_fetch_array($result);
-
-    if($younation['nation'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:멸망한 국가입니다. 제의 실패. <1>$date</>";
-    } elseif($general['level'] < 5) {
-        $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>";
-    } elseif($city['nation'] != $general['nation']) {
-        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. 제의 실패. <1>$date</>";
-    } elseif($city['supply'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. 제의 실패. <1>$date</>";
-    } else {
-        $log[] = "<C>●</>{$admin['month']}월:<D><b>{$younation['name']}</b></>으로 불가침 제의 서신을 보냈습니다.<1>$date</>";
-        $exp = 5;
-        $ded = 5;
-
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
-
-        // 상대에게 발송
-        //먼저 삭제된 칸 중 가장 오래된 칸 찾음
-        $deleted = 4;
-        for($i=0; $i < 5; $i++) {
-            if($younation["dip{$i}"] == "") { $deleted = $i; }
-        }
-        //기존 메세지 한칸씩 뒤로 미룸
-        for($i=$deleted-1; $i >=0; $i--) {
-            moveMsg("nation", "dip", $i+1, $younation["dip{$i}"], $younation["dip{$i}_type"], $younation["dip{$i}_who"], $younation["dip{$i}_when"], "nation", $younation['nation']);
-        }
-        //권고 서신시 장수번호/상대국 번호
-        $me = $general['no'] * 10000 + $younation['nation'];
-        $type = $when * 100 + 6;
-        $date = date('Y-m-d H:i:s');
-        $query = "update nation set dip0='{$nation['name']}의 {$when}년 불가침 제의 서신',dip0_type='$type',dip0_who='$me',dip0_when='$date' where nation='{$younation['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        // 3턴후
-        $date = addTurn($date, $admin['turnterm'], 3);
-        //조건 표시기한 설정
-        $query = "update diplomacy set showing='{$date}' where me='{$general['nation']}' and you='{$younation['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        // $admin['develcost']*10씩 차감
-//        $amount = $admin['develcost'];
-//        $query = "update nation set gold=gold-'$amount',rice=rice-'$amount' where nation='{$general['nation']}'";
-//        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        $query = "update general set dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-//        $log = checkAbility($general, $log);
+    if($general['level'] < 5 || $general['nation']==0) {
+        pushGenLog($general, ["<C>●</>{$month}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>"]);
+        return;
     }
-    pushGenLog($general, $log);
+
+    $supply = $db->queryFirstField('SELECT supply FROM city WHERE city=%i AND nation=%i', $general['city'], $general['nation']);
+    $myTurn = $db->queryFirstField('SELECT %b FROM nation WHERE nation=%i', "l{$general['level']}turn0", $general['nation']);
+
+    $command = DecodeCommand($myTurn);
+    $which = $command[1];
+    $when = Util::valueFit($command[2], 1, 20);
+
+    $srcNation = getNationStaticInfo($general['nation']);
+    $destNation = getNationStaticInfo($which);
+
+    if($destNation['nation'] == 0) {
+        pushGenLog($general, ["<C>●</>{$month}월:멸망한 국가입니다. 제의 실패. <1>$date</>"]);
+        return;
+    } 
+    
+    if($supply === null) {
+        pushGenLog($general, ["<C>●</>{$month}월:아국이 아닙니다. 제의 실패. <1>$date</>"]);
+        return;
+    }
+    
+    if($supply === 0) {
+        pushGenLog($general, ["<C>●</>{$month}월:고립된 도시입니다. 제의 실패. <1>$date</>"]);
+        return;
+    }
+    
+    $exp = 5;
+    $ded = 5;
+
+    // 성격 보정
+    $exp = CharExperience($exp, $general['personal']);
+    $ded = CharDedication($ded, $general['personal']);
+
+    // 상대에게 발송
+    $src = new MessageTarget(
+        $general['no'], 
+        $general['name'], 
+        $srcNation['nation'], 
+        $srcNation['name'], 
+        $srcNation['color'], 
+        GetImageURL($general['imgsvr'], $general['picture'])
+    );
+
+    $dest = new MessageTarget(
+        0,
+        '',
+        $destNation['nation'],
+        $destNation['name'],
+        $destNation['color']
+    );
+
+    $now = new \DateTime($date);
+    $validUntil = new \DateTime($date);
+    $validMinutes = max(30, $turnterm*3);
+    $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
+
+    //FIXME: 현재 command가 숫자로만 이루어져 있어서 문자열을 처리할 수 없다.
+    //XXX: 으악.
+    //TODO: 커맨드 처리 방식을 json으로 변경
+    $option = $db->queryFirstField('SELECT reserved FROM diplomacy WHERE me=%i AND you=%i', $src->nationID, $dest->nationID);
+
+    $msg = new DiplomaticMessage(
+        Message::MSGTYPE_DIPLOMACY,
+        $src,
+        $dest,
+        "{$srcNation['name']}의 {$when}년 불가침 제의 서신",
+        $now,
+        $validUntil,
+        [
+            'action'=>DiplomaticMessage::TYPE_NO_AGGRESSION,
+            'year'=>$when,
+            'option'=>$option
+        ]
+    );
+    $msg->send();
+
+    //NOTE: 현재 내무부 외교란의 비고는 diplomacy가 기준이니까 유지할 필요는 있다.
+    //FIXME: 외교란도 message란의 diplomacy를 참조하든가 하도록.
+    $db->update('diplomacy', [
+        'showing'=>$validUntil->format('Y-m-d H:i:s')
+    ], 'me=%i AND you=%i', $src->nationID, $dest->nationID);
+    // 3턴후
+
+    $db->update('general', [
+        'dedication'=>$db->sqleval('dedication+%i', $ded),
+        'experience'=>$db->sqleval('experience+%i', $exp)
+    ], 'no=%i', $general['no']);
+
+    pushGenLog($general, ["<C>●</>{$month}월:<D><b>{$destNation['name']}</b></>으로 불가침 제의 서신을 보냈습니다.<1>$date</>"]);
 }
 
 function process_62(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -633,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),"");
@@ -681,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</>";
@@ -710,11 +771,33 @@ function process_62(&$general) {
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
         //국메로 저장
-        $msg = "【외교】{$admin['year']}년 {$admin['month']}월:{$younation['name']}에 선전포고";
-        $youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:{$nation['name']}에서 선전포고";
+        $text = "【외교】{$admin['year']}년 {$admin['month']}월:{$nation['name']}에서 {$younation['name']}에 선전포고";
 
-        PushMsg(2, $nation['nation'], $general['picture'], $general['imgsvr'], "{$general['name']}:{$nation['name']}▶", $nation['color'], $younation['name'], $younation['color'], $msg);
-        PushMsg(3, $younation['nation'], $general['picture'], $general['imgsvr'], "{$general['name']}:{$nation['name']}▶", $nation['color'], $younation['name'], $younation['color'], $youmsg);
+        $src = new MessageTarget(
+            $general['no'], 
+            $general['name'],
+            $general['nation'],
+            $nation['name'],
+            $nation['color'],
+            GetImageURL($general['imgsvr'], $general['picture'])
+        );
+        $dest = new MessageTarget(
+            0,
+            '',
+            $younation['nation'],
+            $younation['name'],
+            $younation['color']
+        );
+        $msg = new Message(
+            Message::MSGTYPE_NATIONAL, 
+            $src,
+            $dest,
+            $text,
+            new \DateTime($general['turntime']),
+            new \DateTime('9999-12-31'),
+            []
+        );
+        $msg->send();
     }
 
     pushWorldHistory($history, $admin['year'], $admin['month']);
@@ -724,142 +807,175 @@ function process_62(&$general) {
 
 function process_63(&$general) {
     $db = DB::db();
-    $connect=$db->get();
-
-    $log = [];
-    $alllog = [];
-    $history = [];
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $date = substr($general['turntime'],11,5);
+    list($year, $month, $turnterm) = $gameStor->getValuesAsArray(['year','month','turnterm']);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    if($general['level'] < 5 || $general['nation']==0) {
+        pushGenLog($general, ["<C>●</>{$month}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>"]);
+        return;
+    }
 
-    $query = "select nation,supply from city where city='{$general['city']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($result);
+    $supply = $db->queryFirstField('SELECT supply FROM city WHERE city=%i AND nation=%i', $general['city'], $general['nation']);
+    $myTurn = $db->queryFirstField('SELECT %b FROM nation WHERE nation=%i', "l{$general['level']}turn0", $general['nation']);
 
-    $query = "select name,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    $command = DecodeCommand($nation["l{$general['level']}turn0"]);
+    $command = DecodeCommand($myTurn);
     $which = $command[1];
 
-    $query = "select nation,name,dip0,dip0_type,dip0_who,dip0_when,dip1,dip1_type,dip1_who,dip1_when,dip2,dip2_type,dip2_who,dip2_when,dip3,dip3_type,dip3_who,dip3_when,dip4,dip4_type,dip4_who,dip4_when from nation where nation='$which'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $younation = MYDB_fetch_array($result);
+    $srcNation = getNationStaticInfo($general['nation']);
+    $destNation = getNationStaticInfo($which);
 
-    if($younation['nation'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:멸망한 국가입니다. 제의 실패. <1>$date</>";
-    } elseif($general['level'] < 5) {
-        $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>";
-    } elseif($city['nation'] != $general['nation']) {
-        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. 제의 실패. <1>$date</>";
-    } elseif($city['supply'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. 제의 실패. <1>$date</>";
-    } else {
-        $log[] = "<C>●</>{$admin['month']}월:<D><b>{$younation['name']}</b></>으로 종전 제의 서신을 보냈습니다. <1>$date</>";
-        $exp = 5;
-        $ded = 5;
-
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
-
-        // 상대에게 발송
-        //먼저 삭제된 칸 중 가장 오래된 칸 찾음
-        $deleted = 4;
-        for($i=0; $i < 5; $i++) {
-            if($younation["dip{$i}"] == "") { $deleted = $i; }
-        }
-        //기존 메세지 한칸씩 뒤로 미룸
-        for($i=$deleted-1; $i >=0; $i--) {
-            moveMsg("nation", "dip", $i+1, $younation["dip{$i}"], $younation["dip{$i}_type"], $younation["dip{$i}_who"], $younation["dip{$i}_when"], "nation", $younation['nation']);
-        }
-        //권고 서신시 장수번호/상대국 번호
-        $me = $general['no'] * 10000 + $younation['nation'];
-        $date = date('Y-m-d H:i:s');
-        $query = "update nation set dip0='{$nation['name']}의 종전 제의 서신',dip0_type='7',dip0_who='$me',dip0_when='$date' where nation='{$younation['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        $query = "update general set dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-//        $log = checkAbility($general, $log);
+    if($destNation['nation'] == 0) {
+        pushGenLog($general, ["<C>●</>{$month}월:멸망한 국가입니다. 제의 실패. <1>$date</>"]);
+        return;
+    } 
+    
+    if($supply === null) {
+        pushGenLog($general, ["<C>●</>{$month}월:아국이 아닙니다. 제의 실패. <1>$date</>"]);
+        return;
     }
-    pushGenLog($general, $log);
+    
+    if($supply === 0) {
+        pushGenLog($general, ["<C>●</>{$month}월:고립된 도시입니다. 제의 실패. <1>$date</>"]);
+        return;
+    }
+    
+    $exp = 5;
+    $ded = 5;
+
+    // 성격 보정
+    $exp = CharExperience($exp, $general['personal']);
+    $ded = CharDedication($ded, $general['personal']);
+
+    // 상대에게 발송
+    $src = new MessageTarget(
+        $general['no'], 
+        $general['name'], 
+        $srcNation['nation'], 
+        $srcNation['name'], 
+        $srcNation['color'], 
+        GetImageURL($general['imgsvr'], $general['picture'])
+    );
+
+    $dest = new MessageTarget(
+        0,
+        '',
+        $destNation['nation'],
+        $destNation['name'],
+        $destNation['color']
+    );
+
+    $now = new \DateTime($date);
+    $validUntil = new \DateTime($date);
+    $validMinutes = max(30, $turnterm*3);
+    $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
+
+    $msg = new DiplomaticMessage(
+        Message::MSGTYPE_DIPLOMACY,
+        $src,
+        $dest,
+        "{$srcNation['name']}의 종전 제의 서신",
+        $now,
+        $validUntil,
+        ['action'=>DiplomaticMessage::TYPE_STOP_WAR]
+    );
+    $msg->send();
+
+    $db->update('general', [
+        'dedication'=>$db->sqleval('dedication+%i', $ded),
+        'experience'=>$db->sqleval('experience+%i', $exp)
+    ], 'no=%i', $general['no']);
+
+    pushGenLog($general, ["<C>●</>{$month}월:<D><b>{$destNation['name']}</b></>으로 종전 제의 서신을 보냈습니다. <1>$date</>"]);
 }
 
 function process_64(&$general) {
     $db = DB::db();
-    $connect=$db->get();
-
-    $log = [];
-    $alllog = [];
-    $history = [];
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $date = substr($general['turntime'],11,5);
+    list($year, $month, $turnterm) = $gameStor->getValuesAsArray(['year','month','turnterm']);
 
-    $query = "select year,month from game limit 1";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $admin = MYDB_fetch_array($result);
+    if($general['level'] < 5 || $general['nation']==0) {
+        pushGenLog($general, ["<C>●</>{$month}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>"]);
+        return;
+    }
 
-    $query = "select nation,supply from city where city='{$general['city']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($result);
+    $supply = $db->queryFirstField('SELECT supply FROM city WHERE city=%i AND nation=%i', $general['city'], $general['nation']);
+    $myTurn = $db->queryFirstField('SELECT %b FROM nation WHERE nation=%i', "l{$general['level']}turn0", $general['nation']);
 
-    $query = "select name,l{$general['level']}turn0 from nation where nation='{$general['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    $command = DecodeCommand($nation["l{$general['level']}turn0"]);
+    $command = DecodeCommand($myTurn);
     $which = $command[1];
 
-    $query = "select nation,name,dip0,dip0_type,dip0_who,dip0_when,dip1,dip1_type,dip1_who,dip1_when,dip2,dip2_type,dip2_who,dip2_when,dip3,dip3_type,dip3_who,dip3_when,dip4,dip4_type,dip4_who,dip4_when from nation where nation='$which'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $younation = MYDB_fetch_array($result);
+    $srcNation = getNationStaticInfo($general['nation']);
+    $destNation = getNationStaticInfo($which);
 
-    if($younation['nation'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:멸망한 국가입니다. 제의 실패. <1>$date</>";
-    } elseif($general['level'] < 5) {
-        $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 제의 실패. <1>$date</>";
-    } elseif($city['nation'] != $general['nation']) {
-        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. 제의 실패. <1>$date</>";
-    } elseif($city['supply'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. 제의 실패. <1>$date</>";
-    } else {
-        $log[] = "<C>●</>{$admin['month']}월:<D><b>{$younation['name']}</b></>으로 파기 제의 서신을 보냈습니다. <1>$date</>";
-        $exp = 5;
-        $ded = 5;
-
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
-
-        // 상대에게 발송
-        //먼저 삭제된 칸 중 가장 오래된 칸 찾음
-        $deleted = 4;
-        for($i=0; $i < 5; $i++) {
-            if($younation["dip{$i}"] == "") { $deleted = $i; }
-        }
-        //기존 메세지 한칸씩 뒤로 미룸
-        for($i=$deleted-1; $i >=0; $i--) {
-            moveMsg("nation", "dip", $i+1, $younation["dip{$i}"], $younation["dip{$i}_type"], $younation["dip{$i}_who"], $younation["dip{$i}_when"], "nation", $younation['nation']);
-        }
-        //권고 서신시 장수번호/상대국 번호
-        $me = $general['no'] * 10000 + $younation['nation'];
-        $date = date('Y-m-d H:i:s');
-        $query = "update nation set dip0='{$nation['name']}의 불가침 파기 서신',dip0_type='8',dip0_who='$me',dip0_when='$date' where nation='{$younation['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        $query = "update general set dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-//        $log = checkAbility($general, $log);
+    if($destNation['nation'] == 0) {
+        pushGenLog($general, ["<C>●</>{$month}월:멸망한 국가입니다. 제의 실패. <1>$date</>"]);
+        return;
+    } 
+    
+    if($supply === null) {
+        pushGenLog($general, ["<C>●</>{$month}월:아국이 아닙니다. 제의 실패. <1>$date</>"]);
+        return;
     }
-    pushGenLog($general, $log);
+    
+    if($supply === 0) {
+        pushGenLog($general, ["<C>●</>{$month}월:고립된 도시입니다. 제의 실패. <1>$date</>"]);
+        return;
+    }
+
+    $exp = 5;
+    $ded = 5;
+
+    // 성격 보정
+    $exp = CharExperience($exp, $general['personal']);
+    $ded = CharDedication($ded, $general['personal']);
+
+    // 상대에게 발송
+    $src = new MessageTarget(
+        $general['no'], 
+        $general['name'], 
+        $srcNation['nation'], 
+        $srcNation['name'], 
+        $srcNation['color'], 
+        GetImageURL($general['imgsvr'], $general['picture'])
+    );
+
+    $dest = new MessageTarget(
+        0,
+        '',
+        $destNation['nation'],
+        $destNation['name'],
+        $destNation['color']
+    );
+
+    $now = new \DateTime($date);
+    $validUntil = new \DateTime($date);
+    $validMinutes = max(30, $turnterm*3);
+    $validUntil->add(new \DateInterval("PT{$validMinutes}M"));
+
+    $msg = new DiplomaticMessage(
+        Message::MSGTYPE_DIPLOMACY,
+        $src,
+        $dest,
+        "{$srcNation['name']}의 불가침 파기 제의 서신",
+        $now,
+        $validUntil,
+        ['action'=>DiplomaticMessage::TYPE_CANCEL_NA]
+    );
+    $msg->send();
+
+    $db->update('general', [
+        'dedication'=>$db->sqleval('dedication+%i', $ded),
+        'experience'=>$db->sqleval('experience+%i', $exp)
+    ], 'no=%i', $general['no']);
+
+    pushGenLog($general, ["<C>●</>{$month}월:<D><b>{$destNation['name']}</b></>(으)로 불가침 파기 제의 서신을 보냈습니다.<1>$date</>"]);
 }
 
 function process_65(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -867,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),"");
@@ -954,6 +1068,7 @@ function process_65(&$general) {
 
 function process_66(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -962,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),"");
@@ -1044,6 +1157,7 @@ function process_66(&$general) {
 
 function process_67(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1052,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),"");
@@ -1135,6 +1247,7 @@ function process_67(&$general) {
 
 function process_68(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1143,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),"");
@@ -1238,6 +1349,7 @@ function process_68(&$general) {
 
 function process_71(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1247,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),"");
@@ -1344,6 +1454,7 @@ function process_71(&$general) {
 
 function process_72(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1353,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),"");
@@ -1459,6 +1568,7 @@ function process_72(&$general) {
 
 function process_73(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1468,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),"");
@@ -1590,6 +1698,7 @@ function process_73(&$general) {
 
 function process_74(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1599,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),"");
@@ -1734,6 +1841,7 @@ function process_74(&$general) {
 
 function process_75(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1743,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),"");
@@ -1860,6 +1966,7 @@ function process_75(&$general) {
 
 function process_76(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -1869,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),"");
@@ -2048,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']}'";
@@ -2079,6 +2183,7 @@ function process_76(&$general) {
 
 function process_77(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2088,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),"");
@@ -2207,6 +2310,7 @@ function process_77(&$general) {
 
 function process_78(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2216,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),"");
@@ -2332,6 +2434,7 @@ function process_78(&$general) {
 
 function process_81(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -2340,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),"");
@@ -46,14 +45,9 @@ function process_22(&$general) {
         $exp = CharExperience($exp, $general['personal']);
         $ded = CharDedication($ded, $general['personal']);
 
-        sendScoutMsg([
-            'id' => $general['no'],
-            'nation_id' => Util::array_get($general['nation'], 0)
-        ],[
-            'id' => $you['no'],
-            'nation_id' => Util::array_get($you['nation'], 0)
-        ],$date);
-
+        $msg = ScoutMessage::buildScoutMessage($general['no'], $who, $reason);
+        $msg->send(true);
+        
         $general['intel2']++;
         $query = "update general set resturn='SUCCESS',gold=gold-'$cost',intel2='{$general['intel2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -65,6 +59,7 @@ function process_22(&$general) {
 
 function process_25(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -72,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),"");
@@ -188,6 +181,7 @@ function process_25(&$general) {
 
 function process_29(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -195,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),"");
@@ -405,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']}'";
@@ -442,6 +433,7 @@ function process_29(&$general) {
 
 function process_45(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -449,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),"");
@@ -554,6 +544,7 @@ function process_45(&$general) {
 
 function process_46(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -561,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),"");
@@ -573,7 +562,7 @@ function process_46(&$general) {
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $gencount = MYDB_num_rows($result);
 
-    $query = "select nation from nation where name='{$general['makenation']}'";
+    $query = "select nation from nation where nation!={$general['nation']} AND name='{$general['makenation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $nationcount = MYDB_num_rows($result);
 
@@ -642,6 +631,7 @@ function process_46(&$general) {
 
 function process_47(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -649,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']);
 
@@ -707,6 +695,7 @@ function process_47(&$general) {
 
 function process_54(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -715,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];
@@ -773,6 +760,7 @@ function process_54(&$general) {
 
 function process_55(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -781,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),"");
@@ -862,6 +848,7 @@ function process_55(&$general) {
 
 function process_56(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -869,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']);
 
@@ -915,6 +900,7 @@ function process_56(&$general) {
 
 function process_57(&$general) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     $log = [];
@@ -923,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']);
@@ -57,7 +56,7 @@ function process_32(&$general) {
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $intelgen = MYDB_fetch_array($result);
 
-        $ratio = Util::round(((getGeneralIntel($general, true, true, true, false) - getGeneralIntel($intelgen, true, true, true, false)) / GameConst::$sabotageProbCoefByStat - ($destcity['secu']/$destcity['secu2'])/5 + GameConst::$defaultSabotageProb)*100);
+        $ratio = Util::round(((getGeneralIntel($general, true, true, true, false) - getGeneralIntel($intelgen, true, true, true, false)) / GameConst::$sabotageProbCoefByStat - ($destcity['secu']/$destcity['secu2'])/5 + GameConst::$sabotageDefaultProb)*100);
         $ratio2 = rand() % 100;
 
         if($general['item'] == 5) {
@@ -93,8 +92,8 @@ function process_32(&$general) {
             $alllog[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>(이)가 불타고 있습니다.";
             $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 화계가 성공했습니다. <1>$date</>";
 
-            $destcity['agri'] -= rand() % GameConst::$sabotageAmountCoef + GameConst::$defaultSabotageAmount;
-            $destcity['comm'] -= rand() % GameConst::$sabotageAmountCoef + GameConst::$defaultSabotageAmount;
+            $destcity['agri'] -= rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount;
+            $destcity['comm'] -= rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount;
             if($destcity['agri'] < 0) { $destcity['agri'] = 0; }
             if($destcity['comm'] < 0) { $destcity['comm'] = 0; }
             $query = "update city set state=32,agri='{$destcity['agri']}',comm='{$destcity['comm']}' where city='$destination'";
@@ -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']);
@@ -187,7 +185,7 @@ function process_33(&$general) {
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $powergen = MYDB_fetch_array($result);
 
-        $ratio = Util::round(((getGeneralPower($general, true, true, true, false) - getGeneralPower($powergen, true, true, true, false)) / GameConst::$sabotageProbCoefByStat - ($destcity['secu']/$destcity['secu2'])/5 + GameConst::$defaultSabotageProb)*100);
+        $ratio = Util::round(((getGeneralPower($general, true, true, true, false) - getGeneralPower($powergen, true, true, true, false)) / GameConst::$sabotageProbCoefByStat - ($destcity['secu']/$destcity['secu2'])/5 + GameConst::$sabotageDefaultProb)*100);
         $ratio2 = rand() % 100;
 
         if($general['item'] == 5) {
@@ -224,8 +222,8 @@ function process_33(&$general) {
             $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 탈취가 성공했습니다. <1>$date</>";
 
             // 탈취 최대 400 * 8
-            $gold = (rand() % GameConst::$sabotageAmountCoef + GameConst::$defaultSabotageAmount) * $destcity['level'];
-            $rice = (rand() % GameConst::$sabotageAmountCoef + GameConst::$defaultSabotageAmount) * $destcity['level'];
+            $gold = (rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount) * $destcity['level'];
+            $rice = (rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount) * $destcity['level'];
 
             $nation['gold'] -= $gold;
             $nation['rice'] -= $rice;
@@ -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']);
@@ -334,7 +331,7 @@ function process_34(&$general) {
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $powergen = MYDB_fetch_array($result);
 
-        $ratio = Util::round(((getGeneralPower($general, true, true, true, false) - getGeneralPower($powergen, true, true, true, false)) / GameConst::$sabotageProbCoefByStat - ($destcity['secu']/$destcity['secu2'])/5 + GameConst::$defaultSabotageProb)*100);
+        $ratio = Util::round(((getGeneralPower($general, true, true, true, false) - getGeneralPower($powergen, true, true, true, false)) / GameConst::$sabotageProbCoefByStat - ($destcity['secu']/$destcity['secu2'])/5 + GameConst::$sabotageDefaultProb)*100);
         $ratio2 = rand() % 100;
 
         if($general['item'] == 5) {
@@ -371,8 +368,8 @@ function process_34(&$general) {
             $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 파괴가 성공했습니다. <1>$date</>";
 
             // 파괴
-            $destcity['def'] -= rand() % GameConst::$sabotageAmountCoef + GameConst::$defaultSabotageAmount;
-            $destcity['wall'] -= rand() % GameConst::$sabotageAmountCoef + GameConst::$defaultSabotageAmount;
+            $destcity['def'] -= rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount;
+            $destcity['wall'] -= rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount;
             if($destcity['def'] < 100) { $destcity['def'] = 100; }
             if($destcity['wall'] < 100) { $destcity['wall'] = 100; }
             $query = "update city set state=34,def='{$destcity['def']}',wall='{$destcity['wall']}' where city='$destination'";
@@ -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']);
@@ -462,7 +458,7 @@ function process_35(&$general) {
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $gen = MYDB_fetch_array($result);
 
-        $ratio = Util::round(((getGeneralLeadership($general, true, true, true) - getGeneralLeadership($gen, true, true, true)) / GameConst::$sabotageProbCoefByStat - ($destcity['secu']/$destcity['secu2'])/5 + GameConst::$defaultSabotageProb)*100);
+        $ratio = Util::round(((getGeneralLeadership($general, true, true, true) - getGeneralLeadership($gen, true, true, true)) / GameConst::$sabotageProbCoefByStat - ($destcity['secu']/$destcity['secu2'])/5 + GameConst::$sabotageDefaultProb)*100);
         $ratio2 = rand() % 100;
 
         if($general['item'] == 5) {
@@ -499,8 +495,8 @@ function process_35(&$general) {
             $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 선동이 성공했습니다. <1>$date</>";
 
             // 선동 최대 10
-            $destcity['secu'] -= rand() % Util::round(GameConst::$sabotageAmountCoef/2) + GameConst::$defaultSabotageAmount;
-            $destcity['rate'] -= rand() % Util::round(GameConst::$sabotageAmountCoef/50) + GameConst::$defaultSabotageAmount/50;
+            $destcity['secu'] -= rand() % Util::round(GameConst::$sabotageAmountCoef/2) + GameConst::$sabotageDefaultAmount;
+            $destcity['rate'] -= rand() % Util::round(GameConst::$sabotageAmountCoef/50) + GameConst::$sabotageDefaultAmount/50;
             if($destcity['secu'] < 0) { $destcity['secu'] = 0; }
             if($destcity['rate'] < 0) { $destcity['rate'] = 0; }
             $query = "update city set state=32,rate='{$destcity['rate']}',secu='{$destcity['secu']}' where city='$destination'";

hwe/func_string.php

@@ -27,7 +27,7 @@ function Tag2Code(string $str) {
 function BadTag2Code(string $str) {
     /* FIXME: 제대로된 tag 변환 코드 사용 */
     $str = str_replace("<script", "<sorry", $str);
-    $str = str_replace("<embed", "<sorry", $str);
+    $str = str_replace("</script", "</sorry", $str);
     return $str;
 }
 

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 = "빙의일람";
@@ -75,7 +77,13 @@ function allButton() {
         $call = "설문조사";
     }
 
-    $templates = new \League\Plates\Engine('templates');
+    if(\file_exists("d_setting/templates/allButton.php")){
+        $templates = new \League\Plates\Engine('d_setting/templates');
+    }
+    else{
+        $templates = new \League\Plates\Engine('templates');
+    }
+    
 
     return $templates->render('allButton', [
         'call' => $call,
@@ -95,10 +103,12 @@ function commandButton() {
     $db = DB::db();
     $me = $db->queryFirstRow("select no,nation,level,belong from general where owner=%i", $userID);
 
-    $nation = $db->queryFirstRow("select nation,color,secretlimit from nation where nation=%i",$me['nation']);
-
-    if($nation['color'] == "") { $nation['color'] = "#000000"; }
-
+    $nation = $db->queryFirstRow("select nation,level,color,secretlimit from nation where nation=%i",$me['nation'])??[
+        'nation'=>0,
+        'level'=>0,
+        'secretlimit'=>99,
+        'color'=>'#000000'
+    ];
 
     $bgColor = Util::array_get($nation['color'])?:'#000000';
     $fgColor = newColor($bgColor);
@@ -108,6 +118,9 @@ function commandButton() {
     if($me['level'] >= 2){
         $showSecret = true;
     }
+    else if($me['level']== 0){
+        $showSecret = false;
+    }
     else if($me['belong'] >= $nation['secretlimit']){
         $showSecret = true;
     }
@@ -116,11 +129,44 @@ function commandButton() {
         'bgColor'=>$bgColor,
         'fgColor'=>$fgColor,
         'meLevel'=>$me['level'],
+        'nationLevel'=>$nation['level'],
         'showSecret'=>$showSecret
     ]);
 }
 
+function formatWounded(int $value, int $wound): string{
+    if($wound == 0){
+        return "$value";
+    }
+    $woundedValue = intdiv($value * (100 - $wound), 100);
+    return "<font color=red>$woundedValue</font>";
+}
 
+function formatDefenceMode(int $value): string{
+    switch($value) {
+    case 0: return "×"; break;
+    case 1: return "○"; break;
+    case 2: return "◎"; break;
+    }
+    return '??';
+}
+
+function formatLeadershipBonus(int $value): string{
+    if($value == 0){
+        return '';
+    }
+    return "<font color=cyan>+{$value}</font>";
+}
+
+function formatName(string $name, int $npc): string{
+    if($npc==1){
+        $name = "<font color='skyblue'>$name</font>";
+    }
+    else if($npc>1){
+        $name = "<font color='cyan'>$name</font>";
+    }
+    return $name;
+}
 
 function getMapHtml(){
     //NOTE: 필요한가?

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,30 @@ 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;
     case 3: $str = "경기당 3분"; break;
@@ -130,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;
@@ -169,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) {
@@ -230,6 +232,7 @@ function printFighting($tournament, $phase) {
 
 function startTournament($auto, $type) {
     $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
     eraseTnmtFightLogAll();
@@ -245,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";
@@ -268,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'] = "무명장수";
@@ -292,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);
 
@@ -307,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]')";
@@ -326,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 경기없음
@@ -375,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);
@@ -384,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";
@@ -415,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 배정
@@ -443,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++) {
@@ -464,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);
@@ -473,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";
@@ -492,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++) {
@@ -504,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
@@ -522,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) {
@@ -540,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),"");
@@ -553,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 = [];
@@ -655,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']}";
@@ -692,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);
 
     //당첨칸에 베팅한 사람들만
@@ -714,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);
@@ -732,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) {
@@ -18,7 +19,7 @@ if (!$userID) {
 }
 
 $me = $db->queryFirstRow(
-    'SELECT no,con,turntime,newmsg,newvote,map from general where owner = %i',
+    'SELECT no,con,turntime,newmsg,newvote,`level` from general where owner = %i',
     $userID
 );
 
@@ -39,61 +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>메인</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}'
-    });
-});
-</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 = "표준";
@@ -114,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>";
@@ -191,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 "
@@ -211,11 +213,19 @@ if ($session->userGrade >= 5) {
     </td></tr>
 ";
 }
+else if($session->userGrade == 4){
+    echo "
+    <tr><td colspan=5>
+        <input type=button value=시뮬 onclick=window.open('_simul.php')>
+        <input type=button value=119 onclick=window.open('_119.php')>
+    </td></tr>
+";
+}
 
 ?>
 
 </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()?>
@@ -225,7 +235,7 @@ if ($session->userGrade >= 5) {
 <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>
@@ -247,31 +257,31 @@ if ($session->userGrade >= 5) {
         </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('logout_process.php')><br>
+            <input id="mainBtnSubmit" type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px; value='실 행' onclick='refreshing(this, 3,form2)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px; value='갱 신' onclick='refreshing(this, 0,0)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;font-size:13px; value='로비로' onclick=location.replace('../')><br>
         </td>
     </tr>
 </form>
 </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">
@@ -282,25 +292,23 @@ if ($session->userGrade >= 5) {
 
     </select>
     <input type="textarea" id="msg_input" maxlength="99">
-    <button id="msg_submit">서신전달&amp;갱신</button>
+    <button id="msg_submit">서신전달&amp;갱신</button><br>
+    내용 없이 '서신전달&amp;갱신'을 누르면 메세지창이 갱신됩니다.
 </div>
-<div id="message_board">
-    <div class="board_side">
+<div><?=allButton()?></div>
+<div id="message_board"><div style="left:0;" class="board_side bg0">
         <div class="board_header bg0">전체 메시지(최고99자)</div>
         <section class="public_message"></section>
         <div class="board_header bg0">개인 메시지(최고99자)</div>
         <section class="private_message"></section>
-    </div>
-    <div class="board_side">
+    </div><div style="right:0;" class="board_side bg0">
         <section class="diplomacy_message">
 
         </section>
         <div class="board_header bg0">국가 메시지(최고99자)</div>
         <section class="national_message"></section>
-    </div>
-</div>
+ </div></div>
 <div style="clear:left;"><?=allButton()?><?=banner()?></div>
-<?php PrintElapsedTime(); ?>
 </div>
 <?php
 if ($con == 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;">
@@ -155,15 +155,54 @@ if($session->userGrade < 5){
                                     <input type="radio" name="show_img_level" value="1">전콘
                                 </label>
                                 <label class="btn btn-secondary active">
-                                    <input type="radio" name="show_img_level" value="2" checked>전콘, 병종
+                                    <input type="radio" name="show_img_level" value="2">전콘, 병종
                                 </label>
                                 <label class="btn btn-secondary">
-                                    <input type="radio" name="show_img_level" value="3">전콘, 병종, NPC
+                                    <input type="radio" name="show_img_level" value="3" checked>전콘, 병종, NPC
                                 </label>
                             </div>
                         </div>
                     </div>
 
+                    <div class="form-group row">
+                        <label for="tournament_trig" class="col-sm-3 col-form-label">토너먼트 자동 시작<br>경기 단위</label>
+                        <div class="col-sm-9" id="tournament_trig">
+                            <div id="tournament_trig" class="btn-group-toggle btn-group flex-wrap" data-toggle="buttons">
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="0">안함
+                                </label>
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="1">12분(총 5일)
+                                </label>
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="2">7분(총 10시간)
+                                </label>
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="3">3분(총 4시간)
+                                </label>
+                                <label class="btn btn-secondary w-25 active">
+                                    <input type="radio" name="tournament_trig" value="4" checked>1분(총 82분)
+                                </label>
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="5">30초(총 41분)
+                                </label>
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="6">15초(총 21분)
+                                </label>
+                                <label class="btn btn-secondary w-25">
+                                    <input type="radio" name="tournament_trig" value="7">5초(총 7분)
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group row">
+                        <label for="reserve_open" class="col-sm-3 col-form-label">오픈 예약</label>
+                        <div class="col-sm-9">
+                            <input type="text" class="form-control" name="reserve_open" id="reserve_open"  placeholder="YYYY-MM-DD hh:mm" value="" />
+                        </div>
+                    </div>
+
                     <div class="form-group row">
                         <div class="col-sm-3"></div>
                         <div class="col-sm-9">

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_adjust_icon.php

@@ -9,7 +9,7 @@ $userID = Session::getUserID();
 $rootDB = RootDB::db();
 $db = DB::db();
 
-$image = $rootDB->queryFirstRow('SELECT picture, imgsvr FROM `MEMBER` WHERE no = %i', $userID);
+$image = $rootDB->queryFirstRow('SELECT picture, imgsvr FROM `member` WHERE no = %i', $userID);
 
 if(!$image){
     Json::die([

hwe/j_autoreset.php

@@ -0,0 +1,89 @@
+<?php
+namespace sammo;
+
+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){
+    Json::die([
+        'result'=>true,
+        'affected'=>0,
+        'status'=>'no_reserved'
+    ]);
+}
+
+$reservedDate = new \DateTime($reserved['date']);
+$now = new \DateTime();
+
+
+$status = 'not_yet';
+
+list($isUnited, $lastTurn) = $gameStor->getValues(['isUnited', 'turntime']);
+if($isUnited === null || $lastTurn === null){
+    $isUnited = 2;
+    $lastTurn = '2000-01-01';
+}
+
+if($lastTurn !== null){
+    $lastTurn = new \DateTime($lastTurn);
+}
+
+if($lastTurn === null){
+    //이미 리셋된 상태임
+}
+else if(file_exists(__dir__.'/.htaccess')){
+    //일단 서버는 닫혀 있음
+}
+else if(
+    $isUnited == 2 &&
+    $now->getTimestamp() - $lastTurn->getTimestamp() > $reservedDate->getTimestamp() - $now->getTimestamp()
+){
+    //정지 상태 & 중간 넘음
+    AppConf::getList()[DB::prefix()]->closeServer();
+    $status = 'closed';
+}
+else if(
+    $isUnited > 0 && 
+    $now->getTimestamp() - $lastTurn->getTimestamp() > ($reservedDate->getTimestamp() - $now->getTimestamp()) * 2
+){
+    //천통 & 비정지 상태 & 2/3 넘음
+    AppConf::getList()[DB::prefix()]->closeServer();
+    $status = 'closed';
+}
+else if($reservedDate->getTimestamp() - $now->getTimestamp() <= 60*10){
+    //어쨌든 간에 10분 남았다면.
+    AppConf::getList()[DB::prefix()]->closeServer();
+    $status = 'closed';
+}
+
+if($now < $reservedDate){
+    Json::die([
+        'result'=>true,
+        'affected'=>0,
+        'status'=>$status
+    ]);
+}
+
+$options = Json::decode($reserved['options']);
+
+$result = ResetHelper::buildScenario(
+    $options['turnterm'],
+    $options['sync'],
+    $options['scenario'],
+    $options['fiction'],
+    $options['extend'],
+    $options['npcmode'],
+    $options['show_img_level'],
+    $options['tournament_trig']
+);
+
+$result['affected']=1;
+
+$prefix = DB::prefix();
+AppConf::getList()[$prefix]->openServer();
+
+Json::die($result);

hwe/j_basic_info.php

@@ -19,5 +19,6 @@ if(!$generalInfo){
 $result['generalID'] = $generalInfo['no'];
 $result['myNationID'] = $generalInfo['nation'];
 $result['isChief'] = ($generalInfo['level'] == 12);
+$result['generalLevel'] = $generalInfo['level'];
 
 Json::die($result);

hwe/j_get_select_npc_token.php

@@ -0,0 +1,170 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+const VALID_SECOND = 90;
+const PICK_MORE_SECOND = 10;
+const KEEP_CNT = 3;
+
+
+$refresh = Util::getReq('refresh', 'bool', false);
+$keepResult = Util::getReq('keep', 'array_int', []);
+
+$session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
+
+
+$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){
+    Json::die([
+        'result'=>false,
+        'reason'=>'이미 장수가 생성되었습니다'
+    ]);
+}
+
+list(
+    $maxgeneral,
+    $turnterm,
+    $npcmode
+) = $gameStor->getValuesAsArray(['maxgeneral', 'turnterm', 'npcmode']);
+
+if(!$npcmode){
+    Json::die([
+        'result'=>false,
+        'reason'=>'빙의 가능한 서버가 아닙니다'
+    ]);
+}
+
+$token = $db->queryFirstRow('SELECT * FROM select_npc_token WHERE `owner`=%i AND `valid_until`>=%s', $userID, $now);
+$pickResult = [];
+
+
+if($token && $refresh){
+    $pickMoreFrom = (new \DateTime($token['pick_more_from']))->getTimestamp();
+    $nowT = $oNow->getTimestamp();
+
+    if($nowT >= $pickMoreFrom){
+        $oldPickResult = Json::decode($token['pick_result']);
+
+        foreach($keepResult as $keepId){
+            if(\key_exists($keepId, $oldPickResult) && $oldPickResult[$keepId]['keepCnt'] > 0){
+                $pickResult[$keepId] = $oldPickResult[$keepId];
+                $pickResult[$keepId]['keepCnt']-=1;
+            }
+        }
+
+        if(count($pickResult) == count($oldPickResult)){
+            $refresh = false;
+        }
+    }
+    else{
+        Json::die([
+            'result'=>false,
+            'reason'=>'아직 다시 뽑을 수 없습니다',
+        ]);
+    }
+}
+
+if($token && !$refresh){
+    $pickMoreFrom = (new \DateTime($token['pick_more_from']))->getTimestamp();
+    $nowT = $oNow->getTimestamp();
+
+    Json::die([
+        'result'=>true,
+        'pick'=>Json::decode($token['pick_result']),
+        'pickMoreFrom'=>$token['pick_more_from'],
+        'pickMoreSeconds'=>$pickMoreFrom-$nowT,
+        'validUntil'=>$token['valid_until']
+    ]);
+}
+
+$candidates = [];
+
+$weight = [];
+foreach($db->query('SELECT `no`, `name`, leader, power, intel, imgsvr, picture, special, special2 FROM general WHERE npc=2') as $general){
+    $general['special'] = \sammo\SpecialityConst::DOMESTIC[$general['special']][0]??'-';
+    $general['special2'] = \sammo\SpecialityConst::WAR[$general['special2']][0]??'-';
+    $candidates[$general['no']] = $general + ['keepCnt'=>KEEP_CNT];
+    $allStat = $general['leader'] + $general['power'] + $general['intel'];
+    $weight[$general['no']] = pow($allStat, 1.5);
+}
+
+foreach($db->queryFirstColumn('SELECT pick_result FROM select_npc_token WHERE `owner`!=%i AND valid_until >=%s', $userID, $now) as $reserved){
+    $reserved = Json::decode($reserved);
+    foreach(array_keys($reserved) as $reservedNPC){
+        if(key_exists($reservedNPC, $weight)){
+            unset($candidates[$reservedNPC]);
+            unset($weight[$reservedNPC]);
+        }
+    }
+}
+
+$pickLimit = min(count($candidates), 5);
+
+while(count($pickResult) < $pickLimit){
+    $generalID = Util::choiceRandomUsingWeight($weight);
+    if(!key_exists($generalID, $pickResult)){
+        $pickResult[$generalID] = $candidates[$generalID];
+    }
+}
+
+$newNonce = mt_rand(0, 0xfffffff);
+
+$validSecond = max(VALID_SECOND, $turnterm*40);
+$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)));
+
+$db->delete('select_npc_token', 'valid_until < %s', $now);
+
+$inserted = 0;
+
+if($token){
+    $db->update('select_npc_token', [
+        'valid_until'=>$validUntil->format('Y-m-d H:i:s'),
+        'pick_more_from'=>$pickMoreFrom->format('Y-m-d H:i:s'),
+        'pick_result'=>Json::encode($pickResult),
+        'nonce'=>$newNonce
+    ], 'owner = %i AND nonce = %i', $userID, $token['nonce']);
+    if($db->affectedRows()){
+        $inserted = -1;
+    }
+}
+else{
+    $db->insertIgnore('select_npc_token', [
+        'owner'=>$userID,
+        'valid_until'=>$validUntil->format('Y-m-d H:i:s'),
+        'pick_more_from'=>'2000-01-01 01:00:00',
+        'pick_result'=>Json::encode($pickResult),
+        'nonce'=>$newNonce
+    ]);
+
+    if($db->affectedRows()){
+        $inserted = 1;
+    }
+}
+
+if($inserted === 0){
+    Json::die([
+        'result'=>false,
+        'reason'=>'중복 요청, 다시 랜덤 토큰을 확인해주세요'
+    ]);
+}
+
+Json::die([
+    'result'=>true,
+    'pick'=>$pickResult,
+    'pickMoreFrom'=>($inserted===-1)?$pickMoreFrom->format('Y-m-d H:i:s'):'2000-01-01 01:00:00',
+    'pickMoreSeconds'=>($inserted===-1)?$pickMoreSecond:0,
+    'validUntil'=>$validUntil->format('Y-m-d H:i:s')
+]);

hwe/j_install.php

@@ -28,7 +28,8 @@ $v->rule('required', [
     'fiction',
     'extend',
     'npcmode',
-    'show_img_level'
+    'show_img_level',
+    'tournament_trig'
 ]);
 if(!$v->validate()){
     Json::die([
@@ -44,173 +45,56 @@ $fiction = (int)$_POST['fiction'];
 $extend = (int)$_POST['extend'];
 $npcmode = (int)$_POST['npcmode'];
 $show_img_level = (int)$_POST['show_img_level'];
+$tournament_trig = (int)$_POST['tournament_trig'];
 
-if(120 % $turnterm != 0){
-    Json::die([
-        'result'=>false,
-        'reason'=>'turnterm은 120의 약수여야 합니다.'
-    ]);
-}
+$reserve_open = Util::getReq('reserve_open');
+if($reserve_open){
+    $reserve_open = new \DateTime($reserve_open);
+    $db = DB::db();
+    
+    if (!$db->queryFirstField("SHOW TABLES LIKE 'storage'")) {
+        $clearResult = ResetHelper::clearDB();
+        if(!$clearResult['result']){
+            Json::die($clearResult);
+        }
+    }
 
-if(!file_exists(__dir__.'/logs') || !file_exists(__dir__.'/data')){
-    if(!is_writable(__dir__)){
+    if (!$db->queryFirstField("SHOW TABLES LIKE 'reserved_open'")) {
         Json::die([
             'result'=>false,
-            'reason'=>'logs, data 디렉토리를 생성할 권한이 없습니다.'
+            'reason'=>'예약 테이블이 없음!'
         ]);
     }
-    mkdir(__dir__.'/logs', 0644);
-    mkdir(__dir__.'/data', 0644);
-}
 
-if(!is_writable(__dir__.'/logs')){
+    $scenarioObj = new Scenario($scenario, true);
+    $db->delete('reserved_open', true);
+    $db->insert('reserved_open', [
+        'options'=>Json::encode([
+            'turnterm'=>$turnterm,
+            'sync'=>$sync,
+            'scenario'=>$scenario,
+            'scenarioName'=>$scenarioObj->getTitle(),
+            'fiction'=>$fiction,
+            'extend'=>$extend,
+            'npcmode'=>$npcmode,
+            'show_img_level'=>$show_img_level,
+            'tournament_trig'=>$tournament_trig
+        ]),
+        'date'=>$reserve_open->format('Y-m-d H:i:s')
+    ]);
     Json::die([
-        'result'=>false,
-        'reason'=>'logs 디렉토리의 쓰기 권한이 없습니다'
+        'result'=>true,
+        'reason'=>'예약'
     ]);
 }
 
-if(!is_writable(__dir__.'/data')){
-    Json::die([
-        'result'=>false,
-        'reason'=>'data 디렉토리의 쓰기 권한이 없습니다'
-    ]);
-}
-
-if(!is_writable(__dir__.'/d_setting')){
-    Json::die([
-        'result'=>false,
-        'reason'=>'d_setting 디렉토리의 쓰기 권한이 없습니다'
-    ]);
-}
-
-if(!file_exists(__dir__.'/logs/.htaccess')){
-    @file_put_contents(__dir__.'/logs/.htaccess', 'Deny from  all');
-}
-
-if(!file_exists(__dir__.'/data/.htaccess')){
-    @file_put_contents(__dir__.'/data/.htaccess', 'Deny from  all');
-}
-
-
-$db = DB::db();
-$mysqli_obj = $db->get();
-
-
-$scenarioObj = new Scenario($scenario, false);
-$startyear = $scenarioObj->getYear();
-
-FileUtil::delInDir("logs");
-FileUtil::delInDir("data");
-
-$result = Util::generateFileUsingSimpleTemplate(
-    __DIR__.'/d_setting/UniqueConst.orig.php',
-    __DIR__.'/d_setting/UniqueConst.php',[
-        'serverID'=>DB::prefix().'_'.Util::randomStr(8)
-    ], true
-);
-
-if($mysqli_obj->multi_query(file_get_contents(__dir__.'/sql/reset.sql'))){
-    while(true){
-        if (!$mysqli_obj->more_results()) {
-            break;
-        }
-        if(!$mysqli_obj->next_result()){
-            break;
-        }
-    }
-    
-}
-
-if($mysqli_obj->multi_query(file_get_contents(__dir__.'/sql/schema.sql'))){
-    while(true){
-        if (!$mysqli_obj->more_results()) {
-            break;
-        }
-        if(!$mysqli_obj->next_result()){
-            break;
-        }
-    }
-}
-
-
-$db->insert('plock', [
-    'plock'=>1
-]);
-
-CityConst::build();
-
-
-
-
-$turntime = date('Y-m-d H:i:s');
-$time = substr($turntime, 11, 2);
-if($sync == 0) {
-    // 현재 시간을 1월로 맞춤
-    $starttime = cutTurn($turntime, $turnterm);
-    $month = 1;
-    $year = $startyear;
-} else {
-    // 현재 시간과 동기화
-    list($starttime, $yearPulled, $month) = cutDay($turntime, $turnterm);
-    if($yearPulled){
-        $year = $startyear-1;
-    }
-    else{
-        $year = $startyear;
-    }
-}
-
-$killturn = 4800 / $turnterm;
-if($npcmode == 1) { $killturn = intdiv($killturn, 3); }
-
-$env = [
-    'scenario'=>$scenario,
-    'scenario_text'=>$scenarioObj->getTitle(),
-    'startyear'=>$startyear,
-    'year'=> $year,
-    'month'=> $month,
-    'msg'=>'공지사항',//TODO:공지사항
-    'maxgeneral'=>GameConst::$defaultMaxGeneral,
-    'maxnation'=>GameConst::$defaultMaxNation,
-    'conlimit'=>300,
-    'gold_rate'=>100,
-    'rice_rate'=>100,
-    'turntime'=>$turntime,
-    'starttime'=>$starttime,
-    'turnterm'=>$turnterm,
-    'killturn'=>$killturn,
-    'genius'=>GameConst::$defaultMaxGenius,
-    'show_img_level'=>$show_img_level,
-    'npcmode'=>$npcmode,
-    'extended_general'=>$extend,
-    'fiction'=>$fiction
-];
-
-foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){
-    $db->insert('general', [
-        'owner'=>$admin['no'],
-        'name'=>$admin['name'],
-        'picture'=>$admin['picture'],
-        'imgsvr'=>$admin['imgsvr'],
-        'turntime'=>$turntime,
-        'killturn'=>null
-    ]);
-}
-
-$db->insert('game', $env);
-
-$scenarioObj->build($env);
-
-$db->update('plock', [
-    'plock'=>0
-], true);
-
-LogHistory(1);
-
-$prefix = DB::prefix();
-AppConf::getList()[$prefix]->closeServer();
-
-Json::die([
-    'result'=>true
-]);
+Json::die(ResetHelper::buildScenario(
+    $turnterm,
+    $sync,
+    $scenario,
+    $fiction,
+    $extend,
+    $npcmode,
+    $show_img_level,
+    $tournament_trig
+));