DB 스키마 변경

중간반영
외교부 틀 작성
2019-01-25 00:13:04 +09:00 · 2019-01-24 03:34:03 +09:00 · 2019-01-23 03:11:07 +09:00 · 2019-01-23 02:36:03 +09:00 · 2019-01-23 01:37:40 +09:00 · 2019-01-22 03:17:44 +09:00
155 changed files with 16829 additions and 3275 deletions
@@ -16,6 +16,7 @@ d_log/*.zip
 sess_*
 */logs/*.txt
 */logs/*/*.txt
+*/logs/preserved
 err.txt
 che/.htaccess
 kwe/.htaccess
@@ -28,6 +29,7 @@ d_shared
 d_pic/*.jpg
 d_pic/*.gif
 d_pic/*.png
+d_pic/uploaded_image

 d_setting/*.php
 */d_setting/*.php
@@ -9,8 +9,10 @@
  * <code>mpm_event</code> 권장
 * PHP 7.2 이상 
  * <code>php-fpm</code> 권장
-  * php에서 curl을 실행가능해야 합니다.
-* MySQL 5.6 이상, 또는 MariaDB 10.0 이상
+  * php에서 curl, pdo-sqlite을 실행가능해야 합니다. (기본값: 지원)
+  * mysqlnd가 지원되어야합니다. (기본값: 지원)
+* MariaDB 10.2.1 이상
+  * MySQL 5.6 이상도 가능하도록 할 예정입니다.
 * <code>git</code>
 * <code>curl</code>

@@ -47,7 +49,7 @@ Database 수는 로그인 관리 서버 1개, 내부 서버 7개로, 총 8개의

 현재 카카오로그인 API KEY를 입력하는 작업이 설치과정에 추가되어있지 않습니다.

-<code>f_install/templates/KakaoKey.orig.php</code> 를 <code>d_setting/KakaoKey.php</code>로 복사한 후 API 키를 입력하여야 합니다.
+설치 후 <code>d_setting/KakaoKey.php</code>에서 API키를 입력해야 합니다.


 ## 라이선스
@@ -52,8 +52,8 @@ input::-webkit-input-placeholder {

 }

-.login-button{
-   margin-top: 5px;
+.login_btn_group{
+    margin-top: 5px;
 }

 .login-register{
@@ -98,6 +98,10 @@ input::-webkit-input-placeholder {
    z-index:800;
 }

+#login_card{
+    z-index:801;
+}
+
 #btn_kakao_login{
    cursor: pointer;
    height:46px;
@@ -0,0 +1,3 @@
+/*! Select2 4.0.5 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+(function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var e=jQuery.fn.select2.amd;return e.define("select2/i18n/ko",[],function(){return{errorLoading:function(){return"결과를 불러올 수 없습니다."},inputTooLong:function(e){var t=e.input.length-e.maximum,n="너무 깁니다. "+t+" 글자 지워주세요.";return n},inputTooShort:function(e){var t=e.minimum-e.input.length,n="너무 짧습니다. "+t+" 글자 더 입력해주세요.";return n},loadingMore:function(){return"불러오는 중…"},maximumSelected:function(e){var t="최대 "+e.maximum+"개까지만 선택 가능합니다.";return t},noResults:function(){return"결과가 없습니다."},searching:function(){return"검색 중…"}}}),{define:e.define,require:e.require}})();
@@ -0,0 +1,188 @@
+/* select2-bootstrap4 with Darkly */
+.select2-container--bootstrap4 { color: black; }
+
+.select2-container--bootstrap4 .select2-selection { background-color: #fff; border: 1px solid #ced4da; border-radius: 0.25rem; color: #495057; font-size: 1rem; outline: 0; }
+
+.select2-container--bootstrap4 .select2-selection.form-control { border-radius: 0.25rem; }
+
+.select2-container--bootstrap4 .select2-search--dropdown .select2-search__field { background-color: #fff; border: 1px solid #ced4da; border-radius: 0.25rem; color: #495057; font-size: 1rem; }
+
+.select2-container--bootstrap4 .select2-search__field { outline: 0; }
+
+.select2-container--bootstrap4 .select2-search__field::-webkit-input-placeholder { color: #6c757d; }
+
+.select2-container--bootstrap4 .select2-search__field:-moz-placeholder { color: #6c757d; }
+
+.select2-container--bootstrap4 .select2-search__field::-moz-placeholder { color: #6c757d; opacity: 1; }
+
+.select2-container--bootstrap4 .select2-search__field:-ms-input-placeholder { color: #6c757d; }
+
+.select2-container--bootstrap4 .select2-results__option { padding: 0.75rem 0.375rem; font-size: 1rem; }
+
+.select2-container--bootstrap4 .select2-results__option[role=group] { padding: 0; }
+
+.select2-container--bootstrap4 .select2-results__option[aria-disabled=true] { color: #6c757d; cursor: not-allowed; }
+
+.select2-container--bootstrap4 .select2-results__option[aria-selected=true] { background-color: #f8f9fa; color: #16181b; }
+
+.select2-container--bootstrap4 .select2-results__option--highlighted[aria-selected] { background-color: #007bff; color: #fff; }
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option { padding: 0.75rem 0.375rem; }
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__group { padding-left: 0; }
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option { margin-left: -0.375rem; padding-left: 0.75rem; }
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option { margin-left: -0.75rem; padding-left: 1.125rem; }
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { margin-left: -1.125rem; padding-left: 1.5rem; }
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { margin-left: -1.5rem; padding-left: 1.875rem; }
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { margin-left: -1.875rem; padding-left: 2.25rem; }
+
+.select2-container--bootstrap4 .select2-results__group { color: #6c757d; display: block; padding: 0.75rem 0.375rem; font-size: 75%; line-height: 1; white-space: nowrap; }
+
+.select2-container--bootstrap4.select2-container--focus .select2-selection, .select2-container--bootstrap4.select2-container--open .select2-selection { transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; border-color: #80bdff; }
+
+@media screen and (prefers-reduced-motion: reduce) { .select2-container--bootstrap4.select2-container--focus .select2-selection, .select2-container--bootstrap4.select2-container--open .select2-selection { transition: none; } }
+
+.select2-container--bootstrap4.select2-container--open .select2-selection .select2-selection__arrow b { border-color: transparent transparent #6c757d transparent; border-width: 0 0.25rem 0.25rem 0.25rem; }
+
+.select2-container--bootstrap4.select2-container--open.select2-container--below .select2-selection { border-bottom-right-radius: 0; border-bottom-left-radius: 0; border-bottom-color: transparent; }
+
+.select2-container--bootstrap4.select2-container--open.select2-container--above .select2-selection { border-top-left-radius: 0; border-top-right-radius: 0; border-top-color: transparent; }
+
+.select2-container--bootstrap4 .select2-selection__clear { color: #6c757d; cursor: pointer; float: right; font-weight: bold; margin-right: 10px; }
+
+.select2-container--bootstrap4 .select2-selection__clear:hover { color: #343a40; }
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection { border-color: #ced4da; }
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection, .select2-container--bootstrap4.select2-container--disabled .select2-search__field { cursor: not-allowed; }
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection, .select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice { background-color: #e9ecef; }
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection__clear, .select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice__remove { display: none; }
+
+.select2-container--bootstrap4 .select2-dropdown { border-color: #80bdff; border-width: 1px; overflow-x: hidden; margin-top: -1px; }
+
+.select2-container--bootstrap4 .select2-dropdown--above { margin-top: 1px; }
+
+.select2-container--bootstrap4 .select2-results > .select2-results__options { max-height: 200px; overflow-y: auto; }
+
+.select2-container--bootstrap4 .select2-selection--single { height: calc(2.25rem + 2px); line-height: 1; padding: 0.75rem 1.125rem 0.75rem 0.375rem; }
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow { position: absolute; bottom: 0; right: 0.375rem; top: 0; width: 0.25rem; }
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b { border-color: #6c757d transparent transparent transparent; border-style: solid; border-width: 0.25rem 0.25rem 0 0.25rem; height: 0; left: 0; margin-left: -0.25rem; margin-top: -0.125rem; position: absolute; top: 50%; width: 0; }
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered { color: #495057; padding: 0; }
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__placeholder { color: #6c757d; }
+
+.select2-container--bootstrap4 .select2-selection--multiple { min-height: calc(2.25rem + 2px); padding: 0; height: auto; }
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered { box-sizing: border-box; display: block; line-height: 1; list-style: none; margin: 0; overflow: hidden; padding: 0.75rem 0.375rem 0 0.75rem; width: 100%; text-overflow: ellipsis; white-space: nowrap; }
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__placeholder { color: #6c757d; float: left; margin-top: 5px; }
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice { color: #495057; background: transparent; border: 1px solid #343a40; border-radius: 0.25rem; cursor: default; float: left; margin: -0.25rem 0 0 0.1875rem; padding: 0 0.75rem; }
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field { background: transparent; padding: 0 0.375rem; height: calc(2.25rem + 2px)-2; line-height: 1; margin-top: 0; min-width: 5em; }
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove { color: #6c757d; cursor: pointer; display: inline-block; font-weight: bold; margin-right: 0.375rem; }
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove:hover { color: #343a40; }
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear { margin-top: 0.75rem; }
+
+.select2-container--bootstrap4 .select2-selection--single.input-sm, .input-group-sm .select2-container--bootstrap4 .select2-selection--single, .form-group-sm .select2-container--bootstrap4 .select2-selection--single { border-radius: 0.2rem; font-size: 75%; height: calc(1.8125rem + 2px); line-height: 1; padding: 0.5rem 1rem 0.5rem 0.25rem; }
+
+.select2-container--bootstrap4 .select2-selection--single.input-sm .select2-selection__arrow b, .input-group-sm .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b, .form-group-sm .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b { margin-left: -0.5rem; }
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm, .input-group-sm .select2-container--bootstrap4 .select2-selection--multiple, .form-group-sm .select2-container--bootstrap4 .select2-selection--multiple { min-height: calc(1.8125rem + 2px); border-radius: 0.2rem; }
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__rendered, .input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered, .form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered { padding: 0.5rem 0.25rem 0 0.5rem; }
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__choice, .input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice, .form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice { font-size: 75%; line-height: 1; margin: 0 0 0 0.125rem; padding: 0 0.5rem; }
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-search--inline .select2-search__field, .input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field, .form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field { padding: 0 0.25rem; font-size: 75%; height: calc(1.8125rem + 2px)-2; line-height: 1; }
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__clear, .input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear, .form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear { margin-top: 0.5rem; }
+
+.select2-container--bootstrap4 .select2-selection--single.input-lg, .input-group-lg .select2-container--bootstrap4 .select2-selection--single, .form-group-lg .select2-container--bootstrap4 .select2-selection--single { border-radius: 0.3rem; font-size: 1.25rem; height: calc(2.875rem + 2px); line-height: 1; padding: 1rem 1.4375rem 1rem 0.5rem; }
+
+.select2-container--bootstrap4 .select2-selection--single.input-lg .select2-selection__arrow, .input-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow, .form-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow { width: 0.3125rem; }
+
+.select2-container--bootstrap4 .select2-selection--single.input-lg .select2-selection__arrow b, .input-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b, .form-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b { border-width: 0.3125rem 0.3125rem 0 0.3125rem; margin-left: -0.3125rem; margin-left: -1rem; margin-top: -0.15625rem; }
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg, .input-group-lg .select2-container--bootstrap4 .select2-selection--multiple, .form-group-lg .select2-container--bootstrap4 .select2-selection--multiple { min-height: calc(2.875rem + 2px); border-radius: 0.3rem; }
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-selection__choice, .input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice, .form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice { font-size: 1.25rem; line-height: 1; border-radius: 0.25rem; margin: 0rem 0 0 0.25rem; padding: 0 1rem; }
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-search--inline .select2-search__field, .input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field, .form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field { padding: 0 0.5rem; font-size: 1.25rem; height: calc(2.875rem + 2px)-2; line-height: 1; }
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-selection__clear, .input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear, .form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear { margin-top: 1rem; }
+
+.select2-container--bootstrap4 .select2-selection.input-lg.select2-container--open .select2-selection--single .select2-selection__arrow b { border-color: transparent transparent #6c757d transparent; border-width: 0 0.3125rem 0.3125rem 0.3125rem; }
+
+.input-group-lg .select2-container--bootstrap4 .select2-selection.select2-container--open .select2-selection--single .select2-selection__arrow b { border-color: transparent transparent #6c757d transparent; border-width: 0 0.3125rem 0.3125rem 0.3125rem; }
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single { padding-left: 1.125rem; padding-right: 0.375rem; }
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__rendered { padding-right: 0; padding-left: 0; text-align: right; }
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__clear { float: left; }
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__arrow { left: 0.375rem; right: auto; }
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__arrow b { margin-left: 0; }
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-search--inline { float: right; }
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice { margin-left: 0; margin-right: 0.1875rem; }
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove { margin-left: 2px; margin-right: auto; }
+
+.has-warning .select2-dropdown, .has-warning .select2-selection { border-color: #ffc107; }
+
+.has-warning .select2-container--focus .select2-selection, .has-warning .select2-container--open .select2-selection { border-color: #d39e00; }
+
+.has-warning.select2-drop-active { border-color: #d39e00; }
+
+.has-warning.select2-drop-active.select2-drop.select2-drop-above { border-top-color: #d39e00; }
+
+.has-error .select2-dropdown, .has-error .select2-selection { border-color: #dc3545; }
+
+.has-error .select2-container--focus .select2-selection, .has-error .select2-container--open .select2-selection { border-color: #bd2130; }
+
+.has-error.select2-drop-active { border-color: #bd2130; }
+
+.has-error.select2-drop-active.select2-drop.select2-drop-above { border-top-color: #bd2130; }
+
+.has-success .select2-dropdown, .has-success .select2-selection { border-color: #28a745; }
+
+.has-success .select2-container--focus .select2-selection, .has-success .select2-container--open .select2-selection { border-color: #1e7e34; }
+
+.has-success.select2-drop-active { border-color: #1e7e34; }
+
+.has-success.select2-drop-active.select2-drop.select2-drop-above { border-top-color: #1e7e34; }
+
+.input-group > .select2-hidden-accessible:first-child + .select2-container--bootstrap4 > .selection > .select2-selection, .input-group > .select2-hidden-accessible:first-child + .select2-container--bootstrap4 > .selection > .select2-selection.form-control { border-top-right-radius: 0; border-bottom-right-radius: 0; }
+
+.input-group > .select2-hidden-accessible:not(:first-child) + .select2-container--bootstrap4:not(:last-child) > .selection > .select2-selection, .input-group > .select2-hidden-accessible:not(:first-child) + .select2-container--bootstrap4:not(:last-child) > .selection > .select2-selection.form-control { border-radius: 0; }
+
+.input-group > .select2-hidden-accessible:not(:first-child):not(:last-child) + .select2-container--bootstrap4:last-child > .selection > .select2-selection, .input-group > .select2-hidden-accessible:not(:first-child):not(:last-child) + .select2-container--bootstrap4:last-child > .selection > .select2-selection.form-control { border-top-left-radius: 0; border-bottom-left-radius: 0; }
+
+.input-group > .select2-container--bootstrap4 { display: table; table-layout: fixed; position: relative; z-index: 2; width: 100%; margin-bottom: 0; }
+
+.input-group > .select2-container--bootstrap4 > .selection > .select2-selection.form-control { float: none; }
+
+.input-group > .select2-container--bootstrap4.select2-container--open, .input-group > .select2-container--bootstrap4.select2-container--focus { z-index: 3; }
+
+.input-group > .select2-container--bootstrap4, .input-group > .select2-container--bootstrap4 .input-group-btn, .input-group > .select2-container--bootstrap4 .input-group-btn .btn { vertical-align: top; }
+
+.form-control.select2-hidden-accessible { position: absolute !important; width: 1px !important; }
+
+@media (min-width: 576px) { .form-inline .select2-container--bootstrap4 { display: inline-block; } }
@@ -0,0 +1,484 @@
+.select2-container {
+  box-sizing: border-box;
+  display: inline-block;
+  margin: 0;
+  position: relative;
+  vertical-align: middle; }
+  .select2-container .select2-selection--single {
+    box-sizing: border-box;
+    cursor: pointer;
+    display: block;
+    height: 28px;
+    user-select: none;
+    -webkit-user-select: none; }
+    .select2-container .select2-selection--single .select2-selection__rendered {
+      display: block;
+      padding-left: 8px;
+      padding-right: 20px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap; }
+    .select2-container .select2-selection--single .select2-selection__clear {
+      position: relative; }
+  .select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
+    padding-right: 8px;
+    padding-left: 20px; }
+  .select2-container .select2-selection--multiple {
+    box-sizing: border-box;
+    cursor: pointer;
+    display: block;
+    min-height: 32px;
+    user-select: none;
+    -webkit-user-select: none; }
+    .select2-container .select2-selection--multiple .select2-selection__rendered {
+      display: inline-block;
+      overflow: hidden;
+      padding-left: 8px;
+      text-overflow: ellipsis;
+      white-space: nowrap; }
+  .select2-container .select2-search--inline {
+    float: left; }
+    .select2-container .select2-search--inline .select2-search__field {
+      box-sizing: border-box;
+      border: none;
+      font-size: 100%;
+      margin-top: 5px;
+      padding: 0; }
+      .select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button {
+        -webkit-appearance: none; }
+
+.select2-dropdown {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  box-sizing: border-box;
+  display: block;
+  position: absolute;
+  left: -100000px;
+  width: 100%;
+  z-index: 1051; }
+
+.select2-results {
+  display: block; }
+
+.select2-results__options {
+  list-style: none;
+  margin: 0;
+  padding: 0; }
+
+.select2-results__option {
+  padding: 6px;
+  user-select: none;
+  -webkit-user-select: none; }
+  .select2-results__option[aria-selected] {
+    cursor: pointer; }
+
+.select2-container--open .select2-dropdown {
+  left: 0; }
+
+.select2-container--open .select2-dropdown--above {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--open .select2-dropdown--below {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-search--dropdown {
+  display: block;
+  padding: 4px; }
+  .select2-search--dropdown .select2-search__field {
+    padding: 4px;
+    width: 100%;
+    box-sizing: border-box; }
+    .select2-search--dropdown .select2-search__field::-webkit-search-cancel-button {
+      -webkit-appearance: none; }
+  .select2-search--dropdown.select2-search--hide {
+    display: none; }
+
+.select2-close-mask {
+  border: 0;
+  margin: 0;
+  padding: 0;
+  display: block;
+  position: fixed;
+  left: 0;
+  top: 0;
+  min-height: 100%;
+  min-width: 100%;
+  height: auto;
+  width: auto;
+  opacity: 0;
+  z-index: 99;
+  background-color: #fff;
+  filter: alpha(opacity=0); }
+
+.select2-hidden-accessible {
+  border: 0 !important;
+  clip: rect(0 0 0 0) !important;
+  height: 1px !important;
+  margin: -1px !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+  position: absolute !important;
+  width: 1px !important; }
+
+.select2-container--default .select2-selection--single {
+  background-color: #fff;
+  border: 1px solid #aaa;
+  border-radius: 4px; }
+  .select2-container--default .select2-selection--single .select2-selection__rendered {
+    color: #444;
+    line-height: 28px; }
+  .select2-container--default .select2-selection--single .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold; }
+  .select2-container--default .select2-selection--single .select2-selection__placeholder {
+    color: #999; }
+  .select2-container--default .select2-selection--single .select2-selection__arrow {
+    height: 26px;
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    width: 20px; }
+    .select2-container--default .select2-selection--single .select2-selection__arrow b {
+      border-color: #888 transparent transparent transparent;
+      border-style: solid;
+      border-width: 5px 4px 0 4px;
+      height: 0;
+      left: 50%;
+      margin-left: -4px;
+      margin-top: -2px;
+      position: absolute;
+      top: 50%;
+      width: 0; }
+
+.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear {
+  float: left; }
+
+.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  left: 1px;
+  right: auto; }
+
+.select2-container--default.select2-container--disabled .select2-selection--single {
+  background-color: #eee;
+  cursor: default; }
+  .select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear {
+    display: none; }
+
+.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b {
+  border-color: transparent transparent #888 transparent;
+  border-width: 0 4px 5px 4px; }
+
+.select2-container--default .select2-selection--multiple {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  cursor: text; }
+  .select2-container--default .select2-selection--multiple .select2-selection__rendered {
+    box-sizing: border-box;
+    list-style: none;
+    margin: 0;
+    padding: 0 5px;
+    width: 100%; }
+    .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
+      list-style: none; }
+  .select2-container--default .select2-selection--multiple .select2-selection__placeholder {
+    color: #999;
+    margin-top: 5px;
+    float: left; }
+  .select2-container--default .select2-selection--multiple .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin-top: 5px;
+    margin-right: 10px; }
+  .select2-container--default .select2-selection--multiple .select2-selection__choice {
+    background-color: #e4e4e4;
+    border: 1px solid #aaa;
+    border-radius: 4px;
+    cursor: default;
+    float: left;
+    margin-right: 5px;
+    margin-top: 5px;
+    padding: 0 5px; }
+  .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
+    color: #999;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 2px; }
+    .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {
+      color: #333; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+  float: right; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  margin-left: 5px;
+  margin-right: auto; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+  margin-left: 2px;
+  margin-right: auto; }
+
+.select2-container--default.select2-container--focus .select2-selection--multiple {
+  border: solid black 1px;
+  outline: 0; }
+
+.select2-container--default.select2-container--disabled .select2-selection--multiple {
+  background-color: #eee;
+  cursor: default; }
+
+.select2-container--default.select2-container--disabled .select2-selection__choice__remove {
+  display: none; }
+
+.select2-container--default.select2-container--open.select2-container--above .select2-selection--single, .select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-container--default.select2-container--open.select2-container--below .select2-selection--single, .select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple {
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--default .select2-search--dropdown .select2-search__field {
+  border: 1px solid #aaa; }
+
+.select2-container--default .select2-search--inline .select2-search__field {
+  background: transparent;
+  border: none;
+  outline: 0;
+  box-shadow: none;
+  -webkit-appearance: textfield; }
+
+.select2-container--default .select2-results > .select2-results__options {
+  max-height: 200px;
+  overflow-y: auto; }
+
+.select2-container--default .select2-results__option[role=group] {
+  padding: 0; }
+
+.select2-container--default .select2-results__option[aria-disabled=true] {
+  color: #999; }
+
+.select2-container--default .select2-results__option[aria-selected=true] {
+  background-color: #ddd; }
+
+.select2-container--default .select2-results__option .select2-results__option {
+  padding-left: 1em; }
+  .select2-container--default .select2-results__option .select2-results__option .select2-results__group {
+    padding-left: 0; }
+  .select2-container--default .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -1em;
+    padding-left: 2em; }
+    .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+      margin-left: -2em;
+      padding-left: 3em; }
+      .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+        margin-left: -3em;
+        padding-left: 4em; }
+        .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+          margin-left: -4em;
+          padding-left: 5em; }
+          .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+            margin-left: -5em;
+            padding-left: 6em; }
+
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: #5897fb;
+  color: white; }
+
+.select2-container--default .select2-results__group {
+  cursor: default;
+  display: block;
+  padding: 6px; }
+
+.select2-container--classic .select2-selection--single {
+  background-color: #f7f7f7;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  outline: 0;
+  background-image: -webkit-linear-gradient(top, white 50%, #eeeeee 100%);
+  background-image: -o-linear-gradient(top, white 50%, #eeeeee 100%);
+  background-image: linear-gradient(to bottom, white 50%, #eeeeee 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
+  .select2-container--classic .select2-selection--single:focus {
+    border: 1px solid #5897fb; }
+  .select2-container--classic .select2-selection--single .select2-selection__rendered {
+    color: #444;
+    line-height: 28px; }
+  .select2-container--classic .select2-selection--single .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin-right: 10px; }
+  .select2-container--classic .select2-selection--single .select2-selection__placeholder {
+    color: #999; }
+  .select2-container--classic .select2-selection--single .select2-selection__arrow {
+    background-color: #ddd;
+    border: none;
+    border-left: 1px solid #aaa;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    height: 26px;
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    width: 20px;
+    background-image: -webkit-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
+    background-image: -o-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
+    background-image: linear-gradient(to bottom, #eeeeee 50%, #cccccc 100%);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0); }
+    .select2-container--classic .select2-selection--single .select2-selection__arrow b {
+      border-color: #888 transparent transparent transparent;
+      border-style: solid;
+      border-width: 5px 4px 0 4px;
+      height: 0;
+      left: 50%;
+      margin-left: -4px;
+      margin-top: -2px;
+      position: absolute;
+      top: 50%;
+      width: 0; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear {
+  float: left; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  border: none;
+  border-right: 1px solid #aaa;
+  border-radius: 0;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  left: 1px;
+  right: auto; }
+
+.select2-container--classic.select2-container--open .select2-selection--single {
+  border: 1px solid #5897fb; }
+  .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow {
+    background: transparent;
+    border: none; }
+    .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b {
+      border-color: transparent transparent #888 transparent;
+      border-width: 0 4px 5px 4px; }
+
+.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  background-image: -webkit-linear-gradient(top, white 0%, #eeeeee 50%);
+  background-image: -o-linear-gradient(top, white 0%, #eeeeee 50%);
+  background-image: linear-gradient(to bottom, white 0%, #eeeeee 50%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
+
+.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  background-image: -webkit-linear-gradient(top, #eeeeee 50%, white 100%);
+  background-image: -o-linear-gradient(top, #eeeeee 50%, white 100%);
+  background-image: linear-gradient(to bottom, #eeeeee 50%, white 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0); }
+
+.select2-container--classic .select2-selection--multiple {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  cursor: text;
+  outline: 0; }
+  .select2-container--classic .select2-selection--multiple:focus {
+    border: 1px solid #5897fb; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__rendered {
+    list-style: none;
+    margin: 0;
+    padding: 0 5px; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__clear {
+    display: none; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__choice {
+    background-color: #e4e4e4;
+    border: 1px solid #aaa;
+    border-radius: 4px;
+    cursor: default;
+    float: left;
+    margin-right: 5px;
+    margin-top: 5px;
+    padding: 0 5px; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove {
+    color: #888;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 2px; }
+    .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover {
+      color: #555; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  float: right; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  margin-left: 5px;
+  margin-right: auto; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+  margin-left: 2px;
+  margin-right: auto; }
+
+.select2-container--classic.select2-container--open .select2-selection--multiple {
+  border: 1px solid #5897fb; }
+
+.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--classic .select2-search--dropdown .select2-search__field {
+  border: 1px solid #aaa;
+  outline: 0; }
+
+.select2-container--classic .select2-search--inline .select2-search__field {
+  outline: 0;
+  box-shadow: none; }
+
+.select2-container--classic .select2-dropdown {
+  background-color: white;
+  border: 1px solid transparent; }
+
+.select2-container--classic .select2-dropdown--above {
+  border-bottom: none; }
+
+.select2-container--classic .select2-dropdown--below {
+  border-top: none; }
+
+.select2-container--classic .select2-results > .select2-results__options {
+  max-height: 200px;
+  overflow-y: auto; }
+
+.select2-container--classic .select2-results__option[role=group] {
+  padding: 0; }
+
+.select2-container--classic .select2-results__option[aria-disabled=true] {
+  color: grey; }
+
+.select2-container--classic .select2-results__option--highlighted[aria-selected] {
+  background-color: #3875d7;
+  color: white; }
+
+.select2-container--classic .select2-results__group {
+  cursor: default;
+  display: block;
+  padding: 6px; }
+
+.select2-container--classic.select2-container--open .select2-dropdown {
+  border-color: #5897fb; }
@@ -0,0 +1,153 @@
+/* Forked from https://github.com/asiffermann/summernote-image-title */
+
+(function (factory) {
+  /* Global define */
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['jquery'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // Node/CommonJS
+    module.exports = factory(require('jquery'));
+  } else {
+    // Browser globals
+    factory(window.jQuery);
+  }
+}(function ($) {
+  $.extend(true, $.summernote.lang, {
+      'en-US': {
+          imageFlip: {
+              edit: 'Flip image',
+              flipLabel: 'Alternative Image'
+          }
+      },
+      'ko-KR': {
+          imageFlip: {
+              edit: '이미지 전환',
+              flipLabel: '대체 이미지( , 로 구분)'
+          }
+      },
+  });
+  $.extend($.summernote.options, {
+    imageFlip: {
+      icon: '<i class="note-icon-pencil"/>',
+      tooltip: 'Image Flip'
+    }
+  });
+  $.extend($.summernote.plugins, {
+      'imageFlip': function (context) {
+          var self = this;
+
+          var ui = $.summernote.ui;
+          var $note = context.layoutInfo.note;
+          var $editor = context.layoutInfo.editor;
+          var $editable = context.layoutInfo.editable;
+          var $toolbar  = context.layoutInfo.toolbar;
+
+          if (typeof context.options.imageFlip === 'undefined') {
+              context.options.imageFlip = {};
+          }
+
+          var options = context.options;
+          var lang = options.langInfo;
+
+          context.memo('button.imageFlip', function () {
+              var button = ui.button({
+                  contents: ui.icon(options.icons.pencil),
+                  container: false,
+                  tooltip: lang.imageFlip.edit,
+                  click: function (e) {
+                      context.invoke('imageFlip.show');
+                  }
+              });
+
+              return button.render();
+          });
+
+          this.initialize = function () {
+              var $container = options.dialogsInBody ? $(document.body) : $editor;
+
+              var body = '<div class="form-group">' +
+                           '<label>' + lang.imageFlip.flipLabel + '</label>' +
+                           '<input class="note-image-flip-text form-control" type="text" />' +
+                         '</div>';
+
+              var footer = '<button href="#" class="btn btn-primary note-image-flip-btn">' + lang.imageFlip.edit + '</button>';
+
+              this.$dialog = ui.dialog({
+                  title: lang.imageFlip.edit,
+                  body: body,
+                  footer: footer
+              }).render().appendTo($container);
+          };
+
+          this.destroy = function () {
+              ui.hideDialog(this.$dialog);
+              this.$dialog.remove();
+          };
+
+          this.bindEnterKey = function ($input, $btn) {
+              $input.on('keypress', function (event) {
+                  if (event.keyCode === 13) {
+                      $btn.trigger('click');
+                  }
+              });
+          };
+
+          this.show = function () {
+              var $img = $($editable.data('target'));
+
+              var imgInfo = {
+                  imgDom: $img,
+                  flip: $img.data('flip'),
+              };
+              this.showLinkDialog(imgInfo).then(function (imgInfo) {
+                  ui.hideDialog(self.$dialog);
+                  var $img = imgInfo.imgDom;
+
+                  if (imgInfo.flip) {
+                      $img.attr('data-flip', imgInfo.flip);
+                  }
+                  else {
+                      $img.removeData('flip');
+                  }
+
+                  $note.val(context.invoke('code'));
+                  $note.change();
+              });
+          };
+
+          this.showLinkDialog = function (imgInfo) {
+              return $.Deferred(function (deferred) {
+                  var $imageFlip = self.$dialog.find('.note-image-flip-text');
+                  var $editBtn = self.$dialog.find('.note-image-flip-btn');
+
+                  ui.onDialogShown(self.$dialog, function () {
+                      context.triggerEvent('dialog.shown');
+
+                      $editBtn.click(function (event) {
+                          event.preventDefault();
+                          deferred.resolve({
+                              imgDom: imgInfo.imgDom,
+                              flip: $imageFlip.val(),
+                          });
+                      });
+
+                      $imageFlip.val(imgInfo.flip).trigger('focus');
+                      self.bindEnterKey($imageFlip, $editBtn);
+
+                  });
+
+                  ui.onDialogHidden(self.$dialog, function () {
+                      $editBtn.off('click');
+
+                      if (deferred.state() === 'pending') {
+                          deferred.reject();
+                      }
+                  });
+
+                  ui.showDialog(self.$dialog);
+              });
+          };
+      }
+  });
+}));
@@ -52,6 +52,7 @@ $rootDB->insert('member',[
    'oauth_type' => 'NONE',
    'id' => $username,
    'email' => null,
+    'token_valid_until'=>'2999-01-01 00:00:00',
    'pw' => $finalPassword,
    'salt' => $userSalt,
    'grade'=> 6,
@@ -217,8 +217,8 @@ $result = Util::generateFileUsingSimpleTemplate(
 );

 $result = Util::generateFileUsingSimpleTemplate(
-    __dir__.'/templates/menu.orig.js',
-    ROOT.'/d_shared/menu.js',
+    __dir__.'/templates/menu.orig.json',
+    ROOT.'/d_shared/menu.json',
    [],
    true
 );
@@ -263,6 +263,14 @@ $result = Util::generateFileUsingSimpleTemplate(
    ]
 );

+Util::generateFileUsingSimpleTemplate(
+    __dir__.'/templates/KakaoKey.orig.php',
+    ROOT.'/d_setting/KakaoKey.php',
+    [
+    ],
+    true
+);
+
 if ($result !== true) {
    Json::die([
        'result'=>false,
@@ -20,16 +20,19 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 CREATE TABLE `member` (
 	`NO` INT(11) NOT NULL AUTO_INCREMENT,
 	`oauth_id` BIGINT(20) NULL DEFAULT NULL,
-	`oauth_type` ENUM('NONE','KAKAO') NOT NULL,
 	`ID` VARCHAR(64) NOT NULL,
 	`EMAIL` VARCHAR(64) NULL DEFAULT NULL,
+	`oauth_type` ENUM('NONE','KAKAO') NOT NULL,
+	`oauth_info` TEXT NOT NULL DEFAULT '{}',
+	`token_valid_until` DATETIME 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',
-	`acl` text NOT NULL DEFAULT '{}' COMMENT 'json',
+	`acl` TEXT NOT NULL DEFAULT '{}' COMMENT 'json',
+	`penalty` TEXT NOT NULL DEFAULT '{}' COMMENT 'json',
 	`GRADE` INT(1) NULL DEFAULT '1',
 	`REG_NUM` INT(3) NULL DEFAULT '0',
 	`REG_DATE` DATETIME NOT NULL,
@@ -1,8 +0,0 @@
-window.sammo_menu = [
-    ['/bbs/board', '삼모게시판', '_blank'],
-    ['/bbs/tip', '팁/강좌', '_blank'],
-    ['/bbs/news', '삼국 일보', '_blank'],
-    ['/bbs/history2', '개인 열전', '_blank'],
-    ['/bbs/history3', '국가 열전', '_blank'],
-    ['/bbs/patch', '패치 내역', '_blank']
-];
@@ -0,0 +1,8 @@
+[
+    ["/bbs/board", "삼모게시판", "_blank"],
+    ["/bbs/tip", "팁/강좌", "_blank"],
+    ["/bbs/news", "삼국 일보", "_blank"],
+    ["/bbs/history2", "개인 열전", "_blank"],
+    ["/bbs/history3", "국가 열전", "_blank"],
+    ["/bbs/patch", "패치 내역", "_blank"]
+]
@@ -73,7 +73,6 @@ $sel[$type] = "selected";
        <td width=130 align=center id=bg1>국 가 명</td>
        <td width=80  align=center id=bg1>상 태</td>
        <td width=60  align=center id=bg1>기 간</td>
-        <td align=center id=bg1>비 고</td>
    </tr>
 <?php

@@ -95,11 +94,7 @@ for ($i=0; $i < $dipcount; $i++) {
    $me = $dip['me'];
    $you = $dip['you'];

-    $query = "select reserved,showing from diplomacy where you='$me' and me='$you'";
-    $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $dip2 = MYDB_fetch_array($result2);
-
-    if ($dip['state'] == 2 && $dip['fixed'] == "" && $dip['reserved'] == "" && $dip2['reserved'] == "") {
+    if ($dip['state'] == 2) {
        continue;
    }

@@ -115,37 +110,6 @@ for ($i=0; $i < $dipcount; $i++) {
    }

    $date = date('Y-m-d H:i:s');
-    $note = "";
-    if ($dip['fixed'] != "") {
-        if ($dip['state'] == 7) {
-            $note .= $dip['fixed'];
-        } else {
-            $note .= "<font color=gray>{$dip['fixed']}</font>";
-        }
-        if ($dip['reserved'] != "" || $dip2['reserved'] != "") {
-            $note .= "<br>";
-        }
-    }
-    if ($dip['reserved'] != "") {
-        if ($dip['showing'] >= $date) {
-            $note .= "<font color=skyblue>아국측 제의</font>: {$dip['reserved']}";
-        } else {
-            $note .= "<font color=gray>아국측 제의: {$dip['reserved']}</font>";
-        }
-        if ($dip2['reserved'] != "") {
-            $note .= "<br>";
-        }
-    }
-    if ($dip2['reserved'] != "") {
-        if ($dip2['showing'] >= $date) {
-            $note .= "<font color=limegreen>상대측 제의</font>: {$dip2['reserved']}";
-        } else {
-            $note .= "<font color=gray>상대측 제의: {$dip2['reserved']}</font>";
-        }
-    }
-    if ($note == "") {
-        $note = "&nbsp;";
-    }

    echo "
    <tr>
@@ -153,7 +117,6 @@ for ($i=0; $i < $dipcount; $i++) {
        <td align=center style=color:".newColor($nationColor[$you]).";background-color:{$nationColor[$you]};>$nationName[$you]</td>
        <td align=center>$state</td>
        <td align=center>{$dip['term']} 개월</td>
-        <td align=left style=font-size:7px;>{$note}</td>
    </tr>";
 }
 ?>
@@ -6,8 +6,6 @@ include "func.php";

 $btn = Util::getReq('btn');

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -6,8 +6,6 @@ include "func.php";

 $select = Util::getReq('select', 'int', 0);

-extractMissingPostToGlobals();
-
 $db = DB::db();
 $connect=$db->get();

@@ -179,7 +179,7 @@ if($showServers){
        if($nation['generals']){
            $generals = $db->query('SELECT `general_no`, `name`, `last_yearmonth` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nation['generals']);

-            if(count($generals) != $nation['generals'] && $serverID == UniqueConst::$serverID){
+            if(count($generals) != count($nation['generals']) && $serverID == UniqueConst::$serverID){
                $liveGenerals = $nation['generals'];
                foreach($generals as $general){
                    if(in_array($general['general_no'], $nation['generals'])){
@@ -6,8 +6,6 @@ include "func.php";

 $type = Util::getReq('type', 'int', 9);

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -7,8 +7,6 @@ $btn = Util::getReq('btn');
 $yearmonth = Util::getReq('yearmonth', 'int');
 $serverID = Util::getReq('serverID', 'string', null);

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -6,8 +6,6 @@ include "func.php";

 $type = Util::getReq('type', 'int', 1);

-extractMissingPostToGlobals();
-
 if($type <= 0 || $type > 8){
    $type = 1;
 }
@@ -170,7 +170,7 @@ $max_refresh['name'] = '접속자 총합';
 $refresh_result = array_merge([$max_refresh], $db->query('SELECT `name`,refresh,`connect` FROM general ORDER BY refresh DESC LIMIT 5'));

 foreach ($refresh_result as $i=>$user) {
-    $w = round($user['refresh'] / $max_refresh['refresh'] * 100, 1);
+    $w = round($user['refresh'] / max(1, $max_refresh['refresh']) * 100, 1);
    $w2 = round(100 - $w, 1);
    $color = getTrafficColor($w);
 ?>
@@ -7,8 +7,6 @@ include "func.php";
 $msg = Util::getReq('msg');
 $msg2 = Util::getReq('msg2');

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -16,8 +16,6 @@ if ($type < 0 || $type > 3) {
    $type = 0;
 }

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -49,11 +47,14 @@ if ($con >= 2) {
    exit();
 }

-//재야인 경우
-$meLevel = $me['level'];
-if ($meLevel == 0 || ($meLevel == 1 && $me['belong'] < $nation['secretlimit'])) {
-    echo "수뇌부가 아니거나 사관년도가 부족합니다.";
-    exit();
+$permission = checkSecretPermission($me);
+if($permission < 0){
+    echo '국가에 소속되어있지 않습니다.';
+    die();
+}
+else if ($permission < 1) {
+    echo "권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.";
+    die();
 }

 //잘못된 접근
@@ -1,82 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("기밀실", 1);
-
-$query = "select no,nation,level from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-if($me['level'] < 5) {
-    echo "수뇌부가 아닙니다.";
-    exit();
-}
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title><?=UniqueConst::$serverName?>: 기밀실</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-
-</head>
-
-<body>
-<div style='width:1000px;margin:auto'>
-<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>
-        제목 <input type=textarea maxlength=50 name=title style=color:white;background-color:black;width:830px;>
-        </td>
-    </tr>
-    <tr><td>
-        <textarea name=msg style=color:white;background-color:black;width:998px;height:200px;></textarea><br>
-        <input type=submit value=저장하기>
-        <input type=hidden name=num value=-1>
-    </td></tr>
-</form>
-</table>
-<br>
-<?php
-$nation = getNation($me['nation']);
-
-//20개 메세지
-$index = $nation['coreindex'];
-for($i=0; $i < 20; $i++) {
-    $who = "coreboard{$index}_who";
-    $query = "select name,picture,imgsvr from general where no='$nation[$who]'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
-    if($nation["coreboard{$index}"] != '') { msgprint($nation["coreboard{$index}"], $general['name'], $general['picture'], $general['imgsvr'], $nation["coreboard{$index}_when"], $index, 1); }
-    $index--;
-    if($index < 0) { $index = 19; }
-}
-
-?>
-
-<table width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-</div>
-</body>
-</html>
-
@@ -17,16 +17,17 @@ $query = "select no,nation,level,con,turntime,belong from general where owner='{
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);

-$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']);
 if($con >= 2) { printLimitMsg($me['turntime']); exit(); }

-if($me['level'] == 0 || ($me['level'] == 1 && $me['belong'] < $nation['secretlimit'])) {
-    echo "수뇌부가 아니거나 사관년도가 부족합니다.";
-    exit();
+$permission = checkSecretPermission($me);
+if($permission < 0){
+    echo '국가에 소속되어있지 않습니다.';
+    die();
+}
+else if ($permission < 1) {
+    echo "권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.";
+    die();
 }

 if($me['level'] >= 5) { $btn = "submit"; $btn2 = "button"; }
@@ -6,8 +6,6 @@ include "func.php";

 $citylist = Util::getReq('citylist', 'int');

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -37,8 +35,12 @@ $templates = new \League\Plates\Engine('templates');
 <meta name="viewport" content="width=1024" />
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
 <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('../e_lib/select2/select2.full.min.js')?>
 <?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/currentCity.js')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+<?=WebUtil::printCSS('../e_lib/select2/select2.min.css')?>
+<?=WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <style>
@@ -65,8 +67,9 @@ $templates = new \League\Plates\Engine('templates');
 <table align=center width=1000 class='tb_layout bg0'>
    <tr>
        <td width=998>
-            <form name=cityselect method=get>도시선택 :
-                <select name=citylist size=1 style=color:white;background-color:black;width:798px;>
+            <form name=cityselect method=get>
+                <div style='text-align:center;'>도시선택 :
+                <select id="citySelector" name=citylist size=1 style='display:inline-block;min-width:400px;'>
 <?php
 if(!$citylist){
    $citylist = $me['city'];
@@ -81,11 +84,11 @@ if($me['level'] == 0) {
    echo "
                    <option value={$city['city']}";
    if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
-    echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
+    echo ">【".StringUtil::padString($city['name'], 4, '_')."】";
    if($city['nation'] == 0) echo "공백지";
-    elseif($me['nation'] == $city['nation']) echo "본국==";
-    else echo "타국==";
-    echo "============================================</option>";
+    elseif($me['nation'] == $city['nation']) echo "본국";
+    else echo "타국";
+    echo "</option>";
 } else {
    // 아국 도시들 선택
    $query = "select city,name,nation from city where nation='{$me['nation']}'";
@@ -97,11 +100,11 @@ if($me['level'] == 0) {
        echo "
                        <option value={$city['city']}";
        if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
-        echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
+        echo ">【".StringUtil::padString($city['name'], 4, '_')."】";
        if($city['nation'] == 0) echo "공백지";
-        elseif($me['nation'] == $city['nation']) echo "본국==";
-        else echo "타국==";
-        echo "============================================</option>";
+        elseif($me['nation'] == $city['nation']) echo "본국";
+        else echo "타국";
+        echo "</option>";
    }

    // 아국 장수가 있는 타국 도시들 선택
@@ -114,11 +117,11 @@ if($me['level'] == 0) {
        echo "
                        <option value={$city['city']}";
        if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
-        echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
+        echo ">【".StringUtil::padString($city['name'], 4, '_')."】";
        if($city['nation'] == 0) echo "공백지";
-        elseif($me['nation'] == $city['nation']) echo "본국==";
-        else echo "타국==";
-        echo "============================================</option>";
+        elseif($me['nation'] == $city['nation']) echo "본국";
+        else echo "타국";
+        echo "</option>";
    }
 }

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

 }

 echo "
-                </select>
-                <input type=submit value='도 시 선 택'>
+                </select></div>
                <p align=center>명령 화면에서 도시를 클릭하셔도 됩니다.</p>
            </form>
        </td>
@@ -177,7 +179,7 @@ if($valid == 0 && $userGrade < 5) {
 $city = $db->queryFirstRow('SELECT * FROM city WHERE city=%i', $citylist);
 $cityNation = getNationStaticInfo($city['nation']);

-//태수, 군사, 시중
+//태수, 군사, 종사
 $gen1 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen1']);
 $gen2 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen2']);
 $gen3 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen3']);
@@ -413,7 +415,7 @@ foreach($generalsFormat as $general){
        <td align=center><?=$gen1['name']??'-'?></td>
        <td align=center class=bg1>군사</td>
        <td align=center><?=$gen2['name']??'-'?></td>
-        <td align=center class=bg1>시중</td>
+        <td align=center class=bg1>종사</td>
        <td align=center><?=$gen3['name']??'-'?></td>
    </tr>
    <tr>
@@ -13,13 +13,9 @@ $connect=$db->get();

 increaseRefresh("내무부", 1);

-$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);
+$me = $db->queryFirstRow('SELECT no, nation, level, con, turntime, belong FROM general WHERE owner=%i', $userID);

-$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);
+$nation = $db->queryFirstRow('SELECT msg, scoutmsg FROM nation WHERE nation = %i', $me['nation']);

 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -27,9 +23,14 @@ if ($con >= 2) {
    exit();
 }

-if ($me['level'] == 0 || ($me['level'] == 1 && $me['belong'] < $nation['secretlimit'])) {
-    echo "수뇌부가 아니거나 사관년도가 부족합니다.";
-    exit();
+$permission = checkSecretPermission($me);
+if($permission < 0){
+    echo '국가에 소속되어있지 않습니다.';
+    die();
+}
+else if ($permission < 1) {
+    echo "권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.";
+    die();
 }

 if ($me['level'] >= 5) {
@@ -49,12 +50,15 @@ if ($me['level'] >= 5) {
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 내무부</title>
 <script>
-var editable = <?=($me['level']>=5?'true':'false')?>;
+var editable = <?=(($me['level']>=5||$permission==4)?'true':'false')?>;
+var nationMsg = <?=Json::encode($nation['msg']??'')?>;
+var scoutmsg = <?=Json::encode($nation['scoutmsg']??'')?>;
 </script>
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
 <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../e_lib/summernote/summernote-bs4.min.js')?>
 <?=WebUtil::printJS('../e_lib/summernote/lang/summernote-ko-KR.js')?>
+<?=WebUtil::printJS('../e_lib/summernote/plugin/image-sammo/summernote-image-flip.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printJS('js/dipcenter.js')?>
@@ -107,19 +111,15 @@ for ($i=0; $i < $nationcount; $i++) {
        <td align=center>-</td>
        <td align=center>-</td>
        <td align=center>-</td>
-        <td align=left style=font-size:7px;>-</td>
    </tr>";

        continue;
    }

-    $query = "select state,term,fixed,reserved,showing from diplomacy where me='{$me['nation']}' and you='{$nation['nation']}'";
+    $query = "select state,term from diplomacy where me='{$me['nation']}' and you='{$nation['nation']}'";
    $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
    $dip = MYDB_fetch_array($result2);

-    $query = "select reserved,showing from diplomacy where you='{$me['nation']}' and me='{$nation['nation']}'";
-    $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $dip2 = MYDB_fetch_array($result2);
    //속령수
    $query = "select city from city where nation='{$nation['nation']}'";
    $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
@@ -145,33 +145,6 @@ for ($i=0; $i < $nationcount; $i++) {
    }

    $date = date('Y-m-d H:i:s');
-    $note = "";
-    if ($dip['fixed'] != "") {
-        if ($dip['state'] == 7) {
-            $note .= $dip['fixed'];
-        } else {
-            $note .= "<font color=gray>{$dip['fixed']}</font>";
-        }
-        if ($dip['reserved'] != "" || $dip2['reserved'] != "") {
-            $note .= "<br>";
-        }
-    }
-    if ($dip['showing'] >= $date) {
-        if ($dip['reserved'] != "") {
-            $note .= "<font color=skyblue>아국측 제의</font>: ".$dip['reserved'];
-            if ($dip2['reserved'] != "") {
-                $note .= "<br>";
-            }
-        }
-    }
-    if ($dip2['showing'] >= $date) {
-        if ($dip2['reserved'] != "") {
-            $note .= "<font color=limegreen>상대측 제의</font>: ".$dip2['reserved'];
-        }
-    }
-    if ($note == "") {
-        $note = "&nbsp;";
-    }

    echo "
    <tr>
@@ -189,15 +162,13 @@ for ($i=0; $i < $nationcount; $i++) {
        <td align=center>-</td>
        <td align=center>-</td>";
    }
-    echo "
-        <td align=left style=font-size:7px;>{$note}</td>
-    </tr>";
+    echo "</tr>";
 }
 echo "
 </table>
 ";

-$query = "select nation,name,color,type,msg,gold,rice,bill,rate,scout,war,scoutmsg,secretlimit from nation where nation='{$me['nation']}'";
+$query = "select nation,name,color,type,gold,rice,bill,rate,scout,war,secretlimit from nation where nation='{$me['nation']}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $nation = MYDB_fetch_array($result);

@@ -242,7 +213,7 @@ if ($budgetricediff > 0) {
                <input type='submit' class='submit' name=btn value='국가방침 수정'><input type='button' class='cancel_edit' value='취소'>
            </div>
        </div>
-        <textarea type=hidden class='input_form' style='display:none;' name=msg><?=$nation['msg']?></textarea>
+        <input type='hidden' class='input_form' name='msg' data-global='nationMsg'>
        <div class='edit_form viewer'></div>
    </div></td></tr>
    <tr><td colspan='2'><div id='scoutMsgForm'>
@@ -255,7 +226,7 @@ if ($budgetricediff > 0) {
            </div>
        </div>
        <div style='border-bottom:solid gray 0.5px;'>870px x 200px를 넘어서는 내용은 표시되지 않습니다.</div>
-        <textarea type=hidden class='input_form' style='display:none;' name=scoutmsg><?=$nation['scoutmsg']?></textarea>
+        <input type='hidden' class='input_form' name='scoutmsg' data-global='scoutmsg'>
        <div style="width:870px;margin-left:auto;">
            <div class='edit_form viewer'></div>
        </div>
@@ -303,8 +274,8 @@ if ($budgetricediff > 0) {
                <tr>
                    <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 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>
+                    <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 class=bg1>기밀 권한 (1 ~ 99년)&nbsp;&nbsp;&nbsp;</td>
@@ -177,7 +177,7 @@ for($i=0; $i < $nationcount; $i++) {
 ";
 }
 ?>
-    <tr><td colspan=<?=$nationcount+1?> align=center>불가침 : <font color=limegreen>@</font>, 통합 : <font color=cyan>○</font>, 합병 : <font color=skyblue>◎</font>, 통상 : ㆍ, 선포 : <font color=magenta>▲</font>, 교전 : <font color=red>★</font></td></tr>
+    <tr><td colspan=<?=$nationcount+1?> align=center>불가침 : <font color=limegreen>@</font>, <!--통합 : <font color=cyan>○</font>, -->합병 : <font color=skyblue>◎</font>, 통상 : ㆍ, 선포 : <font color=magenta>▲</font>, 교전 : <font color=red>★</font></td></tr>
 </table>

 <?php if ($realConflict) : ?>
@@ -23,7 +23,7 @@ $query = "select no,nation,level,con,turntime,belong from general where owner='{
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);

-$query = "select level,secretlimit from nation where nation='{$me['nation']}'";
+$query = "select level from nation where nation='{$me['nation']}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $nation = MYDB_fetch_array($result);

@@ -33,9 +33,14 @@ if ($con >= 2) {
    exit();
 }

-if ($me['level'] == 0 || ($me['level'] == 1 && $me['belong'] < $nation['secretlimit'])) {
-    echo "수뇌부가 아니거나 사관년도가 부족합니다.";
-    exit();
+$permission = checkSecretPermission($me);
+if($permission < 0){
+    echo '국가에 소속되어있지 않습니다.';
+    die();
+}
+else if ($permission < 1) {
+    echo "권한이 부족합니다. 수뇌부가 아니거나 사관년도가 부족합니다.";
+    die();
 }

 $sel = [];
@@ -99,10 +104,15 @@ switch ($type) {

 $generals = $db->query('SELECT npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general WHERE nation = %i %l', $me['nation'], $orderSQL);

+$genCntEff = 0;
 foreach ($generals as &$general) {
    $general['cityText'] = CityConst::byID($general['city'])->name;
    $general['troopText'] = $troopName[$general['troop']]??'-';

+    if($general['npc'] != 5){
+        $genCntEff += 1;
+    }
+
    if ($general['level'] == 12) {
        $lbonus = $nation['level'] * 2;
    } elseif ($general['level'] >= 5) {
@@ -220,11 +230,11 @@ foreach($generals as $general){
 <tr>
 <td class='bg1'>전체 금</td><td><?=number_format($totalGold)?></td>
 <td class='bg1'>전체 쌀</td><td><?=number_format($totalRice)?></td>
-<td class='bg1'>평균 금</td><td><?=number_format($totalGold/$genCnt, 2)?></td>
-<td class='bg1'>평균 쌀</td><td><?=number_format($totalRice/$genCnt, 2)?></td>
+<td class='bg1'>평균 금</td><td><?=number_format($totalGold/$genCntEff, 2)?></td>
+<td class='bg1'>평균 쌀</td><td><?=number_format($totalRice/$genCntEff, 2)?></td>
 </tr>
 <tr>
-<td class='bg1'>전체 병력/장수</td><td><?=number_format($crewTotal)?>/<?=number_format($genCnt)?></td>
+<td class='bg1'>전체 병력/장수</td><td><?=number_format($crewTotal)?>/<?=number_format($genCntEff)?></td>
 <td class='bg1'>훈사 90 병력/장수</td><td><?=number_format($crew90)?>/<?=number_format($gen90)?></td>
 <td class='bg1'>훈사 80 병력/장수</td><td><?=number_format($crew80)?>/<?=number_format($gen80)?></td>
 <td class='bg1'>훈사 60 병력/장수</td><td><?=number_format($crew60)?>/<?=number_format($gen60)?></td>
@@ -150,12 +150,15 @@ if($meLevel >= 5 && $nation["l{$meLevel}set"] == 0) {
    echo "
            <select name=outlist size=1 style=color:white;background-color:black;>";

-    $query = "select no,name,level,leader,power,intel,killturn from general where nation='{$me['nation']}' and level!='12' and no!='{$me['no']}' order by npc,binary(name)";
+    $query = "select no,npc,name,level,leader,power,intel,killturn from general where nation='{$me['nation']}' and level!='12' and no!='{$me['no']}' 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);
+        if($general['npc'] == 5){
+            continue;
+        }
        echo "
                <option value={$general['no']}>{$general['name']} <small>({$general['leader']}/{$general['power']}/{$general['intel']}, {$general['killturn']}턴)</small></option>";
    }
@@ -9,8 +9,6 @@ if ($type <= 0 || $type > 12) {
    $type = 10;
 }

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -115,7 +113,7 @@ for ($j=0; $j < $citycount; $j++) {
    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
    $gen2 = MYDB_fetch_array($genresult);

-    $query = "select name from general where no='{$city['gen3']}'";    // 시중
+    $query = "select name from general where no='{$city['gen3']}'";    // 종사
    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
    $gen3 = MYDB_fetch_array($genresult);

@@ -165,7 +163,7 @@ for ($j=0; $j < $citycount; $j++) {
        <td align=center>";
    echo $gen2['name']==''?"-":"{$gen2['name']}";
    echo "</td>
-        <td align=center id=bg1>시중</td>
+        <td align=center id=bg1>종사</td>
        <td align=center>";
    echo $gen3['name']==''?"-":"{$gen3['name']}";
    echo "</td>
@@ -9,8 +9,6 @@ if($type <= 0 || $type > 15) {
    $type = 1;
 }

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -120,7 +120,7 @@ echo "
        <td align=center>+$goldincomeList[0] / +$deadIncome</td>
        <td align=center id=bg1>세곡/둔전</td>
        <td align=center>+$riceincomeList[0] / +$riceincomeList[1]</td>
-        <td align=center id=bg1>지급율</td>
+        <td align=center id=bg1>지급률</td>
        <td align=center colspan=3>"; echo $me['nation']==0?"해당 없음":"{$nation['bill']} %"; echo "</td>
    </tr>
    <tr>
@@ -10,8 +10,6 @@ $tnmt = Util::getReq('tnmt', 'int', 1);
 //$detachNPC = Util::getReq('detachNPC', 'bool');
 $detachNPC = false;

-extractMissingPostToGlobals();
-
 if($mode < 0 || $mode > 2){
    $mode = 2;
 }
@@ -1,77 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("회의실", 1);
-
-$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);
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title><?=UniqueConst::$serverName?>: 회의실</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-
-</head>
-
-<body>
-<div style='width:1000px;margin:auto'>
-<table 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>
-        제목 <input type=textarea maxlength=50 name=title style=color:white;background-color:black;width:830px;>
-        </td>
-    </tr>
-    <tr><td>
-        <textarea name=msg style=color:white;background-color:black;width:998px;height:200px;></textarea><br>
-        <input type=submit value=저장하기>
-        <input type=hidden name=num value=-1>
-    </td></tr>
-</form>
-</table>
-<br>
-<?php
-$nation = getNation($me['nation']);
-
-//20개 메세지
-$index = $nation['boardindex'];
-for($i=0; $i < 20; $i++) {
-    $who = "board{$index}_who";
-    $query = "select name,picture,imgsvr from general where no='$nation[$who]'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
-    if($nation["board{$index}"] != '') { msgprint($nation["board{$index}"], $general['name'], $general['picture'], $general['imgsvr'], $nation["board{$index}_when"], $index, 0); }
-    $index--;
-    if($index < 0) { $index = 19; }
-}
-
-?>
-
-<table width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-</div>
-</body>
-</html>
-
@@ -1,63 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("국법", 1);
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title><?=UniqueConst::$serverName?>: 국법</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-
-</head>
-
-<body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>국 법<br><?=backButton()?></td></tr>
-    <tr><td>
-
-<?php
-$query = "select no,nation,level from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$query = "select rule from nation where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$nation = MYDB_fetch_array($result);
-
-if($me['level'] >= 5) {
-    echo "
-<form name=form1 method=post action=c_nationrule.php>
-<textarea name=msg style=color:white;background-color:black;width:998px;height:500px;>{$nation['rule']}</textarea><br>
-<input type=submit value=저장하기>
-</form>";
-} else {
-    echo "
-<textarea name=msg style=color:white;background-color:black;width:998px;height:500px; readonly>{$nation['rule']}</textarea><br>";
-}
-
-?>
-    </td></tr>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-</body>
-</html>
-
@@ -255,7 +255,7 @@ $startYear = $gameStor->getValue('startyear');
                        <option value="1">일반</option>
                        <option value="4">태수</option>
                        <option value="3">군사</option>
-                        <option value="2">시중</option>
+                        <option value="2">종사</option>
                        <option value="10">무장 수뇌</option>
                        <option value="9">지장 수뇌</option>
                        <option value="11">참모</option>
@@ -27,7 +27,6 @@ $sel = Util::getReq('sel', 'int');
 $msg = '';
 $msg2 = '';

-extractMissingPostToGlobals();

 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
@@ -1,60 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$title = Util::getReq('title');
-$msg = Util::getReq('msg');
-$num = Util::getReq('num', 'int');
-$reply = Util::getReq('reply');
-// $title, $msg, $num
-
-extractMissingPostToGlobals();
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-if (getBlockLevel() == 1 || getBlockLevel() == 3) {
-    header('location:b_chiefboard.php');
-    die();
-}
-
-$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);
-
-$title = str_replace("|", " ", $title);
-$msg = str_replace("|", " ", $msg);
-$reply = str_replace("|", " ", $reply);
-$title = trim($title);
-$msg = trim($msg);
-$reply = trim($reply);
-
-$nation = getNation($me['nation']);
-
-//새글 추가시
-if($num == -1 && $title != "" && $msg != "") {
-    $num = $nation['coreindex'] + 1;
-    if($num >= 20) { $num = 0; }
-    $msg = $title."|".$msg;
-    $msg = addslashes(SQ2DQ($msg));
-    $date = date('Y-m-d H:i:s');
-    $query = "update nation set coreboard{$num}='$msg',coreboard{$num}_who='{$me['no']}',coreboard{$num}_when='$date' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $query = "update nation set coreindex='$num' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-//$num에 댓글시
-} elseif($num >= 0 && $reply != "") {
-    $newmsg = $nation["coreboard{$num}"]."|".$me['no']."|".$reply;
-    $newmsg = addslashes(SQ2DQ($newmsg));
-
-    $query = "update nation set coreboard{$num}='$newmsg' where nation='{$me['nation']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-}
-
-header('location:b_chiefboard.php');
@@ -12,8 +12,6 @@ $rate = Util::getReq('rate', 'int');
 $bill = Util::getReq('bill', 'int');
 $secretlimit = Util::getReq('secretlimit', 'int');

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -23,7 +21,12 @@ $db = DB::db();
 $me = $db->queryFirstRow('SELECT `no`,nation,`level` FROM general WHERE `owner`=%i', $userID);

 //내가 수뇌부이어야함
-if($me['level'] < 5) {
+$permission = checkSecretPermission($me);
+if($permission < 0){
+    header('location:b_myBossInfo.php');
+    exit();
+}
+else if ($me['level'] < 5 && $permission != 4) {
    header('location:b_myBossInfo.php');
    exit();
 }
@@ -44,7 +47,7 @@ if($btn == "국가방침 수정") {
    $db->update('nation', [
        'rate'=>$rate,
    ], 'nation=%i', $me['nation']);
-} elseif($btn == "지급율") {
+} elseif($btn == "지급률") {
    $bill = Util::valueFit($bill, 20, 200);
    $db->update('nation', [
        'bill'=>$bill
@@ -93,11 +93,6 @@ if($command == 61) {
    $me = MYDB_fetch_array($result);

    if($me['level'] >= 5) {
-        $note = StringUtil::neutralize($note, 90);
-
-        $query = "update diplomacy set reserved='{$note}' where me='{$me['nation']}' and you='$double'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
        $count = count($turn);
        $str = "type=type";
        for($i=0; $i < $count; $i++) {
@@ -11,8 +11,6 @@ $genlist = Util::getReq('genlist', 'int');
 $outlist = Util::getReq('outlist', 'int');
 $citylist = Util::getReq('citylist', 'int');

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -61,7 +59,7 @@ if($btn == "임명") {
        header('location:b_myBossInfo.php');
        exit();
    }
-    $query = "select no,name,gold,rice,nation,troop,level,npc,picture,imgsvr from general where no='$outlist'";
+    $query = "select no,name,gold,rice,nation,troop,level,npc,picture,imgsvr,permission,penalty from general where no='$outlist'";
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $general = MYDB_fetch_array($result);

@@ -75,6 +73,19 @@ if($btn == "임명") {
        header('location:b_myBossInfo.php');
        exit();
    }
+
+    //추방할사람이 외교권자이면 불가
+    $permission = checkSecretPermission($general);
+    if($permission == 4){
+        header('location:b_myBossInfo.php');
+        exit();
+    }
+
+    //NPC 부대장 추방 불가
+    if($general['npc'] == 5){
+        header('location:b_myBossInfo.php');
+        exit();
+    }
 }

 //나와 대상 장수는 국가가 같아야 함
@@ -144,13 +155,15 @@ if($btn == "추방") {
            else{
                $db->update('general', [
                    'level'=>0,
+                    'permission'=>'normal',
                    'nation'=>0,
                    'belong'=>0,
-                    'betray'=>$db->sqleval('betray + 1'),
                    'makelimit'=>12,
                    'gold'=>$general['gold'],
                    'rice'=>$general['rice'],
+                    'experience'=>$db->sqleval('experience * (1 - 0.1*betray)'),
                    'dedication'=>$db->sqleval('dedication * (1 - 0.1*betray)'),
+                    'betray'=>$db->sqleval('betray + 1'),
                ], 'no=%i', $general['no']);
            }
        }
@@ -1,56 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-// $title, $msg, $num
-$title = Util::getReq('title');
-$msg = Util::getReq('msg');
-$num = Util::getReq('num', 'int');
-$reply = Util::getReq('reply');
-
-extractMissingPostToGlobals();
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-if(getBlockLevel() != 1 && getBlockLevel() != 3) {
-    $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);
-
-    $title = str_replace("|", " ", $title);
-    $msg = str_replace("|", " ", $msg);
-    $reply = str_replace("|", " ", $reply);
-    $title = trim($title);
-    $msg = trim($msg);
-    $reply = trim($reply);
-
-    $nation = getNation($me['nation']);
-
-    //새글 추가시
-    if($num == -1 && $title != "" && $msg != "") {
-        $num = $nation['boardindex'] + 1;
-        if($num >= 20) { $num = 0; }
-        $msg = $title."|".$msg;
-        $msg = addslashes(SQ2DQ($msg));
-        $date = date('Y-m-d H:i:s');
-        $query = "update nation set board{$num}='$msg',board{$num}_who='{$me['no']}',board{$num}_when='$date' where nation='{$me['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $query = "update nation set boardindex='$num' where nation='{$me['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    //$num에 댓글시
-    } elseif($num >= 0 && $reply != "") {
-        $newmsg = $nation["board{$num}"]."|".$me['no']."|".$reply;
-        $newmsg = addslashes(SQ2DQ($newmsg));
-
-        $query = "update nation set board{$num}='$newmsg' where nation='{$me['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    }
-}
-
-header('location:b_nationboard.php');
@@ -1,27 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-// $msg
-$msg = Util::getReq('msg');
-
-extractMissingPostToGlobals();
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-$db = DB::db();
-$connect=$db->get();
-
-$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);
-
-$msg = addslashes(SQ2DQ($msg));
-
-$query = "update nation set rule='$msg' where nation='{$me['nation']}'";
-MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-header('location:b_nationrule.php');
@@ -14,8 +14,6 @@ $gen = Util::getReq('gen', 'int');
 $sel = Util::getReq('sel', 'int');
 $trig = Util::getReq('trig', 'int');

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -9,8 +9,6 @@ $name = Util::getReq('name');
 $gen = Util::getReq('gen', 'int');
 $troop = Util::getReq('troop', 'int');

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = $session::getUserID();
@@ -10,8 +10,6 @@ $comment = Util::getReq('comment');
 $title = Util::getReq('title');
 $str = Util::getReq('str');

-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -218,3 +218,19 @@ div.bar_out div.bar_in{
    margin:0;
    padding:0;
 }
+
+.select2-selection--single.simple-select2-align-center .select2-selection__rendered {
+    text-align: center;
+}
+
+.select2-dropdown.simple-select2-align-center li.select2-results__option{
+    text-align: center;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.text-secondary .select2-selection__rendered{
+    color:white;
+}
+
+.select2-container--bootstrap4 .text-secondary .select2-results__option[aria-selected=false]{
+    color:white;
+}
@@ -11,6 +11,12 @@
    text-align:center;
 }

+.map_title_tooltiptext .tooltip-inner{
+    max-width:220px;
+    width:220px;
+    text-align: left;
+}
+
 .map_title_text{
    margin:auto;
    text-align:center;
@@ -59,12 +59,16 @@
    height:667px;
 }

-.private_message{
+.diplomacy_message{
    height:667px;
 }

 .national_message{
-    height:1350px;
+    flex: 1;
+}
+
+.private_message{
+    flex: 1;
 }

 .msg_icon{
@@ -83,6 +87,7 @@
    font-weight: bold;
    margin-bottom:3px;
    color:white;
+    position: relative;
 }

 .message_input_form{
@@ -129,6 +134,16 @@
    outline-style:solid;
    outline-width:1px;
    outline-color: gray;
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: column;
+}
+.board_side > div{
+    height: 1.2em;
+}
+
+.msg_invalid{
+    color:rgba(255,255,255,0.5);
 }

 .msg_body{
@@ -143,6 +158,14 @@
    border-radius: 3px;
 }

+.btn-delete-msg{
+    position: absolute;
+    right: 0;
+    top: 0;
+    margin:2px 2px 0 2px;
+    font-size:8px;
+}
+
 /*
 .public_message .msg_target{
    box-shadow: 2px 2px darkslategrey;
@@ -164,6 +187,7 @@
 .msg_content{
    margin-left:10px;
    margin-right:5px;
+    overflow:hidden;
 }

 .msg_prompt{
@@ -243,7 +243,7 @@ function cityInfo() {
        <td height=7>".bar($wall)."</td>
        <td rowspan=2 style='text-align:center;' class='bg1'><b>시세</b></td>
        <td height=7>".bar($trade)."</td>
-        <td rowspan=2 style='text-align:center;' class='bg1'><b>시중</b></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>
@@ -322,7 +322,7 @@ function myNationInfo() {
        <td class='center'>";echo $me['nation']==0?"해당 없음":"{$nation['rice']}";echo "</td>
    </tr>
    <tr>
-        <td class='bg1 center'><b>지급율</b></td>
+        <td class='bg1 center'><b>지급률</b></td>
        <td class='center'>";
    if($me['nation'] == 0) {
        echo "해당 없음";
@@ -399,6 +399,61 @@ function myNationInfo() {
 ";
 }

+function checkSecretPermission($me){
+    if(!key_exists($me['penalty']) || !key_exists($me['permission'])){
+        trigger_error ('canAccessSecret() 함수에 필요한 인자가 부족');
+    }
+    $penalty = Json::decode($me['penalty'])??[];
+    $permission = $me['permission'];
+
+    if(!$me['nation']){
+        return -1;
+    }
+
+    if($me['level'] == 0){
+        return -1;
+    }
+
+    $secretLimit = $db->queryFirstField('SELECT secretlimit FROM nation WHERE nation = %i', $me['nation']);
+
+    if($pernalty['noSecret']??false){
+        return 0;
+    }
+
+    $secretMin = 0;
+    $secretMax = 3;
+    if($penalty['noTopSecret']??false){
+        $secretMax = 1;
+    }
+    else if($penalty['noChief']??false){
+        $secretMax = 1;
+    }
+    else if($penalty['noAmbassador']??false){
+        $secretMax = 2;
+    }    
+
+    if($me['level'] == 12){
+        $secretMin = 4;
+    }
+    else if($me['permission'] == 'ambassador'){
+        $secretMin = 4;
+    }
+    else if($me['permission'] == 'auditor'){
+        $secretMin = 3;
+    }
+    else if($me['level'] >= 5){
+        $secretMin = 2;
+    }
+    else if($me['level'] > 1){
+        $secretMin = 1;
+    }
+    else if($me['belong'] >= $secretLimit){
+        $secretMin = 1;
+    }
+
+    return min($secretMin, $secretMax);
+}
+
 function addCommand($typename, $value, $valid = 1, $color=0) {
    if($valid == 1) {
        switch($color) {
@@ -437,7 +492,7 @@ function commandTable() {
    $connect=$db->get();
    $userID = Session::getUserID();

-    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'develcost', 'scenario']);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'develcost', 'scenario', 'join_mode']);

    $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),"");
@@ -493,7 +548,7 @@ function commandTable() {
 <select name=commandtype size=1 style='height:20px;width:260px;color:white;background-color:black;font-size:12px;'>";
    addCommand("휴 식", 0);
    addCommand("요 양", 50);
-    commandGroup("========= 내 정 ==========");
+    commandGroup("======= 내 정 ========");
    if($me['level'] >= 1 && ($citycount != 0 || $admin['year'] >= $admin['startyear']+3) && $city['supply'] != 0) {
        addCommand("농지개간(지력경험, 자금$develcostA)", 1, 1, $colorA);
        addCommand("상업투자(지력경험, 자금$develcostA)", 2, 1, $colorA);
@@ -519,7 +574,7 @@ function commandTable() {
        addCommand("물자조달(랜덤경험)", 9, 0);
    }
    commandGroup("", 1);
-    commandGroup("========= 군 사 ==========");
+    commandGroup("======= 군 사 ========");
    if($me['level'] >= 1 && $citycount > 0) {
        addCommand("첩보(통솔경험, 자금$develcost3, 군량$develcost3)", 31);
        addCommand("징병(통솔경험)", 11);
@@ -544,7 +599,7 @@ function commandTable() {
    }

    commandGroup("", 1);
-    commandGroup("========= 인 사 ==========");
+    commandGroup("======= 인 사 ========");
    addCommand("이동(통솔경험, 자금$develcost, 사기↓)", 21);
    addCommand("강행(통솔경험, 자금$develcost5, 병력/사기/훈련↓)", 30);
    
@@ -554,7 +609,10 @@ function commandTable() {
        addCommand("인재탐색(랜덤경험, 자금$develcost)", 29, 0);
    }

-    if($me['level'] >= 1 && $city['supply'] != 0) {
+    if($admin['join_mode'] == 'onlyRandom'){
+        //do Nothing
+    }
+    else if($me['level'] >= 1 && $city['supply'] != 0) {
        addCommand("등용(자금{$develcost5}+장수가치)", 22);
    } else {
        addCommand("등용(자금{$develcost5}+장수가치)", 22, 0);
@@ -576,7 +634,7 @@ function commandTable() {
        addCommand("임관", 25, 0);
    }
    commandGroup("", 1);
-    commandGroup("========= 계 략 ==========");
+    commandGroup("======= 계 략 ========");
    if($me['level'] >= 1 && (($nation['level'] > 0 && $city['nation'] == $me['nation'] && $city['supply'] != 0) || $nation['level'] == 0)) {
        addCommand("화계(지력경험, 자금$develcost5, 군량$develcost5)", 32);
        addCommand("탈취(무력경험, 자금$develcost5, 군량$develcost5)", 33);
@@ -589,7 +647,7 @@ function commandTable() {
        addCommand("선동(통솔경험, 자금$develcost5, 군량$develcost5)", 35, 0);
    }
    commandGroup("", 1);
-    commandGroup("========= 개 인 ==========");
+    commandGroup("======= 개 인 ========");
    if($me['level'] >= 1) {
        addCommand("단련(자금$develcost, 군량$develcost)", 41);
    } else {
@@ -709,7 +767,7 @@ function CoreCommandTable() {
    addCommand("몰수", 24, $valid);
    commandGroup("", 1);
    commandGroup("====== 외 교 ======");
-    addCommand("통합 제의", 53, $valid);
+    //addCommand("통합 제의", 53, $valid);

    addCommand("항복 권고", 51, $valid);
    if($nation['level'] >= 2) {
@@ -1125,59 +1183,6 @@ function nationMsg() {
    return $msg?:'';
 }

-function msgprint($msg, $name, $picture, $imgsvr, $when, $num, $type) {
-    $db = DB::db();
-    $connect=$db->get();
-
-    $message = explode('|', $msg);
-    $count = (count($message) - 2)/2;
-    $message[0] = Tag2Code($message[0]);
-    $message[1] = Tag2Code($message[1]);
-//    $message[0] = str_replace("\n", "<br>", $message[0]);
-//    $message[1] = str_replace("\n", "<br>", $message[1]);
-
-    if($type == 0) { $board = "c_nationboard.php"; }
-    else { $board = "c_chiefboard.php"; }
-
-    $imageTemp = GetImageURL($imgsvr);
-    echo "
-<table style='text-align:center;' width=1000 class='tb_layout bg0'>
-    <tr>
-        <td width=90 style='text-align:center;' class='bg1'><font size=1>$name</font></td>
-        <td width=746 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=90 height=64 valign=top><img width='64' height='64' class='generalIcon' src='{$imageTemp}/{$picture}' border='0'></td>
-        <td width=906 colspan=2>$message[1]</td>
-    </tr>";
-    for($i=0; $i < $count; $i++) {
-        $who = Tag2Code($message[2+$i*2]);
-        $reply = Tag2Code($message[3+$i*2]);
-        $query = "select name from general where no='$who'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $regen = MYDB_fetch_array($result);
-        echo "
-    <tr>
-        <td width=90 style='text-align:center;'><font size=1>{$regen['name']}</font></td>
-        <td width=906 colspan=2>$reply</td>
-    </tr>";
-    }
-    echo "
-    <tr>
-        <form name=reply_form{$num} method=post action=$board>
-        <td width=90 style='text-align:center;'>댓글달기</td>
-        <td width=906 colspan=2>
-            <input type=textarea name=reply maxlength=250 style=color:white;background-color:black;width:804px;>
-            <input type=submit value=댓글달기>
-            <input type=hidden name=num value=$num>
-        </td>
-        </form>
-    </tr>
-</table>
-<br>";
-}
-
 function banner() {

    return sprintf(
@@ -1252,8 +1257,9 @@ function increaseRefresh($type="", $cnt=1) {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
    $gameStor->refresh = $gameStor->refresh+$cnt; //TODO: +로 증가하는 값은 별도로 분리
+    $isunited = $gameStor->isunited;

-    if($generalID && $userGrade < 6) {
+    if($isunited != 2 && $generalID && $userGrade < 6) {
        $db->update('general', [
            'lastrefresh'=>$date,
            'con'=>$db->sqleval('con + %i', $cnt),
@@ -105,12 +105,19 @@ function getTurn(array $general, $type, $font=1) {
            case 25: //임관
                $double = $command[1];

-                $nation = getNationStaticInfo($double);
+                if($double == 98){
+                    $nationName = '건국된 임의 국가';
+                }
+                else if($double == 99){
+                    $nationName = '임의의 국가';
+                }
+                else{
+                    $nationName = getNationStaticInfo($double)['name']??'?!?!';
+                }
+                

-                if(!$nation['name']) { $nation['name'] = '????'; }
-
-                $josaRo = JosaUtil::pick($nation['name'], '로');
-                $str[$i] = "【{$nation['name']}】{$josaRo} 임관";
+                $josaRo = JosaUtil::pick($nationName, '로');
+                $str[$i] = "【{$nationName}】{$josaRo} 임관";
                break;
            case 26: //집합
                $str[$i] = "집합";
@@ -511,7 +518,7 @@ function processCommand($no) {
                case 27: process_27($general); break; //발령
                case 51: process_51($general); break; //항복권고
                case 52: process_52($general); break; //원조
-                case 53: process_53($general); break; //통합제의
+                //case 53: process_53($general); break; //통합제의
                case 61: process_61($general); break; //불가침제의
                case 62: process_62($general); break; //선전 포고
                case 63: process_63($general); break; //종전 제의
@@ -200,7 +200,7 @@ function getSpecialInfo(?int $type):?string{
        42 => ['환술', '[전투] 계략 성공 확률 +10%p, 계략 성공 시 대미지 +30%'],
        43 => ['집중', '[전투] 계략 성공 시 대미지 +50%'],
        44 => ['신중', '[전투] 계략 성공 확률 100%'],
-        45 => ['반계', '[전투] 상대의 계략을 30% 확률로 되돌림, 반목 성공시 대미지 추가(+60% → +100%)'],
+        45 => ['반계', '[전투] 상대의 계략 성공 확률 -10%p, 상대의 계략을 40% 확률로 되돌림, 반목 성공시 대미지 추가(+60% → +100%)'],

        50 => ['보병', '[군사] 보병 계통 징·모병비 -10%<br>[전투] 공격 시 아군 피해 -10%, 수비 시 아군 피해 -20%'],
        51 => ['궁병', '[군사] 궁병 계통 징·모병비 -10%<br>[전투] 회피 확률 +20%p'],
@@ -209,7 +209,7 @@ function getSpecialInfo(?int $type):?string{

        60 => ['돌격', '[전투] 상대 회피 불가, 공격 시 전투 페이즈 +1, 공격 시 대미지 +10%'],
        61 => ['무쌍', '[전투] 대미지 +10%, 공격 시 필살 확률 +10%p'],
-        62 => ['견고', '[전투] 상대 필살 불가, 상대 계략 시도시 성공 확률 -10%p'],
+        62 => ['견고', '[전투] 상대 필살, 격노, 위압, 저격 불가, 상대 계략 시도시 성공 확률 -10%p, 부상 없음, 아군 피해 -5%'],
        63 => ['위압', '[전투] 훈련/사기≥90, 병력≥1,000 일 때 첫 페이즈 위압 발동(적 공격 불가)'],

        70 => ['저격', '[전투] 전투 개시 시 1/3 확률로 저격 발동'],
@@ -278,11 +278,11 @@ function getLevel($level, $nlevel=8) {

        case 712: $call =     '황제'; break;    case 612: $call =       '왕'; break;
        case 711: $call =     '승상'; break;    case 611: $call =   '광록훈'; break;
-        case 710: $call =   '위장군'; break;    case 610: $call =   '전장군'; break;
+        case 710: $call = '표기장군'; break;    case 610: $call =   '좌장군'; break;
        case 709: $call =     '사공'; break;    case 609: $call =   '상서령'; break;
-        case 708: $call = '표기장군'; break;    case 608: $call =   '좌장군'; break;
+        case 708: $call = '거기장군'; break;    case 608: $call =   '우장군'; break;
        case 707: $call =     '태위'; break;    case 607: $call =   '중서령'; break;
-        case 706: $call = '거기장군'; break;    case 606: $call =   '우장군'; break;
+        case 706: $call =   '위장군'; break;    case 606: $call =   '전장군'; break;
        case 705: $call =     '사도'; break;    case 605: $call =   '비서령'; break;

        case 512: $call =       '공'; break;    case 412: $call =     '주목'; break;
@@ -302,7 +302,7 @@ function getLevel($level, $nlevel=8) {

        case   4: $call =     '태수'; break;
        case   3: $call =     '군사'; break;
-        case   2: $call =     '시중'; break;
+        case   2: $call =     '종사'; break;
        case   1: $call =     '일반'; break;
        case   0: $call =     '재야'; break;
        default:  $call =        '-'; break;
@@ -229,7 +229,7 @@ function SetNationFront($nationNo) {

    if($adj){
        $db->update('city', [
-            'front'=>1
+            'front'=>($enemyCities?1:2),
        ], 'nation=%i and city in %li', $nationNo, array_keys($adj));
    }
 }
@@ -562,11 +562,14 @@ function postUpdateMonthly() {
        $genCount = $genNum[$dip['me']];
        // 25% 참여율일때 두당 10턴에 4000명 소모한다고 계산
        // 4000 / 10 * 0.25 = 100
-        $term = Util::round($dip['dead'] / 100 / $genCount) + 1;
-        if($dip['term'] > $term) { $term = $dip['term']; }
-        if($term > 13) { $term = 13; }
-        $query = "update diplomacy set term='{$term}' where (me='{$dip['me']}' and you='{$dip['you']}')";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $term = floor($dip['dead'] / 100 / $genCount);
+        $dip['dead'] -= $term * 100 * $genCount;
+        $term = Util::valueFit($dip['term'] + $term, 0, 13);
+        
+        $db->update('diplomacy', [
+            'term' => $term,
+            'dead'=> $dip['dead'],
+        ], 'me = %i AND you = %i', $dip['me'], $dip['you']);
    }

    //개전국 로그
@@ -609,7 +612,7 @@ function postUpdateMonthly() {
    }
    pushWorldHistory($history, $admin['year'], $admin['month']);
    //사상자 초기화
-    $query = "update diplomacy set dead=0";
+    $query = "update diplomacy set dead=0 WHERE state != 0";
    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    //외교 기한-1
    $query = "update diplomacy set term=term-1 where term!=0";
@@ -771,6 +774,10 @@ function checkMerge() {
            'data'=>Json::encode($oldNation)
        ]);

+        $db->update('general', [
+            'nation'=>0,
+        ], 'nation=%i AND npc = 5', $me['nation']);
+
        $query = "delete from nation where nation='{$me['nation']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        // 아국 모든 도시들 상대국 소속으로
@@ -913,6 +920,10 @@ function checkSurrender() {
            'data'=>Json::encode($oldNation)
        ]);

+        $db->update('general', [
+            'nation'=>0,
+        ], 'nation=%i AND npc = 5', $me['nation']);
+
        $query = "delete from nation where nation='{$me['nation']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        // 군주가 있는 위치 구함
@@ -960,9 +971,9 @@ function updateNationState() {
    $connect=$db->get();

    $history = array();
-    $admin = $gameStor->getValues(['year', 'month']);
+    $admin = $gameStor->getValues(['year', 'month', 'fiction', 'startyear', 'show_img_level', 'turnterm']);

-    $query = "select nation,name,level from nation";
+    $query = "select nation,name,level,gennum,tech from nation";
    $nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $nationcount = MYDB_num_rows($nationresult);

@@ -973,10 +984,6 @@ function updateNationState() {
        $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        $citycount = MYDB_num_rows($cityresult);

-        $query = "select no from general where nation='{$nation['nation']}'";
-        $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $gencount = MYDB_num_rows($genresult);
-
        if($citycount == 0) {
            $nationlevel = 0;   // 방랑군
        } elseif($citycount == 1) {
@@ -996,6 +1003,7 @@ function updateNationState() {
        }

        if($nationlevel > $nation['level']) {
+            $oldLevel = $nation['level'];
            $nation['level'] = $nationlevel;

            switch($nationlevel) {
@@ -1020,16 +1028,62 @@ function updateNationState() {
                    break;
            }

+            
+            $lastAssemblerID = $gameStor->assembler_id??0;
+            for($levelGen = max(1, $oldLevel) + 1; $levelGen <= $nationlevel; $levelGen+=1){
+                if(in_array($levelGen, [3, 5, 7])){
+                    $genStep = 2;
+                }
+                else{
+                    $genStep = 1;
+                }
+                
+                while($genStep > 0){
+                    $lastAssemblerID += 1;
+                    $npcObj = new Scenario\NPC(
+                        999, '부대장'.$lastAssemblerID, null, $nation['nation'], null, 
+                        10, 10, 10, 1, $admin['year'] - 15, $admin['year'] + 15,  '은둔', '척사'
+                    );
+                    $npcObj->npc = 5;
+                    $npcObj->build($admin);
+                    $npcID = $npcObj->generalID;
+
+                    $db->insert('troop', [
+                        'name'=>$npcObj->realName,
+                        'nation'=>$nation['nation'],
+                        'no'=>$npcID
+                    ]);
+                    $troopID = $db->insertId();
+
+                    $command = EncodeCommand(0, 0, 0, 26); //집합
+                    $db->update('general', [
+                        'troop'=>$troopID,
+                        'turn0'=>$command,
+                        'turn1'=>$command,
+                        'turn2'=>$command,
+                        'turn3'=>$command,
+                        'turn4'=>$command,
+                        'turn5'=>$command,
+                        'killturn'=>80
+                    ], 'no=%i', $npcID);
+                    $genStep -= 1;
+                }
+            }
+            $gameStor->assembler_id = $lastAssemblerID;
+
            //작위 상승
            $query = "update nation set level='{$nation['level']}' where nation='{$nation['nation']}'";
            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

            refreshNationStaticInfo();
        }
+
+        $gencount = $db->queryFirstField('SELECT count(*) FROM general WHERE nation=%i', $nation['nation']);
+
        $gennum = $gencount;
        if($gencount < GameConst::$initialNationGenLimit) $gencount = GameConst::$initialNationGenLimit;
        //기술 및 변경횟수 업데이트
-        $query = "update nation set tech=totaltech/'$gencount',gennum='$gennum' where nation='{$nation['nation']}'";
+        $query = "update nation set totaltech=tech*'$gencount',gennum='$gennum' where nation='{$nation['nation']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    }
    pushWorldHistory($history, $admin['year'], $admin['month']);
@@ -192,10 +192,34 @@ function processAI($no) {
        $isStart = 0;
    }

-    $query = "select no,turn0,npcid,name,nation,nations,city,level,npcmsg,personal,leader,intel,power,gold,rice,crew,train,atmos,npc,affinity,mode,injury,picture,imgsvr,killturn,makelimit,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
+    $query = "select no,turn0,npcid,name,nation,nations,city,level,npcmsg,personal,leader,intel,power,gold,rice,crew,train,atmos,troop,npc,affinity,mode,injury,picture,imgsvr,killturn,makelimit,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
    $result = MYDB_query($query, $connect) or Error("processAI01 ".MYDB_error($connect),"");
    $general = MYDB_fetch_array($result);

+    if($general['npc'] == 5){
+        if($general['nation'] == 0 && $general['killturn'] > 1){
+            $command = EncodeCommand(0, 0, 0, 0); //휴식
+            $db->update('general', [
+                'turn0'=>$command,
+                'killturn'=>1
+            ], 'no=%i', $general['no']);
+        }
+        else{
+            $command = EncodeCommand(0, 0, 0, 26); //집합
+            $db->update('general', [
+                'turn0'=>$command,
+                'turn1'=>$command,
+                'turn2'=>$command,
+                'turn3'=>$command,
+                'turn4'=>$command,
+                'turn5'=>$command,
+                'killturn'=>rand(70,75),
+            ], 'no=%i', $general['no']);
+        }
+
+        return;
+    }
+
    // 입력된 턴이 있으면 그것 실행
    if(DecodeCommand($general['turn0'])[0] != 0) {
        return;
@@ -224,7 +248,7 @@ function processAI($no) {
        $coreCommand = MYDB_fetch_array($result);
    }

-    $cityCount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i AND supply=1 AND front=1', $general['nation']);
+    $cityCount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i AND supply=1 AND front>0', $general['nation']);
    // 공격가능도시 있으면 1
    $attackable = $cityCount > 0;

@@ -413,12 +437,12 @@ function processAI($no) {
        } elseif($admin['month'] == 12) {
            //세율
            $nation['rate'] = TaxRate($general['nation']);
-            //지급율
+            //지급률
            GoldBillRate($nation['nation'], $nation['rate'], $admin['gold_rate'], $nation['type'], $nation['gold']);
        } elseif($admin['month'] == 6) {
            //세율
            $nation['rate'] = TaxRate($general['nation']);
-            //지급율
+            //지급률
            RiceBillRate($nation['nation'], $nation['rate'], $admin['rice_rate'], $nation['type'], $nation['rice']);
        }

@@ -467,7 +491,7 @@ function processAI($no) {

                SetNationFront($nation['nation']);

-                $frontCount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i AND front=1', $general['nation']);
+                $frontCount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i AND front>0', $general['nation']);
                if($frontCount > 0){
                    break;
                }
@@ -721,7 +745,7 @@ function processAI($no) {
        //전시일때
            if($general['gold'] + $general['rice'] < $resrc*2) { $command = EncodeCommand(0, 0, 0, 9); } //금쌀없으면 조달
            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['rice'] > $resrc && $city['rate'] < 50 && $city['front'] > 0) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
            elseif($general['gold'] < $resrc || ($general['gold'] < $resrc *2 && $general['rice'] > $resrc * 6)) {                                   // 금없으면 쌀팜
                $amount = intdiv(($general['rice'] - $general['gold'])/2, 100);   // 100단위
                if($amount > 0) { $command = EncodeCommand(0, 1, $amount, 49); }// 팜
@@ -803,9 +827,9 @@ function processAI($no) {
                if(count($target) == 0) {
                    //전방 도시 선택, 30% 확률로 태수 있는 전방으로 워프
                    if(rand()%100 < 30) {
-                        $query = "select city from city where nation='{$general['nation']}' and supply='1' and front=1 order by gen1 desc,rand() limit 0,1";
+                        $query = "select city from city where nation='{$general['nation']}' and supply='1' and front>0 order by gen1 desc,rand() limit 0,1";
                    } else {
-                        $query = "select city from city where nation='{$general['nation']}' and supply='1' and front=1 order by rand() limit 0,1";
+                        $query = "select city from city where nation='{$general['nation']}' and supply='1' and front>0 order by rand() limit 0,1";
                    }
                    $result = MYDB_query($query, $connect) or Error("processAI10 ".MYDB_error($connect),"");
                    $cityCount = MYDB_num_rows($result);
@@ -913,7 +937,7 @@ function NPCStaffWork($general, $nation, $dipState){

    $commandList = [];

-    foreach($db->query('SELECT `no`, nation, city, npc, `gold`, `rice`, leader, `power`, intel, killturn, crew, train, atmos, `level` FROM general WHERE nation = %i', $general['nation']) as $nationGeneral) {
+    foreach($db->query('SELECT `no`, nation, city, npc, `gold`, `rice`, leader, `power`, intel, killturn, crew, train, atmos, `level`, troop FROM general WHERE nation = %i', $general['nation']) as $nationGeneral) {
        $cityID = $nationGeneral['city'];
        $generalID = $nationGeneral['no'];

@@ -1082,7 +1106,15 @@ function NPCStaffWork($general, $nation, $dipState){
        }
    } else{    // 포상
        $compNpcWar = $npcWarGeneralsID?$nationGenerals[$npcWarGeneralsID[0]]:null; 
-        $compNpcCivil = $npcCivilGeneralsID?$nationGenerals[$npcCivilGeneralsID[0]]:null;
+        $compNpcCivil = null;
+        foreach($npcCivilGeneralsID??[] as $npcCivilID){
+            $npcCivil = $nationGenerals[$npcCivilID];
+            if($npcCivil['npc'] == 5){
+                continue;
+            }
+            $compNpcCivil = $npcCivil;
+            break;
+        }

        if($compNpcWar && $compNpcWar[$resName] < 21000){
            $amount = min(100, intdiv(($nation[$resName]-($resName=='rice'?(GameConst::$baserice):(GameConst::$basegold))), 5000)*10 + 10);
@@ -1171,13 +1203,18 @@ function NPCStaffWork($general, $nation, $dipState){

        if($maxDevCity['dev'] >= 95 && $targetCity['city'] != $maxDevCity['city'] && $targetCity['dev'] <= 70){
            $targetGeneral = $nationGenerals[Util::choiceRandom($maxDevCity['generals'])];
-            $commandList[EncodeCommand(0, $targetGeneral['no'], $targetCity['city'], 27)] = 2;
+            if($targetGeneral['troop'] != 0){
+                $commandList[EncodeCommand(0, $targetGeneral['no'], $targetCity['city'], 27)] = 2;
+            }
        }

        if(count($targetCity['generals']) < count($maxCity['generals']) - 2){
            //세명 이상 차이나야 함
            $targetGeneral = $nationGenerals[Util::choiceRandom($maxCity['generals'])];
-            if($targetGeneral['npc']>=2 || $maxCity['dev'] >= 95){
+            if($targetGeneral['npc']==5){
+                
+            }
+            else if($targetGeneral['npc']>=2 || $maxCity['dev'] >= 95 && $targetGeneral['troop'] == 0){
                //유저장은 의도가 있을 것이므로 삽나지 않는 이상 발령 안함!
                $commandList[EncodeCommand(0, $targetGeneral['no'], $targetCity['city'], 27)] = 5;
            }
@@ -1205,6 +1242,10 @@ function NPCStaffWork($general, $nation, $dipState){
            if($nationGeneral['train'] * $nationGeneral['atmos'] < 75 * 75){
                continue;
            }
+
+            if($nationGeneral['troop'] != 0){
+                continue;
+            }
    
            $score = 5;
            if($nationGeneral['npc']<2){
@@ -1255,6 +1296,9 @@ function NPCStaffWork($general, $nation, $dipState){
            if($generalCity['pop'] - 33000 > $nationGeneral['leader']){
                continue;
            }
+            if($nationGeneral['troop'] != 0){
+                continue;
+            }
    
            $score = 5;
            if($nationGeneral['npc']<2){
@@ -1294,7 +1338,7 @@ function NPCStaffWork($general, $nation, $dipState){
    return Util::choiceRandomUsingWeight($commandList);
 }

-//종전하기, 지급율
+//종전하기, 지급률
 //$command = $fourth * 100000000 + $type * 100000 + $crew * 100 + 11;

 function Promotion($nation, $level) {
@@ -273,6 +273,10 @@ function process_1(&$general, $type) {
        $exp = CharExperience($exp, $general['personal']);
        $ded = CharDedication($ded, $general['personal']);

+        if($city['front'] == 1 && $city['city'] != $nation['capital']){
+            $score *= 0.5;
+        }
+
        $score += $city["$stype"];
        if($score > $city["{$stype}2"]) { $score = $city["{$stype}2"]; }
        // 내정 상승
@@ -365,17 +369,26 @@ function process_3(&$general) {
        $exp = CharExperience($exp, $general['personal']);
        $ded = CharDedication($ded, $general['personal']);

-        // 부드러운 기술 제한
-        if(TechLimit($admin['startyear'], $admin['year'], $nation['tech'])) { $score = intdiv($score, 4); }
-
        //장수수 구함
-        $query = "select no from general where nation='{$general['nation']}'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $gencount = MYDB_num_rows($result);
-        if($gencount < GameConst::$initialNationGenLimit) $gencount = GameConst::$initialNationGenLimit;
+        $gencount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i', $general['nation']);
+        $gencnt_eff = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND npc != 5', $general['nation']);
+        if ($gencnt_eff < GameConst::$initialNationGenLimit) {
+            $gencount = GameConst::$initialNationGenLimit;
+            $gencnt_eff = GameConst::$initialNationGenLimit;
+        }
+
+        if($gencount != $gencnt_eff){
+            $score *= $gencount / $gencnt_eff;
+        }
+        
+        // 부드러운 기술 제한
+        if(TechLimit($admin['startyear'], $admin['year'], $nation['tech'])) { $score /= 4; }
+
        // 내정 상승
-        $query = "update nation set totaltech=totaltech+'$score',tech=totaltech/'$gencount' where nation='{$general['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('nation', [
+            'totaltech'=>$db->sqleval('totaltech + %i', Util::round($score)),
+            'tech'=>$db->sqleval('totaltech / %i', $gencount)
+        ], 'nation=%i', $general['nation']);
        // 자금 하락, 경험치 상승        // 공헌도, 명성 상승 = $score * 10
        $general['gold'] -= $admin['develcost'];

@@ -433,7 +446,7 @@ function process_4(&$general) {

        // 군주, 참모 보정
        if($general['level'] == 12 || $general['level'] == 11) { $score *= 1.05; }
-        // 시중 보정
+        // 종사 보정
        if($general['level'] == 2 && $general['no'] == $city['gen3']) { $score *= 1.05; }

        $rd = Util::randF();
@@ -558,6 +571,16 @@ function process_5(&$general, $type) {
        $exp = $score * 0.7;
        $ded = $score * 1.0;

+        if($city['front'] == 1 && $city['city'] != $nation['capital']){
+            if($stype == 'def'){
+                $score *= 0.5;
+            }
+            else{
+                $score *= 0.25;
+            }
+            
+        }
+
        // 성격 보정
        $exp = CharExperience($exp, $general['personal']);
        $ded = CharDedication($ded, $general['personal']);
@@ -623,7 +646,7 @@ function process_7(&$general) {

        // 군주, 참모 보정
        if($general['level'] == 12 || $general['level'] == 11) { $score *= 1.05; }
-        // 시중 보정
+        // 종사 보정
        if($general['level'] == 2 && $general['no'] == $city['gen3']) { $score *= 1.05; }

        $rd = Util::randF();
@@ -1896,8 +1919,7 @@ function process_42(&$general) {
        $log[] = "<C>●</>{$admin['month']}월:호랑이에게 물려 다쳤습니다. <1>$date</>";
        // 경험치 하락        // 명성 상승
        $injury = rand() % 10 + 10;
-        $general['power2']--;
-        $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp' where no='{$general['no']}'";
+        $query = "update general set resturn='SUCCESS',injury=injury+'$injury',experience=experience+'$exp' where no='{$general['no']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        break;
    case 11:
@@ -1911,8 +1933,7 @@ function process_42(&$general) {
        $log[] = "<C>●</>{$admin['month']}월:곰에게 할퀴어 다쳤습니다. <1>$date</>";
        // 경험치 하락        // 명성 상승
        $injury = rand() % 10 + 10;
-        $general['power2']--;
-        $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp' where no='{$general['no']}'";
+        $query = "update general set resturn='SUCCESS',injury=injury+'$injury',experience=experience+'$exp' where no='{$general['no']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        break;
    case 13:
@@ -1931,8 +1952,7 @@ function process_42(&$general) {
        $log[] = "<C>●</>{$admin['month']}월:위기에 빠진 사람을 구해주다가 다쳤습니다. <1>$date</>";
        // 경험치 하락        // 명성 상승
        $injury = rand() % 10 + 10;
-        $general['power2']--;
-        $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'";
+        $query = "update general set resturn='SUCCESS',injury=injury+'$injury',experience=experience+'$exp2' where no='{$general['no']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        break;
    case 16:
@@ -1997,24 +2017,21 @@ function process_42(&$general) {
        $log[] = "<C>●</>{$admin['month']}월:호랑이에게 물려 크게 다쳤습니다. <1>$date</>";
        // 경험치 하락        // 명성 상승
        $injury = rand() % 30 + 20;
-        $general['power2']--;
-        $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp' where no='{$general['no']}'";
+        $query = "update general set resturn='SUCCESS',injury=injury+'$injury',experience=experience+'$exp' where no='{$general['no']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        break;
    case 25:
        $log[] = "<C>●</>{$admin['month']}월:곰에게 할퀴어 크게 다쳤습니다. <1>$date</>";
        // 경험치 하락        // 명성 상승
        $injury = rand() % 30 + 20;
-        $general['power2']--;
-        $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp' where no='{$general['no']}'";
+        $query = "update general set resturn='SUCCESS',injury=injury+'$injury',experience=experience+'$exp' where no='{$general['no']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        break;
    case 26:
        $log[] = "<C>●</>{$admin['month']}월:위기에 빠진 사람을 구하다가 죽을뻔 했습니다. <1>$date</>";
        // 경험치 하락        // 명성 상승
        $injury = rand() % 50 + 30;
-        $general['power2']--;
-        $query = "update general set resturn='SUCCESS',injury=injury+'$injury',power2='{$general['power2']}',experience=experience+'$exp2' where no='{$general['no']}'";
+        $query = "update general set resturn='SUCCESS',injury=injury+'$injury',experience=experience+'$exp2' where no='{$general['no']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        break;
    default:
@@ -605,11 +605,6 @@ function process_61(&$general) {
    $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,
@@ -619,19 +614,11 @@ function process_61(&$general) {
        $validUntil,
        [
            'action'=>DiplomaticMessage::TYPE_NO_AGGRESSION,
-            'year'=>$when,
-            'option'=>$option
+            'year'=>$when
        ]
    );
    $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턴후
-
    pushGenLog($general, ["<C>●</>{$month}월:<D><b>{$destNation['name']}</b></>으로 불가침 제의 서신을 보냈습니다.<1>$date</>"]);
 }

@@ -11,7 +11,7 @@ function process_22(&$general) {
    $history = [];
    $date = substr($general['turntime'],11,5);

-    $admin = $gameStor->getValues(['startyear','year','month','develcost']);
+    $admin = $gameStor->getValues(['startyear','year','month','develcost','join_mode']);

    $query = "select nation,supply from city where city='{$general['city']}'";
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -26,7 +26,10 @@ function process_22(&$general) {

    $cost = Util::round($admin['develcost'] + ($you['experience'] + $you['dedication'])/1000) * 10;

-    if(!$you) {
+    if($admin['join_mode'] == 'onlyRandom'){
+        $log[] = "<C>●</>{$admin['month']}월:랜덤 임관만 가능합니다. 등용 실패. <1>$date</>";
+    }
+    else if(!$you) {
        $log[] = "<C>●</>{$admin['month']}월:없는 장수입니다. 등용 실패. <1>$date</>";
    } elseif($admin['year'] < $admin['startyear']+3) {
        $log[] = "<C>●</>{$admin['month']}월:초반 제한중입니다. 등용 실패. <1>$date</>";
@@ -70,7 +73,7 @@ function process_25(&$general) {
    $history = [];
    $date = substr($general['turntime'],11,5);

-    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'scenario', 'fiction']);
+    $admin = $gameStor->getValues(['startyear', 'year', 'month', 'scenario', 'fiction', 'join_mode', 'init_year', 'init_month']);

    $query = "select nation from city where city='{$general['city']}'";
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -79,12 +82,16 @@ function process_25(&$general) {
    $command = DecodeCommand($general['turn0']);
    $where = $command[1];

+    if($admin['join_mode'] == 'onlyRandom' && $where < 98){
+        $where = 99;
+    }
+
    $nation = null;

    $joinedNations = Json::decode($general['nations']);

    // 랜덤임관인 경우
-    if($general['npc'] > 2 && $where >= 98 && ($admin['scenario'] < 100 || $admin['scenario'] >= 2000 || !$admin['fiction'])){
+    if($general['npc'] >= 2 && $where >= 98 && !$admin['fiction'] && 1000 <= $admin['scenario'] && $admin['scenario'] < 2000){
        //'사실' 모드에서는 '성향'에 우선을 두되, 장수수, 랜덤에 비중을 둠
        $nations = $db->query(
            'SELECT nation.`name` as `name`,nation.nation as nation,scout,nation.`level` as `level`,gennum,`affinity` FROM nation join general on general.nation = nation.nation and general.level = 12 WHERE nation.nation not in %li and gennum < %i and scout = 0',
@@ -126,10 +133,18 @@ function process_25(&$general) {

        $allGen = array_sum($generals);

+        $genLimit = GameConst::$defaultMaxGeneral;
+        if($admin['join_mode'] == 'onlyRandom' && TimeUtil::IsRangeMonth($admin['init_year'], $admin['init_month'], 1, $admin['year'], $admin['month'])){
+            $genLimit = GameConst::$initialNationGenLimitForRandInit;
+        }
+        else if($admin['year'] < $admin['startyear'] + 3){
+            $genLimit = GameConst::$initialNationGenLimit;
+        }
+
        $nations = $db->query(
            'SELECT nation.`name` as `name`,nation.nation as nation,scout,nation.`level` as `level`,gennum,`injury` FROM nation join general on general.nation = nation.nation and general.level = 12 WHERE nation.nation not in %li and gennum < %i and scout = 0',
            $joinedNations,
-            ($admin['year'] < $admin['startyear']+3)?GameConst::$initialNationGenLimit:GameConst::$defaultMaxGeneral
+            $genLimit
        );
        shuffle($nations);

@@ -141,17 +156,20 @@ function process_25(&$general) {
            }

            $score = 1;
-            if($admin['startyear']+3 > $admin['year'] && $general['npc'] > 2){
+            if($admin['startyear']+3 > $admin['year'] && $general['npc'] == 2){
                $score *= sqrt((100-max(30, $testNation['injury']))/100);
            }

-            $score *= sqrt($allGen/$generals[$testNation['nation']]);
+            $score *= $allGen/$generals[$testNation['nation']];
            $randVals[$idx] = $score;
        }

        if($randVals){
            $nation = $nations[Util::choiceRandomUsingWeight($randVals)];
        }
+        else{
+            $nation = null;
+        }

    } else {
        $nation = $db->queryFirstRow('SELECT `name`,nation,scout,`level` FROM nation WHERE nation=%i', $where);
@@ -164,6 +182,15 @@ function process_25(&$general) {
    
    if(!$nation) {
        $log[] = "<C>●</>{$admin['month']}월:임관할 국가가 없습니다. 임관 실패. <1>$date</>";
+        if($where >= 98 && $genLimit == GameConst::$initialNationGenLimitForRandInit){
+            //랜덤 모드, 초기화시에는 랜덤 임관을 대신 한턴 더 넣어준다.
+            $db->update('general', [
+                'turn1'=>EncodeCommand(0, 0, $where, 25),
+            ], '`no` = %i', $general['no']);
+            pushGenLog($general, $log);
+            process_42($general);
+            return;
+        }
    } elseif($general['nation'] != 0) {
        $log[] = "<C>●</>{$admin['month']}월:재야가 아닙니다. 임관 실패. <1>$date</>";
    } elseif($nation['nation'] == 0) {
@@ -568,11 +595,11 @@ function process_45(&$general) {
            pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$nation['name']}</b></>에서 하야");

            // 국적 바꾸고 등급 재야로        // 명성/공헌 N*10% 감소
-            $query = "update general set resturn='SUCCESS',belong=0,betray=betray+1,nation=0,level=0,experience=experience*(1-0.1*betray),dedication=dedication*(1-0.1*betray),makelimit='12',gold='{$general['gold']}',rice='{$general['rice']}' where no='{$general['no']}'";
+            $query = "update general set resturn='SUCCESS',belong=0,nation=0,level=0,permission='normal',experience=experience*(1-0.1*betray),dedication=dedication*(1-0.1*betray),makelimit='12',gold='{$general['gold']}',rice='{$general['rice']}',betray=betray+1 where no='{$general['no']}'";
            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        }

-        //도시의 태수, 군사, 시중직도 초기화
+        //도시의 태수, 군사, 종사직도 초기화
        $query = "update city set gen1='0' where gen1='{$general['no']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        $query = "update city set gen2='0' where gen2='{$general['no']}'";
@@ -637,6 +664,8 @@ function process_46(&$general) {
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $nationcount = MYDB_num_rows($result);

+    $currNationLevel = $db->queryFirstField('SELECT level FROM nation WHERE nation=%i', $general['nation']);
+
    $command = DecodeCommand($general['turn0']);
    $color = $command[1];
    $type = $command[2];    // 1 ~ 13
@@ -654,6 +683,8 @@ function process_46(&$general) {
        $log[] = "<C>●</>{$admin['month']}월:건국 기간이 지났습니다. 건국 실패. <1>$date</>";
    } elseif($city['nation'] != 0) {
        $log[] = "<C>●</>{$admin['month']}월:공백지가 아닙니다. 건국 실패. <1>$date</>";
+    } elseif($currNationLevel != 0) {
+        $log[] = "<C>●</>{$admin['month']}월:방랑군이 아닙니다. 건국 실패. <1>$date</>";
    } elseif($nationcount > 0) {
        $log[] = "<C>●</>{$admin['month']}월:존재하는 국가명입니다. 건국 실패. <1>$date</>";
    } elseif($general['makelimit'] > 0) {
@@ -817,7 +848,7 @@ function process_54(&$general) {
        //군주 교체
        $query = "update general set level='12' where no='$who'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        // 태수,군사,시중이었다면 해제
+        // 태수,군사,종사이었다면 해제
        $query = "update city set gen1='0' where gen1='$who'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        $query = "update city set gen2='0' where gen2='$who'";
@@ -1028,7 +1059,7 @@ function process_57(&$general) {
        //군주 교체
        $query = "update general set resturn='SUCCESS',level='12' where no='{$general['no']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        // 태수,군사,시중이었다면 해제
+        // 태수,군사,종사이었다면 해제
        $query = "update city set gen1='0' where gen1='{$general['no']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        $query = "update city set gen2='0' where gen2='{$general['no']}'";
@@ -138,7 +138,7 @@ function commandButton() {
    $db = DB::db();
    $me = $db->queryFirstRow("select no,nation,level,belong from general where owner=%i", $userID);

-    $nation = $db->queryFirstRow("select nation,level,color,secretlimit from nation where nation=%i",$me['nation'])??[
+    $nation = $db->queryFirstRow("select permission,penalty,nation,level,color,secretlimit from nation where nation=%i",$me['nation'])??[
        'nation'=>0,
        'level'=>0,
        'secretlimit'=>99,
@@ -150,15 +150,13 @@ function commandButton() {

    $templates = new \League\Plates\Engine(__dir__.'/templates');
    $showSecret = false;
-    if($me['level'] >= 2){
+    $permission = checkSecretPermission($me);
+    if($permission >= 1){
        $showSecret = true;
    }
    else if($me['level']== 0){
        $showSecret = false;
    }
-    else if($me['belong'] >= $nation['secretlimit']){
-        $showSecret = true;
-    }
    
    return $templates->render('commandButton', [
        'bgColor'=>$bgColor,
@@ -68,25 +68,25 @@ function processGoldIncome() {
        // 기본량도 안될경우
        if($nation['gold'] < GameConst::$basegold) {
            $realoutcome = 0;
-            // 실지급율
+            // 실지급률
            $ratio = 0;
        //기본량은 넘지만 요구량이 안될경우
        } elseif($nation['gold'] - GameConst::$basegold < $outcome) {
            $realoutcome = $nation['gold'] - GameConst::$basegold;
            $nation['gold'] = GameConst::$basegold;
-            // 실지급율
+            // 실지급률
            $ratio = $realoutcome / $originoutcome;
        } else {
            $realoutcome = $outcome;
            $nation['gold'] -= $realoutcome;
-            // 실지급율
+            // 실지급률
            $ratio = $realoutcome / $originoutcome;
        }
        $adminLog[] = StringUtil::padStringAlignRight((string)$nation['name'],12," ")
            ." // 세금 : ".StringUtil::padStringAlignRight((string)$income,6," ")
            ." // 세출 : ".StringUtil::padStringAlignRight((string)$originoutcome,6," ")
            ." // 실제 : ".tab2((string)$realoutcome,6," ")
-            ." // 지급율 : ".tab2((string)round($ratio*100,2),5," ")
+            ." // 지급률 : ".tab2((string)round($ratio*100,2),5," ")
            ." % // 결과금 : ".tab2((string)$nation['gold'],6," ");

        $query = "select no,name,nation from general where nation='{$nation['nation']}' and level>='9'";
@@ -101,7 +101,7 @@ function processGoldIncome() {
        $query = "update nation set gold='{$nation['gold']}' where nation='{$nation['nation']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

-        $query = "select no,name,nation,dedication,gold from general where nation='{$nation['nation']}'";
+        $query = "select no,name,nation,dedication,gold from general where nation='{$nation['nation']}' AND npc != 5";
        $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        $gencount = MYDB_num_rows($genresult);

@@ -223,7 +223,7 @@ function getGoldIncome($nationNo, $rate, $admin_rate, $type) {
        $gen = MYDB_fetch_array($result);
        $level3[$gen['no']] = $gen['city'];
    }
-    $query = "select no,city from general where nation='$nationNo' and level=2"; // 시중
+    $query = "select no,city from general where nation='$nationNo' and level=2"; // 종사
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $count = MYDB_num_rows($result);
    for($j=0; $j < $count; $j++) {
@@ -317,7 +317,7 @@ function getGoldOutcome($nation, $bill) {
    $db = DB::db();
    $connect=$db->get();

-    $query = "select dedication from general where nation='$nation'"; // 장수 목록
+    $query = "select dedication from general where nation='$nation' AND npc != 5"; // 장수 목록
    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $gencount = MYDB_num_rows($genresult);

@@ -391,25 +391,25 @@ function processRiceIncome() {
        // 기본량도 안될경우
        if($nation['rice'] < GameConst::$baserice) {
            $realoutcome = 0;
-            // 실지급율
+            // 실지급률
            $ratio = 0;
        //기본량은 넘지만 요구량이 안될경우
        } elseif($nation['rice'] - GameConst::$baserice < $outcome) {
            $realoutcome = $nation['rice'] - GameConst::$baserice;
            $nation['rice'] = GameConst::$baserice;
-            // 실지급율
+            // 실지급률
            $ratio = $realoutcome / $originoutcome;
        } else {
            $realoutcome = $outcome;
            $nation['rice'] -= $realoutcome;
-            // 실지급율
+            // 실지급률
            $ratio = $realoutcome / $originoutcome;
        }
        $adminLog[] = StringUtil::padStringAlignRight($nation['name'],12," ")
            ." // 세곡 : ".StringUtil::padStringAlignRight((string)$income,6," ")
            ." // 세출 : ".StringUtil::padStringAlignRight((string)$originoutcome,6," ")
            ." // 실제 : ".tab2((string)$realoutcome,6," ")
-            ." // 지급율 : ".tab2((string)round($ratio*100,2),5," ")
+            ." // 지급률 : ".tab2((string)round($ratio*100,2),5," ")
            ." % // 결과곡 : ".tab2((string)$nation['rice'],6," ");

        $query = "select no,name,nation from general where nation='{$nation['nation']}' and level>='9'";
@@ -424,7 +424,7 @@ function processRiceIncome() {
        $query = "update nation set rice='{$nation['rice']}' where nation='{$nation['nation']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

-        $query = "select no,name,nation,dedication,rice from general where nation='{$nation['nation']}'";
+        $query = "select no,name,nation,dedication,rice from general where nation='{$nation['nation']}' AND npc != 5";
        $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
        $gencount = MYDB_num_rows($genresult);

@@ -467,7 +467,7 @@ function getRiceIncome($nationNo, $rate, $admin_rate, $type) {
        $gen = MYDB_fetch_array($result);
        $level3[$gen['no']] = $gen['city'];
    }
-    $query = "select no,city from general where nation='$nationNo' and level=2"; // 시중
+    $query = "select no,city from general where nation='$nationNo' and level=2"; // 종사
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $count = MYDB_num_rows($result);
    for($j=0; $j < $count; $j++) {
@@ -517,7 +517,7 @@ function getRiceOutcome($nation, $bill) {
    $db = DB::db();
    $connect=$db->get();

-    $query = "select dedication from general where nation='$nation'"; // 장수 목록
+    $query = "select dedication from general where nation='$nation' AND npc != 5"; // 장수 목록
    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
    $gencount = MYDB_num_rows($genresult);

@@ -594,14 +594,14 @@ function disaster() {

    for($i=0; $i < $citycount; $i++) {
        $city = MYDB_fetch_array($cityresult);
-        //호황 발생 도시 선택 ( 기본 3% 이므로 약 3개 도시 )
-        //재해 발생 도시 선택 ( 기본 6% 이므로 약 6개 도시 )
-        if($isgood == 1) { $ratio = 3 + Util::round(1.0*$city['secu']/$city['secu2']*3); }    // 3 ~ 6%
-        else { $ratio = 6 - Util::round(1.0*$city['secu']/$city['secu2']*3); }    // 3 ~ 6%
+        //호황 발생 도시 선택 ( 기본 2% )
+        //재해 발생 도시 선택 ( 기본 6% )
+        if($isgood == 1) { $ratio = 2 + Util::round($city['secu']/$city['secu2']*5); }    // 2 ~ 7%
+        else { $ratio = 6 - Util::round($city['secu']/$city['secu2']*5); }    // 1 ~ 6%

        if(rand()%100+1 < $ratio) {
            $disastercity[] = $city['city'];
-            $disasterratio[] = 1.0 * $city['secu'] / $city['secu2'];
+            $disasterratio[] = Util::valueFit($city['secu'] / 0.8 / $city['secu2'], 0, 1);
            $disastername[] = $city['name'];
        }
    }
@@ -88,6 +88,7 @@ $mapTheme = $admin['map_theme'];
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
 <?=WebUtil::printJS('../e_lib/jquery.redirect.js')?>
 <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('../e_lib/moment.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printJS('js/main.js')?>
@@ -105,7 +106,7 @@ $(function(){

    setInterval(function(){
        refreshMsg();
-    }, 10000);
+    }, 5000);
 });
 </script>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
@@ -282,11 +283,11 @@ else if($session->userGrade == 4){
        <td width=498 class='bg1 center'><b>개인 기록</b></td>
    </tr>
    <tr>
-        <td width=498 style="text-align:left;"><?=getGeneralPublicRecordRecent(15)?></td>
-        <td width=498 style="text-align:left;"><?=getGenLogRecent($me['no'], 15)?></td>
+        <td width=498 id="general_public_record" style="text-align:left;"><?=getGeneralPublicRecordRecent(15)?></td>
+        <td width=498 id="general_log" style="text-align:left;"><?=getGenLogRecent($me['no'], 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>
+    <tr><td width=998 id="world_history" colspan=2 style="text-align:left;"><?=getWorldHistoryRecent(15)?></td></tr>
 </table>
 <div class="message_input_form bg0">
    <select id="mailbox_list" size="1">
@@ -303,15 +304,22 @@ else if($session->userGrade == 4){
 <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 style="right:0;" class="board_side bg0">
-        <section class="diplomacy_message">
-
+        <section class="public_message">
+        <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="public">이전 메시지 불러오기</button>
        </section>
+        <div class="board_header bg0">개인 메시지(최고99자)</div>
+        <section class="private_message">
+        <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="private">이전 메시지 불러오기</button>
+        </section>
+    </div><div style="right:0;" class="board_side bg0">
        <div class="board_header bg0">국가 메시지(최고99자)</div>
-        <section class="national_message"></section>
+        <section class="national_message">
+        <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="national">이전 메시지 불러오기</button>
+        </section>
+        <div class="board_header bg0">외교 메시지(최고99자)</div>
+        <section class="diplomacy_message">
+        <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="diplomacy">이전 메시지 불러오기</button>
+        </section>
 </div></div>
 <div style="clear:left;"><?=allButton()?><?=banner()?></div>
 </div>
@@ -152,6 +152,20 @@ if($session->userGrade < 5 && !$allowReset){
                        </div>
                    </div>

+                    <div class="form-group row">
+                        <label for="join_mode" class="col-sm-3 col-form-label">임관 모드</label>
+                        <div class="col-sm-9">
+                            <div id="join_mode" class="btn-group btn-group-toggle" data-toggle="buttons">
+                                <label class="btn btn-secondary active">
+                                    <input type="radio" name="join_mode" value="full" checked>일반
+                                </label>
+                                <label class="btn btn-secondary">
+                                    <input type="radio" name="join_mode" value="onlyRandom">랜덤 임관
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+
                    <div class="form-group row">
                        <label for="show_img_level" class="col-sm-3 col-form-label">이미지 표기</label>
                        <div class="col-sm-9">
@@ -87,7 +87,8 @@ $result = ResetHelper::buildScenario(
    $options['extend'],
    $options['npcmode'],
    $options['show_img_level'],
-    $options['tournament_trig']
+    $options['tournament_trig'],
+    $options['join_mode']
 );

 $result['affected']=1;
@@ -11,14 +11,18 @@ $result = [
 $session = Session::requireGameLogin([])->setReadOnly();
 $userID = Session::getUserID();

-$generalInfo = DB::db()->queryFirstRow('SELECT `no`, `nation`, `level` from `general` where `owner`=%i', $userID);
+$generalInfo = DB::db()->queryFirstRow('SELECT `no`, `nation`, `level`, penalty, permission from `general` where `owner`=%i', $userID);
 if(!$generalInfo){
    Json::die($result);
 }

+$permission = checkSecretPermission($generalInfo);
+
+
 $result['generalID'] = $generalInfo['no'];
 $result['myNationID'] = $generalInfo['nation'];
 $result['isChief'] = ($generalInfo['level'] == 12);
 $result['generalLevel'] = $generalInfo['level'];
+$result['permission'] = $permission;

 Json::die($result);
@@ -0,0 +1,74 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+
+$isSecretBoard = Util::getReq('isSecret', 'bool', false);
+$title = Util::getReq('title');
+$text = Util::getReq('text');
+
+increaseRefresh("회의실", 1);
+
+$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+if($title === null || $text === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 입력입니다.'
+    ]);
+}
+
+$title = trim($title);
+$text = trim($text);
+
+if(!$title && !$text){
+    Json::die([
+        'result'=>false,
+        'reason'=>'제목과 내용이 둘다 비어있습니다.'
+    ]);
+}
+
+$permission = checkSecretPermission($me);
+if($permission < 0){
+    Json::die([
+        'result'=>false,
+        'reason'=>'국가에 소속되어있지 않습니다.'
+    ]);
+    
+}
+else if ($isSecretBoard && $permission < 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'권한이 부족합니다. 수뇌부가 아닙니다.'
+    ]);
+}
+
+$db->insert('board', [
+    'nation_no'=>$me['nation'],
+    'is_secret'=>$isSecretBoard,
+    'date'=>TimeUtil::DatetimeNow(),
+    'general_no'=>$me['no'],
+    'author'=>$me['name'],
+    'title'=>$title,
+    'text'=>$text
+]);
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success',
+    'row_id'=>$db->insertId()
+]);
@@ -0,0 +1,82 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+
+$articleNo = Util::getReq('articleNo', 'int');
+$text = Util::getReq('text');
+
+increaseRefresh("회의실", 1);
+
+$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+if($articleNo === null || $text === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 입력입니다.'
+    ]);
+}
+
+$text = trim($text);
+
+if(!$text){
+    Json::die([
+        'result'=>false,
+        'reason'=>'내용이 비어있습니다.'
+    ]);
+}
+
+$article = $db->queryFirstRow('SELECT * FROM board WHERE no = %i AND nation_no = %i', $articleNo, $me['nation']);
+if(!$article){
+    Json::die([
+        'result'=>false,
+        'reason'=>'게시물이 없습니다.'
+    ]);
+}
+
+$isSecretBoard = $article['is_secret'];
+
+$permission = checkSecretPermission($me);
+if($permission < 0){
+    Json::die([
+        'result'=>false,
+        'reason'=>'국가에 소속되어있지 않습니다.'
+    ]);
+    
+}
+else if ($isSecretBoard && $permission < 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'권한이 부족합니다. 수뇌부가 아닙니다.'
+    ]);
+}
+
+$db->insert('comment', [
+    'nation_no'=>$me['nation'],
+    'is_secret'=>$isSecretBoard,
+    'date'=>TimeUtil::DatetimeNow(),
+    'document_no'=>$articleNo,
+    'general_no'=>$me['no'],
+    'author'=>$me['name'],
+    'text'=>$text
+]);
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success',
+    'row_id'=>$db->insertId()
+]);
@@ -0,0 +1,73 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$isSecretBoard = Util::getReq('isSecret', 'bool', false);
+
+increaseRefresh("회의실", 1);
+
+$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+$permission = checkSecretPermission($me);
+if($permission < 0){
+    Json::die([
+        'result'=>false,
+        'reason'=>'국가에 소속되어있지 않습니다.'
+    ]);
+    
+}
+else if ($isSecretBoard && $permission < 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'권한이 부족합니다. 수뇌부가 아닙니다.'
+    ]);
+}
+
+$articles = [];
+
+foreach(
+    $db->query(
+        'SELECT * FROM board WHERE nation_no = %i AND is_secret = %i ORDER BY date desc',
+        $me['nation'],
+        $isSecretBoard
+    ) as $article
+){
+    //TODO:아이콘 받아오기
+    $article['comment'] = [];
+    $articles[$article['no']] = $article;
+}
+
+foreach(
+    $db->query(
+        'SELECT * FROM comment WHERE nation_no = %i AND is_secret = %i ORDER BY date asc',
+        $me['nation'],
+        $isSecretBoard
+    ) as $comment
+){
+    //TODO:아이콘 받아오기?
+    $articles[$article['no']]['comment'] = $comment;
+}
+
+Json::die([
+    'result'=>true,
+    'articles'=>$articles,
+    'reason'=>'success'
+]);
+
@@ -0,0 +1,68 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$isSecretBoard = Util::getReq('isSecret', 'bool', false);
+
+increaseRefresh("외교부", 1);
+
+$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+$permission = checkSecretPermission($me);
+if($permission < 0){
+    Json::die([
+        'result'=>false,
+        'reason'=>'국가에 소속되어있지 않습니다.'
+    ]);
+    
+}
+
+$letters = [];
+
+foreach(
+    $db->query(
+        'SELECT * FROM ng_diplomacy WHERE src_nation_id = %i OR dest_nation_id = %i ORDER BY date desc',
+        $me['nation'], $me['nation']
+    ) as $letter
+){
+
+    if($permission < 3){
+        $letter['detail'] = '(권한이 부족합니다)';
+    }
+    $letter['comment'] = [];
+    $letter['aux'] = Json::decode($letter['aux']);
+    $letters[$letter['no']] = $letter;
+}
+
+$nations = [];
+foreach(getAllNationStaticInfo() as $nation){
+    if($nation['nation'] == 0 || $nation['nation'] == $me['nation']){
+        continue;
+    }
+    $nations[] = $nation;
+}
+
+Json::die([
+    'result'=>true,
+    'nations'=>$nations,
+    'letters'=>$letters,
+    'reason'=>'success'
+]);
+
@@ -0,0 +1,84 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+
+$letterNo = Util::getReq('letterNo', 'int');
+$isAgree  = Util::getReq('isAgree', 'bool', false);
+$reason = Util::getReq('reason', 'string', '');
+
+
+
+
+increaseRefresh("회의실", 1);
+
+$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+if($letterNo === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 입력입니다.'
+    ]);
+}
+
+
+$permission = checkSecretPermission($me);
+if ($permission < 4) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'권한이 부족합니다. 수뇌부가 아닙니다.'
+    ]);
+}
+
+$reason = trim($reason);
+
+$letter = $db->queryFirstRow('SELECT * FROM ng_diplomacy WHERE no=%i AND dest_nation_id = %i AND state = \'proposed\'', $letterNo, $me['nation']);
+if(!$letter){
+    Json::die([
+        'result'=>false,
+        'reason'=>'서신이 없습니다.'
+    ]);
+}
+
+$aux = Json::decode($letter['aux']);
+
+if($isAgree){
+    $aux['dest']['generalName'] = $me['name'];
+    $db->update('ng_diplomacy', [
+        'state'=>'activated',
+        'dest_signer'=>$me['no'],
+        'aux'=>Json::encode($aux)
+    ], 'no=%i', $letterNo);
+    //TODO: 외교 서신에 대한 메시지를 양국에 발송해야함
+}
+else{
+    $aux['reason'] = [
+        'who'=>$me['no'],
+        'action'=>'disagree',
+        'reason'=>$reason
+    ];
+    $db->update('ng_diplomacy', [
+        'state'=>'cancelled',
+        'aux'=>Json::encode($aux)
+    ]);
+    //TODO: 외교 서신에 대한 메시지를 양국에 발송해야함
+}
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success'
+]);
@@ -0,0 +1,146 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+$userID = Session::getUserID();
+
+$db = DB::db();
+
+$destNationNo = Util::getReq('destNation', 'int', 0);
+$prevNo = Util::getReq('prevNo', 'int', null);
+$textBrief = Util::getReq('textBrief');
+$textDetail = Util::getReq('textDetail');
+
+increaseRefresh("외교부", 1);
+
+if($prevNo < 1){
+    $prevNo = null;
+}
+
+$me = $db->queryFirstRow('SELECT no, nation, level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+if($destNationNo == $me['nation']){
+    Json::die([
+        'result'=>false,
+        'reason'=>'자국으로 보낼 수 없습니다.'
+    ]);
+}
+
+if($textBrief === null || $textDetail === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 입력입니다.'
+    ]);
+}
+
+$textBrief = trim($textBrief);
+$textDetail = trim($textDetail);
+
+if(!$textBrief){
+    Json::die([
+        'result'=>false,
+        'reason'=>'요약문이 비어있습니다'
+    ]);
+}
+
+
+$permission = checkSecretPermission($me);
+if ($permission < 4) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'권한이 부족합니다. 수뇌부가 아닙니다.'
+    ]);
+}
+
+$srcNationNo = $me['nation'];
+
+$nations = $db->query('SELECT nation, name, color FROM nation WHERE nation IN (%i, %i)', $srcNationNo, $destNationNo);
+if(count($nations) != 2){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 국가입니다.'
+    ]);
+}
+
+if($prevNo !== null){
+    //state는 체크하지 않는걸로 하자. 파기한 것을 재 송신하는 경우도 있을 수 있음.
+    $prevLetter = $db->queryFirstRow(
+        'SELECT no, state, aux FROM ng_diplomacy WHERE no = %i AND src_nation_id IN (%i, %i) AND dest_nation_id IN (%i, %i)',
+        $prevNo,
+        $srcNationNo, $destNationNo,
+        $srcNationNo, $destNationNo
+    );
+
+    if(!$prevLetter){
+        Json::die([
+            'result'=>false,
+            'reason'=>'이전 문서가 없습니다.'
+        ]);
+    }
+
+    if($prevLetter['state'] == 'proposed'){
+        $prevAux = Json::decode($prevLetter['aux']);
+        $prevAux['reason'] = [
+            'who'=>$me['no'],
+            'action'=>'new_letter',
+            'reason'=>'new_letter'
+        ];
+        $db->update('ng_diplomacy', [
+            'state'=>'cancelled',
+            'aux'=>Json::encode($prevAux)
+        ], 'no=%i', $prevNo);
+    }
+}
+
+if($nations[0]['nation'] == $me['nation']){
+    //index 순서에 따라 또 모름.
+    $srcNation = $nations[0];
+    $destNation = $nations[1];
+}
+else{
+    $srcNation = $nations[1];
+    $destNation = $nations[0];
+}
+
+$db->insert('ng_diplomacy', [
+    'src_nation_id'=>$srcNation['nation'],
+    'dest_nation_id'=>$destNation['nation'],
+    'prev_no'=>$prevNo,
+    'state'=>'proposed',
+    'text_brief'=>$textBrief,
+    'text_detail'=>$textDetail,
+    'date'=>TimeUtil::DatetimeNow(),
+    'src_signer'=>$me['no'],
+    'dest_signer'=>null,
+    'aux'=>Json::encode([
+        'src'=>[
+            'nationName'=>$srcNation['name'],
+            'nationColor'=>$srcNation['color'],
+            'generalName'=>$me['name']
+        ],
+        'dest'=>[
+            'nationName'=>$destNation['name'],
+            'nationColor'=>$destNation['color']
+        ]
+    ]),
+]);
+
+
+//TODO: 외교 서신에 대한 메시지를 양국에 발송해야함
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success',
+    'row_id'=>$db->insertId()
+]);
@@ -0,0 +1,109 @@
+<?php
+namespace sammo;
+
+include 'lib.php';
+include 'func.php';
+
+$session = Session::requireGameLogin([])->setReadOnly();
+$userID = $session::getUserID();
+$serverID = UniqueConst::$serverID;
+
+$image = $_FILES['img'];
+switch ($image['error']) {
+    case UPLOAD_ERR_OK:
+        break;
+    case UPLOAD_ERR_NO_FILE:
+        Json::die([
+            'result'=>false,
+            'reason'=>'파일이 없습니다.'
+        ]);
+    case UPLOAD_ERR_INI_SIZE:
+    case UPLOAD_ERR_FORM_SIZE:
+        Json::die([
+            'result'=>false,
+            'reason'=>'업로드된 파일이 지나치게 큽니다.'
+        ]);
+    default:
+        Json::die([
+            'result'=>false,
+            'reason'=>'업로드되지 않았습니다.'
+        ]);
+}
+
+if(!is_uploaded_file($image['tmp_name'])) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'제대로 파일이 업로드되지 않았습니다.'
+    ]);
+}
+
+if($image['size'] > 1048576) {
+    //파일크기 검사
+    Json::die([
+        'result'=>false,
+        'reason'=>'1MB 이하로 올려주세요!'
+    ]);
+}
+
+$size = getImageSize($image['tmp_name']);
+
+$imageType = $size[2];
+$availableImageType = array('.jpg'=>IMAGETYPE_JPEG, '.png'=>IMAGETYPE_PNG, '.gif'=>IMAGETYPE_GIF);
+$newExt = array_search($imageType, $availableImageType, true);
+
+if(!$newExt) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'jpg, gif, png 파일이 아닙니다!'
+    ]);
+}
+
+$db = RootDB::db();
+$imgStor = KVStorage::getStorage($db, 'img_storage');
+
+$picName = hash_file('md5', $image['tmp_name']);
+$newPicName = "$picName$newExt";
+
+$destDir = AppConf::getUserIconPathFS().'/uploaded_image';
+$dest = $destDir.'/'.$newPicName;
+
+if(!file_exists($dest)){
+    if (!file_exists($destDir)) {
+        mkdir($destDir);
+    }
+    if(!is_dir($destDir)) {
+        Json::die([
+            'result'=>false,
+            'reason'=>'버그! 업로드 경로 확인!'
+        ]);
+    }
+    if(!is_writable($destDir)){
+        Json::die([
+            'result'=>false,
+            'reason'=>'버그! 업로드 권한 확인!'
+        ]);
+    }
+    
+    $dest = $destDir.'/'.$newPicName;
+    
+    if(!move_uploaded_file($image['tmp_name'], $dest)) {
+        Json::die([
+            'result'=>false,
+            'reason'=>'업로드에 실패했습니다!'
+        ]);
+    }
+}
+
+$storedStatus = $imgStor->$newPicName??[];
+$imgKey = "$serverID:$userID";
+if(!key_exists($imgKey, $storedStatus)){
+    $storedStatus[$imgKey] = TimeUtil::DatetimeNow();
+}
+
+$imgStor->$newPicName = $storedStatus;
+
+Json::die([
+    'result'=>true,
+    'reason'=>'성공',
+    'path'=>AppConf::getUserIconPathWeb().'/uploaded_image/'.$newPicName
+]);
@@ -41,6 +41,7 @@ $v->rule('required', [
    'scenario',
    'fiction',
    'extend',
+    'join_mode',
    'npcmode',
    'show_img_level'
 ])->rule('integer', [
@@ -51,8 +52,8 @@ $v->rule('required', [
    'extend',
    'npcmode',
    'show_img_level',
-    'tournament_trig'
-]);
+    'tournament_trig',
+])->rule('in', 'join_mode', ['onlyRandom', 'full']);
 if(!$v->validate()){
    Json::die([
        'result'=>false,
@@ -92,6 +93,7 @@ $extend = (int)$_POST['extend'];
 $npcmode = (int)$_POST['npcmode'];
 $show_img_level = (int)$_POST['show_img_level'];
 $tournament_trig = (int)$_POST['tournament_trig'];
+$join_mode = $_POST['join_mode'];

 if($reserve_open){
    $reserve_open = new \DateTime($reserve_open);
@@ -124,7 +126,8 @@ if($reserve_open){
            'npcmode'=>$npcmode,
            'show_img_level'=>$show_img_level,
            'tournament_trig'=>$tournament_trig,
-            'gameConf'=>$scenarioObj->getGameConf()
+            'gameConf'=>$scenarioObj->getGameConf(),
+            'join_mode'=>$join_mode,
        ]),
        'date'=>$reserve_open->format('Y-m-d H:i:s')
    ]);
@@ -143,5 +146,6 @@ Json::die(ResetHelper::buildScenario(
    $extend,
    $npcmode,
    $show_img_level,
-    $tournament_trig
+    $tournament_trig,
+    $join_mode
 ));
@@ -0,0 +1,72 @@
+<?php
+namespace sammo;
+
+include('lib.php');
+include('func.php');
+
+$session = Session::requireGameLogin([]);
+$userID = Session::getUserID();
+
+$msgID = Util::getReq('msgID', 'int');
+if($msgID === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 범위 입니다.'
+    ]);
+}
+
+$lastMsgGet = Json::decode($session->lastMsgGet)??[];
+$now = new \DateTime();
+$delayTime = false;
+if(count($lastMsgGet) >= 10){
+    try{
+        if($lastMsgGet[0] !== 'string'){
+            throw new \Exception('Why not string?');
+        }
+        $first = new \DateTime($lastMsgGet[0]);
+        $diff = $first->diff($now);
+        if($diff->days == 0 && $diff->h > 0 && $diff->i == 0 && $diff->s <= 5){
+            $delayTime = true;
+        }
+        array_shift($lastMsgGet);
+    }
+    catch(\Exception $e){
+        $lastMsgGet = [];
+    } 
+}
+$lastMsgGet[] = $now;
+$session->lastMsgGet = Json::encode($lastMsgGet);
+
+if($delayTime){
+    sleep(1);
+}
+$session->setReadOnly();
+
+list($generalID, $nationID, $generalName) = DB::db()->queryFirstList(
+    'select `no`, `nation`, `name` from `general` where owner = %i',
+    $userID
+);
+
+if($nationID === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'장수가 사망했습니다.'
+    ]);
+}
+
+$reason = Message::deleteMsg($msgID, $generalID);
+if($reason === null){
+    $result = [
+        'result'=>true,
+        'reason'=>'success'
+    ];
+}
+else{
+    $result = [
+        'result'=>false,
+        'reason'=>$reason
+    ];
+}
+
+
+Json::die($result);
@@ -0,0 +1,107 @@
+<?php
+namespace sammo;
+
+include('lib.php');
+include('func.php');
+
+$session = Session::requireGameLogin([]);
+$userID = Session::getUserID();
+
+$reqTo = Util::getReq('to', 'int');
+$reqType = Util::getReq('type', 'string');
+
+if($reqTo === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 범위 입니다.'
+    ]);
+}
+if($reqType === null || !in_array($reqType, ['private', 'public', 'national'])){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 타입입니다.'
+    ]);
+}
+
+$lastMsgGet = Json::decode($session->lastMsgGet)??[];
+$now = new \DateTime();
+$delayTime = false;
+if(count($lastMsgGet) >= 10){
+    try{
+        if($lastMsgGet[0] !== 'string'){
+            throw new \Exception('Why not string?');
+        }
+        $first = new \DateTime($lastMsgGet[0]);
+        $diff = $first->diff($now);
+        if($diff->days == 0 && $diff->h > 0 && $diff->i == 0 && $diff->s <= 1){
+            $delayTime = true;
+        }
+        array_shift($lastMsgGet);
+    }
+    catch(\Exception $e){
+        $lastMsgGet = [];
+    } 
+}
+$lastMsgGet[] = $now;
+$session->lastMsgGet = Json::encode($lastMsgGet);
+
+if($delayTime){
+    sleep(1);
+}
+$session->setReadOnly();
+
+list($generalID, $nationID, $generalName) = DB::db()->queryFirstList(
+    'select `no`, `nation`, `name` from `general` where owner = %i',
+    $userID
+);
+
+
+
+if($nationID === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'장수가 사망했습니다.'
+    ]);
+}
+
+$result = [
+    'private'=>[],
+    'public'=>[],
+    'national'=>[],
+    'diplomacy'=>[],
+    'result'=>true,
+    'keepRecent'=>true,
+    'sequence'=>0,
+    'nationID'=>$nationID,
+    'generalName'=>$generalName,
+];
+$result['result'] = true;
+
+$nextSequence = $reqTo;
+
+if($reqType == 'private'){
+    $result['private'] = array_map(function(Message $msg) use (&$nextSequence){
+        if($msg->id > $nextSequence){
+            $nextSequence = $msg->id;
+        }
+        return $msg->toArray();
+    }, Message::getMessagesFromMailBoxOld($generalID, Message::MSGTYPE_PRIVATE, $reqTo, 20));
+}
+else if($reqType == 'public'){
+    $result['public'] = array_map(function(Message $msg)use (&$nextSequence){
+        if($msg->id > $nextSequence){
+            $nextSequence = $msg->id;
+        }
+        return $msg->toArray();
+    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_PUBLIC, Message::MSGTYPE_PUBLIC, $reqTo, 20));
+}
+else{
+    $result['national'] = array_map(function(Message $msg)use (&$nextSequence){
+        if($msg->id > $nextSequence){
+            $nextSequence = $msg->id;
+        }
+        return $msg->toArray();
+    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, $reqTo, 40));
+}
+
+Json::die($result);
@@ -4,57 +4,116 @@ namespace sammo;
 include('lib.php');
 include('func.php');

-$session = Session::requireGameLogin([])->setReadOnly();
+$session = Session::requireGameLogin([]);
 $userID = Session::getUserID();

-$reqSequence = Util::getReq('sequence', 'int', 0);
+$reqSequence = Util::getReq('sequence', 'int', -1);
+
+$lastMsgGet = Json::decode($session->lastMsgGet)??[];
+$now = new \DateTime();
+$delayTime = false;
+if(count($lastMsgGet) >= 10){
+    try{
+        if($lastMsgGet[0] !== 'string'){
+            throw new \Exception('Why not string?');
+        }
+        $first = new \DateTime($lastMsgGet[0]);
+        $diff = $first->diff($now);
+        if($diff->days == 0 && $diff->h > 0 && $diff->i == 0 && $diff->s <= 1){
+            $delayTime = true;
+        }
+        array_shift($lastMsgGet);
+    }
+    catch(\Exception $e){
+        $lastMsgGet = [];
+    } 
+}
+$lastMsgGet[] = $now;
+$session->lastMsgGet = Json::encode($lastMsgGet);
+
+if($delayTime){
+    sleep(0.2);
+}
+$session->setReadOnly();


-list($generalID, $nationID, $generalName) = DB::db()->queryFirstList(
-    'select `no`, `nation`, `name` from `general` where owner = %i',
-    $userID
-);
+$db = DB::db();
+$me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);

-
-if($nationID === null){
+if($me === null){
    Json::die([
        'result'=>false,
        'reason'=>'장수가 사망했습니다.'
    ]);
 }

+$generalID = $me['no'];
+$nationID = $me['nation'];
+$generalName = $me['name'];
+$permission = checkSecretPermission($me);
+
 $result = [];
 $result['result'] = true;
-
+$result['keepRecent'] = false;
 $nextSequence = $reqSequence;
+$minSequence = $reqSequence;
+$lastType = null;

-$result['private'] = array_map(function(Message $msg) use (&$nextSequence){
+$result['private'] = array_map(function(Message $msg) use (&$nextSequence, &$minSequence, &$lastType){
    if($msg->id > $nextSequence){
        $nextSequence = $msg->id;
    }
+    if($msg->id <= $minSequence){
+        $minSequence = $msg->id;
+        $lastType = 'private';
+    }
    return $msg->toArray();
-}, Message::getMessagesFromMailBox($generalID, Message::MSGTYPE_PRIVATE, 10, $reqSequence));
+}, Message::getMessagesFromMailBox($generalID, Message::MSGTYPE_PRIVATE, 20, $reqSequence));

-$result['public'] = array_map(function(Message $msg)use (&$nextSequence){
+$result['public'] = array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType){
    if($msg->id > $nextSequence){
        $nextSequence = $msg->id;
    }
+    if($msg->id <= $minSequence){
+        $minSequence = $msg->id;
+        $lastType = 'public';
+    }
    return $msg->toArray();
-}, Message::getMessagesFromMailBox(Message::MAILBOX_PUBLIC, Message::MSGTYPE_PUBLIC, 10, $reqSequence));
+}, Message::getMessagesFromMailBox(Message::MAILBOX_PUBLIC, Message::MSGTYPE_PUBLIC, 20, $reqSequence));

-$result['national'] = array_map(function(Message $msg)use (&$nextSequence){
+$result['national'] = array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType){
    if($msg->id > $nextSequence){
        $nextSequence = $msg->id;
    }
+    if($msg->id <= $minSequence){
+        $minSequence = $msg->id;
+        $lastType = 'national';
+    }
    return $msg->toArray();
-}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, 20, $reqSequence));
+}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, 40, $reqSequence));

-$result['diplomacy']= array_map(function(Message $msg)use (&$nextSequence){
+$result['diplomacy']= array_map(function(Message $msg)use (&$nextSequence, &$minSequence, &$lastType, $permission){
    if($msg->id > $nextSequence){
        $nextSequence = $msg->id;
    }
-    return $msg->toArray();
-}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, 10, 0));
+    if($msg->id <= $minSequence){
+        $minSequence = $msg->id;
+        $lastType = 'diplomacy';
+    }
+    $values = $msg->toArray();
+    if($permission < 3){
+        $values['text'] = '(외교 문서입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
+    }
+    return $values;
+}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, 40, $reqSequence));
+
+if($lastType !== null){
+    array_pop($result[$lastType]);
+    $result['keepRecent'] = true;
+}
+else if($reqSequence <= 0){
+    $result['keepRecent'] = true;
+}

 $result['sequence'] = $nextSequence;
 $result['nationID'] = $nationID;
@@ -49,7 +49,7 @@ $now = new \DateTime();
 $unlimited = new \DateTime('9999-12-31');

 $db = DB::db();
-$me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr` FROM general WHERE `owner`=%i', $userID);
+$me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);

 if(!$me){
    $session->logoutGame();
@@ -70,7 +70,7 @@ if($con >= 2) {
 }

 $me['icon'] = GetImageURL($me['imgsvr'], $me['picture']);
-
+$permission = checkSecretPermission($me);
 $srcNation = getNationStaticInfo($me['nation']);

 $src = new MessageTarget($me['no'], $me['name'], $srcNation['nation'], $srcNation['name'], $srcNation['color'], $me['icon']);
@@ -99,19 +99,26 @@ if($mailbox == Message::MAILBOX_PUBLIC) {
 // 국가 메세지
 if($mailbox >= Message::MAILBOX_NATIONAL) {

-    if($me['level'] < 5){
+    if($permission < 4){
        $destNationID = $me['nation'];
    }
    else{
        $destNationID = $mailbox - Message::MAILBOX_NATIONAL;
    }

+    if($destNationID == $me['nation']){
+        $msgType = Message::MSGTYPE_NATIONAL;
+    }
+    else{
+        $msgType = Message::MSGTYPE_DIPLOMACY;
+    }
+
    $destNation = getNationStaticInfo($destNationID);

    $dest = new MessageTarget(0, '', $destNation['nation'], $destNation['name'], $destNation['color']);

    $msg = new Message(
-        Message::MSGTYPE_NATIONAL,
+        $msgType,
        $src,
        $dest,
        $text,
@@ -32,6 +32,20 @@ if(file_exists(__dir__.'/.htaccess')){

    $options = Json::decode($reserved['options']);

+    $otherTextInfo = [];
+
+    if($options['join_mode'] == 'onlyRandom'){
+        $otherTextInfo[] = '랜덤 임관 전용';
+    }
+
+    if(!$otherTextInfo){
+        $otherTextInfo = '표준';
+    }
+    else{
+        $otherTextInfo = join(', ', $otherTextInfo);
+    }
+
+
    Json::die([
        'reserved'=>[
            'scenarioName'=>$options['scenarioName'],
@@ -39,7 +53,8 @@ if(file_exists(__dir__.'/.htaccess')){
            'fictionMode'=>($options['fiction']?'가상':'사실'),
            'npcMode'=>($options['npcmode']?'가능':'불가'),
            'openDatetime'=>$reserved['date'],
-            'gameConf'=>$options['gameConf']
+            'gameConf'=>$options['gameConf'],
+            'otherTextInfo'=>$otherTextInfo
        ],
        'game'=>null,
        'me'=>null
@@ -56,8 +56,6 @@ $intel = Util::getReq('intel', 'int', 50);

 $join = Util::getReq('join'); //쓸모 없음

-extractMissingPostToGlobals();
-
 $rootDB = RootDB::db();
 //회원 테이블에서 정보확인
 $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr FROM member WHERE no=%i', $userID);
@@ -155,26 +153,40 @@ $leader = $leader + $pleader;
 $power = $power + $ppower;
 $intel = $intel + $pintel;

+$admin = $gameStor->getValues(['scenario', 'turnterm', 'show_img_level', 'startyear', 'year']);
+$relYear = Util::valueFit($admin['year'] - $admin['startyear'], 0);
+
 $age = 20 + ($pleader + $ppower + $pintel) * 2 - (mt_rand(0, 1));
 // 아직 남았고 천재등록상태이면 특기 부여
 if ($genius) {
    $specage2 = $age;
    $special2 = getSpecial2($leader, $power, $intel);
 } else {
-    $specage2 = Util::round((80 - $age)/3) + $age;
+    $specage2 = Util::valueFit(Util::round((80 - $age)/4 - $relYear / 2), 3) + $age;
    $special2 = 0;
 }
 //내특
-$specage = Util::round((80 - $age)/12) + $age;
+$specage = Util::valueFit(Util::round((80 - $age)/12 - $relYear / 2), 3) + $age;
 $special = 0;

-$admin = $gameStor->getValues(['scenario', 'turnterm', 'show_img_level']);
-
 if ($admin['scenario'] >= 1000) {
    $specage2 = $age + 3;
    $specage = $age + 3;
 }

+if($relYear < 3){
+    $experience = 0;
+}
+else{
+    $expGenCount = $db->queryFirstField('SELECT count(*) FROM general WHERE nation != 0 AND npc < 5');
+    $targetGenOrder = Util::round($expGenCount * 0.2);
+    $experience = $db->queryFirstField(
+        'SELECT experience FROM general WHERE nation != 0 AND npc < 5 ORDER BY experience ASC LIMIT %i, 1', 
+        $targetGenOrder - 1
+    );
+    $experience *= 0.8;
+}
+
 $turntime = getRandTurn($admin['turnterm']);

 $lastconnect = date('Y-m-d H:i:s');
@@ -211,7 +223,7 @@ $db->insert('general', [
    'leader' => $leader,
    'power' => $power,
    'intel' => $intel,
-    'experience' => 0,
+    'experience' => $experience,
    'dedication' => 0,
    'gold' => 1000,
    'rice' => 1000,
@@ -0,0 +1,157 @@
+
+
+function submitArticle(){
+    var $article = $('#newArticle');
+    var $title = $article.find('input.titleInput');
+    var $text = $article.find('input.contentInput');
+    var title = $.trim($title.val());
+    var text = $.trim($text.val());
+
+
+    if(!text && !title){
+        return false;
+    }
+
+    $title.val('');
+    $text.val('');
+
+    $.post({
+        url:'j_board_article_add.php',
+        dataType:'json',
+        data:{
+            isSecret:isSecretBoard,
+            title:title,
+            text:text
+        }
+    }).then(function(data){
+        if(!data){
+            $title.val(title);
+            $text.val(text);
+            alert()
+            return quickReject('글을 올리는데 실패했습니다.');
+        }
+        if(!data.result){
+            $title.val(title);
+            $text.val(text);
+            return quickReject('글을 올리는데 실패했습니다. : '+data.reason);
+        }
+
+        return loadArticles().done(drawArticles);
+
+    }, errUnknown)
+    .fail(function(reason){
+        alert(reason);
+    });
+
+    return false;
+}
+
+function submitComment(){
+    var $this = $(this);
+    var $article = $this.parents('.article').eq(0);
+    var articleNo = $article.data('no');
+    var $text = $article.find('input.commentText');
+    var text = $.trim($text.val());
+
+    if(!text){
+        return false;
+    }
+
+    $text.val('');
+
+    $.post({
+        url:'j_board_comment_add.php',
+        dataType:'json',
+        data:{
+            articleNo:articleNo,
+            text:text
+        }
+    }).then(function(data){
+        if(!data){
+            $text.val(text);
+            alert()
+            return quickReject('댓글을 다는데 실패했습니다.');
+        }
+        if(!data.result){
+            $text.val(text);
+            return quickReject('댓글을 다는데 실패했습니다. : '+data.reason);
+        }
+
+        return loadArticles().done(drawArticles);
+
+    }, errUnknown)
+    .fail(function(reason){
+        alert(reason);
+    });
+
+    return false;
+}
+
+function drawArticle(articleObj){
+    var $articleFrame = $('#articleTemplate > .articleFrame');
+    var $commentFrame = $('#commentTemplate > .comment');
+
+    var $article = $articleFrame.clone();
+    $article.addClass('articleObj')
+        .data('no', articleObj.no)
+        .data('author', articleObj.general_no);
+
+    $article.find('.author').text(articleObj.author);
+    $article.find('.title').text(articleObj.title);
+    $article.find('.date').text(articleObj.date);
+    //$article.find('.text').text(articleObj.text);
+    $article.find('.text').html(nl2br(escapeHtml(articleObj.text)));
+    //TODO: 바꿀 것
+
+    var $articleComment = $article.find('ul.commentList');
+    
+    $.each(articleObj.comment, function(commentObj){
+        var $comment = $commentFrame.clone();
+        $comment.find('.author').text(commentObj.author);
+        //$comment.find('.text').text(commentObj.text);
+        $comment.find('.text').html(nl2br(escapeHtml(commentObj.text)));
+        $comment.find('.date').text(commentObj.date);
+        $articleComment.append($comment);
+    });
+
+    $('#board').append($article);
+}
+
+function drawArticles(articlesObj){
+    var deferred = $.Deferred();
+    if(!articlesObj){
+        return quickReject('받아오는데 실패했습니다.');
+    }
+    if(!articlesObj.result){
+        return quickReject('에러가 발생했습니다. : '+articlesObj.reason);
+    }
+
+    $('.articleObj').detach();//첫 버전이니까 일괄 삭제 일괄 로드
+    $.each(articlesObj.articles,  drawArticle);
+    return true;
+}
+
+
+
+function loadArticles(){
+    return $.post({
+        url:'j_board_get_articles.php',
+        dataType:'json',
+        data:{
+            isSecret:isSecretBoard, //첫 버전이니까 전체 다 불러오자
+        }
+    });
+}
+
+$(function(){
+
+$('#submitArticle').click(submitArticle);
+$('.submitComment').click(submitComment);
+
+loadArticles()
+.then(drawArticles, errUnknown)
+.fail(function(reason){
+    alert(reason);
+});
+
+});
@@ -143,18 +143,99 @@ function getIconPath(imgsvr,  picture){
    }
 }

-jQuery(function($){
-    $('.obj_tooltip').tooltip({
-        title:function(){
-            return $.trim($(this).find('.tooltiptext').html());
-        },
-        html:true
+function activeFlip($obj){
+    var $result;
+    if($obj === undefined){
+        $result = $('img[data-flip]');
+    }
+    else{
+        $result = $obj.find('img[data-flip]');
+    }
+
+    $result.each(function(){
+        activeFlipItem($(this));
    });

+}
+
+function activeFlipItem($img){
+    var imageList = [];
+    imageList.push($img.attr('src'));
+    $.each($img.data('flip').split(','), function(idx, value){
+        var value = $.trim(value);
+        if(!value){
+            return true;
+        }
+        imageList.push(value);
+    });
+    if(imageList.length <= 1){
+        return;
+    }
+    $img.data('computed_flip_array', imageList);
+    $img.data('computed_flip_idx', 0);
+
+    $img.click(function(){
+        var arr = $img.data('computed_flip_array');
+        var idx = $img.data('computed_flip_idx');
+        idx = (idx + 1)%(arr.length);
+        $img.attr('src', arr[idx]);
+        $img.data('computed_flip_idx', idx);
+    });
+    $img.css('cursor','pointer');
+}
+
+jQuery(function($){
+    $('.obj_tooltip').each(function(){
+        var $objTooltip = $(this);
+        var tooltipClassText = $objTooltip.data('tooltip-class');
+        if(!tooltipClassText){
+            tooltipClassText = '';
+        }
+        console.log($objTooltip.data('tooltip-class'));
+        var template = '<div class="tooltip {0}" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>'
+            .format(tooltipClassText);
+
+        $objTooltip.tooltip({
+            title:function(){
+                return $.trim($(this).find('.tooltiptext').html());
+            },
+            template:template,
+            html:true
+        });
+        
+    });
+
+    activeFlip();
+
    var customCSS = localStorage.getItem('sam_customCSS');
    if(customCSS){
        var $style = $('<style type="text/css"></style>');
        $style.text(customCSS); 
        $style.appendTo($('head'));
    }
+
+    
 });
+
+
+function errUnknown(){
+    alert('작업을 실패했습니다.');
+}
+
+function quickReject(errMsg){
+    if(errMsg === undefined){
+        errMsg = '작업을 실패했습니다.';
+    }
+    var deferred = $.Deferred();
+    deferred.reject(errMsg);
+    return deferred.promise();
+}
+
+function nl2br(text){
+    return text.replace(/\n/g,"<br>");
+}
+/*
+function br2nl (text) {   
+    return text.replace(/<\s*\/?br\s*[\/]?>/gi, '\n');
+}
+*/
@@ -0,0 +1,23 @@
+$(function() {
+    $('#citySelector').select2({
+        theme: 'bootstrap4',
+        placeholder: "도시를 선택해 주세요.",
+        allowClear: false,
+        language: "ko",
+        containerCss: {
+            display: "inline-block !important",
+            color: 'white !important'
+        },
+        containerCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+        dropdownCssClass: 'simple-select2-align-center bg-secondary text-secondary',
+    });
+    $('#citySelector').on('select2:select', function(e){
+        var data = e.params.data;
+        if(!data.selected || data.disabled){
+            return;
+        }
+        var $obj = $('#citySelector').parents('form');
+        $obj.submit();
+        console.log($obj);
+    });
+});
@@ -7,6 +7,7 @@ jQuery(function($){
    function guiEditorInit($obj, editable){
    var $submitBtn = $obj.find('.submit');
    var $noticeInput = $obj.find('.input_form');
+    var globalVariableName = $noticeInput.data('global');
    var $editForm = $obj.find('.edit_form');
    var $cancelEdit = $obj.find('.cancel_edit');

@@ -15,6 +16,12 @@ jQuery(function($){
    function enableEditor(){
        editMode = true;
        $cancelEdit.show();
+
+        var inputText = window[globalVariableName];
+        if(!inputText || inputText == '<p></p>'){
+            inputText = '<p><br></p>';
+        }
+
        $editForm.removeClass('viewer').summernote({
            minHeight:200,
            maxHeight:null,
@@ -31,21 +38,72 @@ jQuery(function($){
                ['para', ['ul', 'ol', 'paragraph']],
                ['height', ['height', 'codeview']]
            ],
+            popover: {
+                image: [
+                    ['imagesize', ['imageSize100', 'imageSize50', 'imageSize25']],
+                    ['float', ['floatLeft', 'floatRight', 'floatNone']],
+                    ['remove', ['removeMedia']],
+                    ['custom', ['imageFlip']],
+                ],
+            },
            fontNames: ['맑은 고딕', 'Nanum Gothic', 'Nanum Myeongjo', 'Nanum Pen Script', '굴림', '굴림체', '바탕', '바탕체', '궁서', '궁서체'],
            fontSizes: ['8', '9', '10', '11', '12', '14', '16', '20', '24', '28', '32', '36', '40', '46', '52', '60'],
+            callbacks: {
+                onImageUpload: function(files) {
+                    $editForm.summernote('saveRange');
+                    if(files.length == 0){
+                        alert('업로드된 파일이 없습니다.');
+                        return false;
+                    }

-        }).summernote('code', $noticeInput.val());
+                    var formData = new FormData();
+                    formData.append('img', files[0]);
+                    $editForm.summernote("pasteHtml", '');
+
+                    $.ajax({
+                        type:'post',
+                        url:'j_image_upload.php',
+                        dataType:'json',
+                        contentType: false,
+                        processData:false,
+                        data:formData
+                    }).then(function(result){
+                        if(!result.result){
+                            alert(result.reason);
+                            return;
+                        }
+
+                        console.log($editForm.summernote('code'));
+                        if($editForm.summernote('isEmpty')){
+                            
+                            console.log('haha?');
+                            var $img = $('<img>');
+                            $img.attr('src', result.path);
+                            $editForm.summernote('code', $img);
+                            return;
+                        }
+                        
+                        $editForm.summernote("insertImage", result.path, result.path);
+                        
+                    },function(){
+                        alert('알 수 없는 이유로 아이콘 업로드를 실패했습니다.');
+                    });
+                }
+            }
+        }).summernote('code', inputText);
    }

    function disableEditor(){
        editMode = false;
        $editForm.summernote('destroy');
        $cancelEdit.hide();
-        $editForm.html($noticeInput.val()).addClass('viewer');
+        $editForm.html(window[globalVariableName]).addClass('viewer');
+        activeFlip($editForm);
    }

    $cancelEdit.hide();
-    $editForm.html($noticeInput.val());
+    $editForm.html(window[globalVariableName]);
+    activeFlip($editForm);
    if(editable){
        $submitBtn.prop('disabled', false);
    }
@@ -59,7 +117,9 @@ jQuery(function($){
            enableEditor();
            return false;
        }
-        $noticeInput.val($editForm.summernote('code'));
+        var text = $editForm.summernote('code');
+        window[globalVariableName] = text;
+        $noticeInput.val(text);
    });

    $cancelEdit.click(function(e){
@@ -0,0 +1,152 @@
+
+
+function submitLetter(){
+    var $letter = $('#newLetter');
+    var $brief = $letter.find('input.briefInput');
+    var $detail = $letter.find('input.detailInput');
+    var $prevNo = $letter.find('input.prevNo');
+    var $destNation = $letter.find('input.destNation');
+    var brief = $.trim($brief.val());
+    var detail = $.trim($detail.val());
+    var prevNo = parseInt($prevNo.val());
+    var destNation = parseInt($destNation.val());
+    
+    if(prevNo !== null && prevNo < 1){
+        prevNo = null;
+    }
+
+
+    if(!brief){
+        return false;
+    }
+
+    $brief.val('');
+    $detail.val('');
+
+    $.post({
+        url:'j_diplomacy_send_letter.php',
+        dataType:'json',
+        data:{
+            brief:brief,
+            detail:detail,
+            destNation:destNation,
+            prevNo:prevNo
+        }
+    }).then(function(data){
+        if(!data){
+            $title.val(title);
+            $text.val(text);
+            alert()
+            return quickReject('외교 서신을 보내는데 실패했습니다.');
+        }
+        if(!data.result){
+            $title.val(title);
+            $text.val(text);
+            return quickReject('외교 서신을 보내는데 실패했습니다. : '+data.reason);
+        }
+
+        return loadLetters().done(drawLetters);
+
+    }, errUnknown)
+    .fail(function(reason){
+        alert(reason);
+    });
+
+    return false;
+}
+
+function repondLetter(isAgree){
+    var $this = $(this);
+    var $letter = $this.parents('.letter').eq(0);
+    var letterNo = $letter.data('no');
+    
+    $.post({
+        url:'j_diplomacy_respond_letter.php',
+        dataType:'json',
+        data:{
+            letterNo:letterNo,
+            isAgree:isAgree,
+            reason:'', //TODO: reason 받기
+        }
+    }).then(function(data){
+        if(!data){
+            $text.val(text);
+            alert()
+            return quickReject('응답을 실패했습니다.');
+        }
+        if(!data.result){
+            $text.val(text);
+            return quickReject('응답을 실패했습니다. : '+data.reason);
+        }
+
+        return loadArticles().done(drawLetters);
+
+    }, errUnknown)
+    .fail(function(reason){
+        alert(reason);
+    });
+
+    return false;
+}
+
+function drawLetter(letterObj){
+    var $letterFrame = $('#letterTemplate > .letterFrame');
+
+    var $letter = $letterFrame.clone();
+    $letter.addClass('letterObj')
+        .data('no', letterObj.no)
+
+    //TODO: 국가명, 수뇌명 입력
+    $letter.find('.date').text(letterObj.date);
+    $letter.find('.letterNo').text('#'+letterObj.no);
+    $letter.find('.srcNation').text(letterObj.aux[''])
+    $letter.find('.brief').html(nl2br(escapeHtml(letterObj.brief)));
+    $letter.find('.detail').html(nl2br(escapeHtml(letterObj.detail)));
+    //TODO: 바꿀 것
+
+    $('#board').append($letter);
+}
+
+function drawLetters(lettersObj){
+    var deferred = $.Deferred();
+    if(!lettersObj){
+        return quickReject('받아오는데 실패했습니다.');
+    }
+
+    //TODO: 국가 리스트 출력
+
+    if(!lettersObj.result){
+        return quickReject('에러가 발생했습니다. : '+lettersObj.reason);
+    }
+
+    $('.letterObj').detach();//첫 버전이니까 일괄 삭제 일괄 로드
+    $.each(lettersObj.letters,  drawLetter);
+    return true;
+}
+
+function loadLetters(){
+    return $.post({
+        url:'j_diplomacy_get_letters.php',
+        dataType:'json', //첫 버전이니까 전체 다 불러오자
+        data:{
+        }
+    });
+}
+
+$(function(){
+
+$('#submitLetter').click(submitLetter);
+$('.respondAgree').click(function(){
+    return repondLetter(true);
+});
+$('.respondDisagree').click(function(){
+    return repondLetter(false);
+});
+
+loadLetters()
+.then(drawLetters, errUnknown)
+.fail(function(reason){
+    alert(reason);
+});
+
+});
@@ -81,13 +81,13 @@ $(function() {
            
            var $win = $('<div id="ext_win" style="padding:0;" title="관직 임명"><table style="padding:0;margin:0;" cellspacing="0" cellpadding="0" border="0"><tr><td width="700px" style="padding:0;"><iframe id="in_frame" src="map.php?type=1&amp;graphic=1" width="700" height="520" frameborder="0" marginwidth="0" marginheight="0" topmargin="0" scrolling="no"></iframe></td>'+
                         '<td width="305px" style="padding:0;vertical-align:top;height:520px;"><div style="height:520px;width:305px;overflow-y:scroll;overflow-x:hidden;">'+
-                         '<table id="inner_table"><thead><tr><th width="35">도시</th><th width="85">태수</th><th width="85">군사</th><th width="85">시중</th></tr></thead><tbody class="content">'+
+                         '<table id="inner_table"><thead><tr><th width="35">도시</th><th width="85">태수</th><th width="85">군사</th><th width="85">종사</th></tr></thead><tbody class="content">'+
                         '</tbody></table></div></td></tr></table>'+
                         '<form name="form1" id="fake_form"><span id="user_name"></span> : <select name="double" id="city_select"></select>'+
                         '<div id="duty_radio" style="display:inline;">'+
                         '<input type="radio" id="duty_type1" value="4" name="duty_radio"><label for="duty_type1">태수</label>'+
 						 '<input type="radio" id="duty_type2" value="3" name="duty_radio"><label for="duty_type2">군사</label>'+
-						 '<input type="radio" id="duty_type3" value="2" name="duty_radio"><label for="duty_type3">시중</label>'+
+						 '<input type="radio" id="duty_type3" value="2" name="duty_radio"><label for="duty_type3">종사</label>'+
                         '</div></form></div>');
        	$win.hide();
            
@@ -135,17 +135,17 @@ $(function() {
                
                var p태수 = cityInfo.p태수 && currUser.p태수;
            	var p군사 = cityInfo.p군사 && currUser.p군사;
-            	var p시중 = cityInfo.p시중 && currUser.p시중;
+            	var p종사 = cityInfo.p종사 && currUser.p종사;
                
-                //console.log(p태수,p군사,p시중);
+                //console.log(p태수,p군사,p종사);
                
                $('#duty_type1').button({disabled:!p태수});   
                $('#duty_type2').button({disabled:!p군사});  
-                $('#duty_type3').button({disabled:!p시중});  
+                $('#duty_type3').button({disabled:!p종사});  
                
                var $태수 = cityInfo.$태수;
                var $군사 = cityInfo.$군사;
-                var $시중 = cityInfo.$시중;
+                var $종사 = cityInfo.$종사;
                
                
                
@@ -222,7 +222,7 @@ $(function() {
            
            var p태수 = cityInfo.p태수 && currUser.p태수;
            var p군사 = cityInfo.p군사 && currUser.p군사;
-            var p시중 = cityInfo.p시중 && currUser.p시중;
+            var p종사 = cityInfo.p종사 && currUser.p종사;
            
            var newInfo = {
                지역 : 지역,
@@ -232,12 +232,12 @@ $(function() {
                city : cityInfo,
                p태수 : p태수,
                p군사 : p군사,
-                p시중 : p시중
+                p종사 : p종사
            };
            
            //console.log(newInfo);
            
-            if(p태수 || p군사 || p시중){
+            if(p태수 || p군사 || p종사){
                if(typeof subCityGroupList[지역] == 'undefined'){
                    subCityGroupList[지역] = [];
                }
@@ -296,11 +296,11 @@ $(function() {
                    }).css('cursor','pointer');
                }
                
-                var $시중 = cityInfo.$시중.clone();
-                $city.append($시중);
-                if(!newInfo.p시중)$시중.css('color','red');
+                var $종사 = cityInfo.$종사.clone();
+                $city.append($종사);
+                if(!newInfo.p종사)$종사.css('color','red');
                else{
-                    $시중.click(function(){
+                    $종사.click(function(){
                        $('#duty_radio :radio:eq(2)').attr('checked','checked');
                        $('#duty_radio :radio').button('refresh');
                    }).css('cursor','pointer');
@@ -389,22 +389,22 @@ $(function() {
                $.each(cityList,function(idx,cityInfo){
                	cityInfo.p태수=false;
                    cityInfo.p군사=false;
-                    cityInfo.p시중=false;
+                    cityInfo.p종사=false;
                });
                
                $.each(userList,function(idx,userInfo){
                    userInfo.p태수=false;
                    userInfo.p군사=false;
-                    userInfo.p시중=false;
+                    userInfo.p종사=false;
                });
                
                setUserAvailable($selects.eq(1).find("option"),"p태수");
                setUserAvailable($selects.eq(3).find("option"),"p군사");
-                setUserAvailable($selects.eq(5).find("option"),"p시중");
+                setUserAvailable($selects.eq(5).find("option"),"p종사");
                
                setCityAvailiable($selects.eq(0).find("option"),"p태수");
                setCityAvailiable($selects.eq(2).find("option"),"p군사");
-                setCityAvailiable($selects.eq(4).find("option"),"p시중");
+                setCityAvailiable($selects.eq(4).find("option"),"p종사");

                
                $.each(cityList,function(idx,cityInfo){
@@ -484,10 +484,10 @@ $(function() {
                        
                        addBtn($name,cityInfo,userInfo,4,'태수');
                        addBtn($name,cityInfo,userInfo,3,'군사');
-                        addBtn($name,cityInfo,userInfo,2,'시중');
+                        addBtn($name,cityInfo,userInfo,2,'종사');
                        
                        //특수 버튼!
-                        if(userInfo.p태수||userInfo.p군사||userInfo.p시중){
+                        if(userInfo.p태수||userInfo.p군사||userInfo.p종사){
                            var $btn = $('<button>...</button>');
                            $btn.addClass('for_duty');
                            if(userInfo.is수뇌){
@@ -594,8 +594,8 @@ $(function() {
                if(cityList[cityName].$군사.text() == name){
                    cityList[cityName].$군사.css('color','lightgreen');
                }
-                if(cityList[cityName].$시중.text() == name){
-                    cityList[cityName].$시중.css('color','lightgreen');
+                if(cityList[cityName].$종사.text() == name){
+                    cityList[cityName].$종사.css('color','lightgreen');
                }
                
                userList[name]={
@@ -606,7 +606,7 @@ $(function() {
                    val:'-1',
                    p태수:false,
                    p군사:false,
-                    p시중:false,
+                    p종사:false,
                    is수뇌:is수뇌
                };
                
@@ -680,7 +680,7 @@ $(function() {
                
                cityInfo.p태수 = false;
                cityInfo.p군사 = false;
-                cityInfo.p시중 = false;
+                cityInfo.p종사 = false;
                
            }
            
@@ -777,12 +777,12 @@ $(function() {
                
            }
            
-            //태수,군사,시중
+            //태수,군사,종사
            {
                var $baseTr = $this.find('tr:eq(2)');
                cityInfo.$태수 = $baseTr.find('td:eq(7)');
                cityInfo.$군사 = $baseTr.find('td:eq(9)');
-                cityInfo.$시중 = $baseTr.find('td:eq(11)');
+                cityInfo.$종사 = $baseTr.find('td:eq(11)');
            }
            
            //기타
@@ -114,7 +114,8 @@ function formSetup(){
            extend:"required",
            npcmode:"required",
            show_img_level:"required",
-            tournament_trig:"required"
+            tournament_trig:"required",
+            join_mode:'required',
        },
        errorElement: "div",
        errorPlacement: function ( error, element ) {
@@ -153,7 +154,8 @@ function formSetup(){
                npcmode:$('#npcmode input:radio:checked').val(),
                show_img_level:$('#show_img_level input:radio:checked').val(),
                tournament_trig:$('#tournament_trig input:radio:checked').val(),
-                reserve_open:$('#reserve_open').val()
+                reserve_open:$('#reserve_open').val(),
+                join_mode:$('#join_mode input:radio:checked').val(),
            }
        }).then(function(result){
            var deferred = $.Deferred();
@@ -173,4 +173,16 @@ jQuery(function($){
        }
        return true;
    });
+
+    var randomGenType = Math.floor(Math.random()*7);
+    if(randomGenType < 3){
+        abilityLeadpow();
+    }
+    else if(randomGenType < 6){
+        abilityLeadint();
+    }
+    else{
+        abilityPowint();
+    }
+
 });
@@ -0,0 +1,8 @@
+{
+    "typeAcquisition": {
+        "include": [
+            "jquery"
+        ]
+    }
+
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hide_D	7586243a95	DB 스키마 변경	2019-01-25 00:13:04 +09:00
Hide_D	1e1c7801e1	중간반영	2019-01-24 03:34:03 +09:00
Hide_D	a363f6ef5f	외교부 틀 작성	2019-01-23 03:11:07 +09:00
Hide_D	334e1fd2da	국메 처리 방식을 변경. 국가간 메시지는 외교권자만 가능	2019-01-23 02:36:03 +09:00
Hide_D	2e8e29e93c	외교메시지 수신 기준 변경중	2019-01-23 01:37:40 +09:00
Hide_D	5e5a1a3668	기존 회의실, 기밀실 코드 삭제	2019-01-22 03:17:44 +09:00
Hide_D	b93b464ebf	외교서신 응답	2019-01-22 02:47:27 +09:00
Hide_D	842ba46a95	파일 명을 namespace를 고려하여 수정	2019-01-21 02:25:54 +09:00
Hide_D	03b27d8e8f	외교 서신 추가 기능	2019-01-21 02:23:23 +09:00
Hide_D	c11b41c6ba	게시물 코드	2019-01-21 02:00:48 +09:00
Hide_D	018cc526ee	게시판 글, 댓글 작성 초안	2019-01-21 01:45:32 +09:00
Hide_D	edf4508e6b	권한 세팅	2019-01-18 03:01:02 +09:00
Hide_D	d26a1f0312	왕 무장 관직 순서 변경	2019-01-17 23:01:05 +09:00
Hide_D	2984f6a453	무관 최종 관직을 실제 삼국지 관직 순서에 맞게 변경	2019-01-17 22:59:54 +09:00
Hide_D	a00058d959	시중->종사	2019-01-17 22:44:18 +09:00
Hide_D	8e56a457f1	게시물 구조 설정	2019-01-17 03:12:26 +09:00
Hide_D	74d5f021cd	tui-editor와 새 게시판 준비	2019-01-17 02:54:58 +09:00
Hide_D	a37715315d	permission, penalty 대응 준비	2019-01-16 02:47:48 +09:00
Hide_D	d9c9977610	장수 schema 수정	2019-01-16 02:26:28 +09:00
Hide_D	c2f0cbb10a	버튼 이동 코드 정리	2019-01-16 02:18:42 +09:00
Hide_D	a34d00d822	DB 스키마 정리, diplomacy 테이블 정리, 코드 정리	2019-01-16 01:59:07 +09:00
Hide_D	9924ec6963	국법 기능 제거. 외교부를 위한 자리 추가	2019-01-12 18:53:01 +09:00
Hide_D	9036201887	DB 스키마 준비	2019-01-12 07:21:34 +09:00
Hide_D	b2435d2430	걸그룹 전콘 문제 일부 수정	2018-12-08 20:55:48 +09:00
Hide_D	afd6148770	걸그룹 대전 0.5 반영	2018-12-02 22:28:10 +09:00
Hide_D	b70b58a35a	지급율 -> 지급률	2018-12-01 23:37:40 +09:00
Hide_D	df963c2780	외교 메시지는 삭제 할 수 없도록	2018-12-01 18:36:43 +09:00
Hide_D	1b732c76e6	국메 삭제 가능	2018-11-30 21:49:19 +09:00
Hide_D	f9489b0173	디버그 코드 제거	2018-11-30 21:44:59 +09:00
Hide_D	18942c55ae	메시지 삭제 기능 추가	2018-11-30 21:29:31 +09:00
Hide_D	bf34b2f1ca	메시지 타이밍 정책 일부 수정	2018-11-30 19:03:26 +09:00
Hide_D	a717a021c2	페이지당 갱신 시간을 10초에서 5초로 변경	2018-11-30 02:05:33 +09:00
Hide_D	dcf718d592	메시지를 띄울 때 flex 적용	2018-11-30 01:51:24 +09:00
Hide_D	f5eeb2b839	로그아웃 되었을 경우 무한히 호출하는 버그 수정	2018-11-30 01:24:45 +09:00
Hide_D	bc435adc11	이전 메시지 가져오기 기능 추가	2018-11-30 01:18:07 +09:00
Hide_D	aeb8e82cbd	부상으로 인한 전투 우선순위 감소를 완화	2018-11-28 23:43:42 +09:00
Hide_D	5cb2ed3ccd	등갑, 맹수 너프	2018-11-28 01:24:29 +09:00
Hide_D	93b1864d1b	자객병의 기동을 8로 상향	2018-11-28 01:20:32 +09:00
Hide_D	a6efffda45	selector에 검은색 추가	2018-11-28 01:14:43 +09:00
Hide_D	c89d6f1a58	도시 목록에 select2를 시험 적용	2018-11-28 01:02:56 +09:00
Hide_D	d4f16abfac	암행부의 장수수에서 '부대장'이 제외됩니다.	2018-11-28 00:29:53 +09:00
Hide_D	8529f3f355	임관턴이 어찌저찌 어거지로 동작하던 버그 수정	2018-11-28 00:26:29 +09:00
Hide_D	2eb136827d	랜덤 임관을 더 고르게 합니다.	2018-11-28 00:18:09 +09:00
Hide_D	9594e6eb32	부대장은 기술연구, 전투시 기술 상승에 영향을 주지 않도록 변경	2018-11-28 00:16:34 +09:00
Hide_D	9e8111994a	통합, 합병시 부대장까지 같이 포함되는 문제 수정	2018-11-28 00:14:36 +09:00
Hide_D	af0c2b7129	select2 설치	2018-11-27 23:52:12 +09:00
Hide_D	96b73a0cef	도시 목록 등 불필요한 가로바 길이 줄임	2018-11-26 22:29:11 +09:00
Hide_D	6c290ee2d3	추방시 명성 안깎이는 버그 수정, 첫 하야시 패널티 없음	2018-11-26 18:12:21 +09:00
Hide_D	ca53e3de3a	반계 상향	2018-11-26 18:08:57 +09:00
Hide_D	6ea3ec700a	수비 우선 순위를 부상여부, 수뇌여부, 훈사 여부를 반영하도록 변경	2018-11-26 15:17:51 +09:00
Hide_D	fe3355e08e	gitignore 변경	2018-11-26 15:08:33 +09:00
Hide_D	43da95b4a5	디버그 코드 제거	2018-11-25 00:51:59 +09:00
Hide_D	3d93a63caa	php의 rename을 OS의 mv로 변경	2018-11-25 00:50:41 +09:00
Hide_D	9550607da3	디버그 모드	2018-11-25 00:39:49 +09:00
Hide_D	d5d9798913	rename 재수정	2018-11-25 00:37:24 +09:00
Hide_D	6cfe08235f	base을 filename으로 수정 시도	2018-11-25 00:35:11 +09:00
Hide_D	49eb850ff1	파일명 에러 수정	2018-11-25 00:29:26 +09:00
Hide_D	5a558583d2	폴더명 실수..	2018-11-24 23:46:04 +09:00
Hide_D	1e5f0d0555	이전 디렉토리를 이동하도록 변경	2018-11-24 23:44:33 +09:00
Hide_D	c58caeda4c	국방 표기 방식 변경	2018-11-13 19:55:40 +09:00
Hide_D	26fc56f2b8	extractMissingPostToGlobals(); 제거	2018-11-13 02:11:00 +09:00
Hide_D	6a9e7aa89d	msg overflow 적용	2018-11-11 23:32:19 +09:00
Hide_D	b6c3b0cdc3	방랑군이 아니어도 건국 가능한 버그 수정	2018-10-29 03:15:45 +09:00
Hide_D	5ae91ac620	견문 무력 버그 수정	2018-10-25 01:26:59 +09:00
Hide_D	70265c55ef	3인 임관 실패시 견문	2018-10-25 01:21:52 +09:00
Hide_D	7c3b5fc31e	견문 시 무력이 떨어지지 않도록 변경	2018-10-25 01:17:04 +09:00
Hide_D	a9a830caa2	기타 설정 추가	2018-10-24 03:27:22 +09:00
Hide_D	b49ff3d4ed	예약 안되는 버그 수정	2018-10-24 03:22:41 +09:00
Hide_D	42310fa170	랜임 개월 수 버그 수정	2018-10-24 01:17:03 +09:00
Hide_D	bfff1d9e2f	랜임 모드 버그 수정	2018-10-24 00:54:18 +09:00
Hide_D	2c98777b9f	등용장 무효화	2018-10-23 23:33:12 +09:00
Hide_D	4a91260a31	오타 수정 설명 수정	2018-10-23 16:38:25 +09:00
Hide_D	076971bcae	오타 수정	2018-10-23 16:35:28 +09:00
Hide_D	01fcc9bcab	랜덤 임관 모드 추가	2018-10-23 15:05:19 +09:00
Hide_D	348877c7cd	NPC 부대장 수치 버그 수정	2018-10-07 21:46:28 +09:00
sars	478f26e75a	camelCase대신 underscore_case 사용	2018-10-04 00:16:08 +09:00
sars	57cc558b9b	장수 동향, 개인 기록, 중원 정세 id 등록	2018-10-04 00:07:46 +09:00
Hide_D	20b1f8eff8	전투 우선순위에 '유니크 아이템'의 효과가 과도하게 측정되는 버그 수정	2018-10-01 23:10:47 +09:00
Hide_D	f0a7990404	계략 기본 성공률을 '보급'과 거꾸로 적용한 버그 수정	2018-09-27 17:00:56 +09:00
Hide_D	27f53ff4a6	임관 코드 최종 수정	2018-09-27 16:36:55 +09:00
Hide_D	9ec5dfc8b1	사실 모드 임관 수정	2018-09-27 16:29:49 +09:00
Hide_D	e4c1e414c8	사실 모드 랜임 코드 버그 수정	2018-09-27 16:27:38 +09:00
Hide_D	a391650472	인증 코드 자리 수 하나 감소	2018-09-25 10:45:21 +09:00
Hide_D	3cfde2b40d	주자사, 공, 황제일 때 장수 수가 내부적으로 1 차이나게 적용되는 버그 수정	2018-09-25 10:12:42 +09:00
Hide_D	8bf1ed33dc	전환 시 '빈칸' 보정, 설명 추가	2018-09-24 04:23:47 +09:00
Hide_D	422b3be0c5	flip image 추가	2018-09-24 04:17:54 +09:00
Hide_D	c34e44c4ec	data-flip을 허용하고, summernote에 img 태그에 data-flip을 추가하도록	2018-09-24 03:58:40 +09:00
Hide_D	a2b20eca67	장수 생성시 초기 스탯으로 '임의 버튼을 클릭'하도록 지정	2018-09-24 02:16:42 +09:00
Hide_D	d41c316bfb	설치 설명에서 MariaDB만 지원한다고 변경	2018-09-23 17:31:40 +09:00
Hide_D	ca1d8aab84	WebUtil.php에서 drawMenu fallback 추가. 설치시 '활성화되지 않은' KakaoKey.php 파일 추가	2018-09-23 17:31:30 +09:00
Hide_D	32e3dcff7c	이미지 업로드 기능 추가	2018-09-22 03:05:58 +09:00
Hide_D	9a23470622	초반 제한 기간 텍스트 수정	2018-09-21 02:08:51 +09:00
Hide_D	c37a186802	툴팁 class 수정. 지도의 년월에 올리면 초반 제한, 기술 제한 툴팁	2018-09-21 02:06:45 +09:00
Hide_D	84c17e3b22	왕조 일람 버그 수정	2018-09-20 02:26:20 +09:00
Hide_D	64e0fca124	전쟁 기한 공식을 스택형으로 변경	2018-09-20 01:15:50 +09:00
Hide_D	5c6537fd7a	멸망 시 접경 재설정 코드 버그 수정	2018-09-20 01:02:29 +09:00
Hide_D	764a82df00	버그 수정	2018-09-20 00:43:36 +09:00
Hide_D	e904911fd9	후발 주자에게, 명성, 전특, 내특에 대해 일정 부분 보상 제공	2018-09-20 00:35:38 +09:00
Hide_D	a7494f72f6	NPC 부대장에게 포상하지 않도록 수정	2018-09-19 23:56:33 +09:00
Hide_D	b6b53b028d	부대탄 유저장도 발령하지 않도록 수정	2018-09-19 23:37:36 +09:00
Hide_D	1743ce714a	전투 코드를 모두 generator 기반으로 변경	2018-09-19 23:29:36 +09:00
Hide_D	656f0c5d11	부대장 주는 횟수 변경	2018-09-19 22:57:06 +09:00
Hide_D	d80aebe1f4	집합장 때문에 총 기술치가 깎이는 버그 수정	2018-09-19 22:55:48 +09:00
Hide_D	ad48bc1962	접경 내정 상승량 감소는 '수도가 아닐때' 적용	2018-09-19 03:01:38 +09:00
Hide_D	d72fbb7098	부대장에게는 금쌀이 제공되지 않도록 수정	2018-09-19 02:21:38 +09:00
Hide_D	95d5eaa09b	주석 수정	2018-09-19 02:13:44 +09:00
Hide_D	b997a6159e	치안에 따른 재난 확률 변경	2018-09-19 02:09:08 +09:00
Hide_D	1cd8b7a450	전쟁 중 접경에서는 농상성수 가 제대로 안 오르도록	2018-09-19 02:00:29 +09:00
Hide_D	c5a8eb4261	접경지 처리시, 공백지 접경인지 적군 접경인지 구분	2018-09-19 01:49:46 +09:00
Hide_D	8891c29cbd	트래픽이 0인 경우 버그 수정	2018-09-19 01:46:15 +09:00
Hide_D	2facdfa1dd	루드라사움에서도 보병의 성벽 대미지 증가	2018-09-19 01:33:33 +09:00
Hide_D	65c9fa0c21	보병의 성벽 상대 전투력 20% 증가	2018-09-19 01:32:04 +09:00
Hide_D	e53c85dbaf	돌격에 저지 불가 제거	2018-09-19 01:16:50 +09:00
Hide_D	3a231e8e61	저지 숙련 증가	2018-09-19 01:00:25 +09:00
Hide_D	4dc7776387	차병은 성벽 전투시 부상을 입지 않음	2018-09-19 00:39:15 +09:00
Hide_D	5ca043e0f1	견고 설명 수정	2018-09-19 00:29:24 +09:00
Hide_D	9ef052c814	견고 추가 상향	2018-09-19 00:28:09 +09:00
Hide_D	6d1690beaa	소울소드 리마스터 시나리오 업데이트	2018-09-18 23:19:30 +09:00
Hide_D	171656e5be	버그 수정 ㅜ	2018-09-18 03:30:40 +09:00
Hide_D	385e7f4871	천통했을 때에는 벌점이 늘어나지 않도록 수정	2018-09-18 03:26:12 +09:00
Hide_D	89c5485784	NPC 안생기는 버그 수정	2018-09-18 03:22:55 +09:00
Hide_D	02d191ec28	변수 대소문자 버그 수정	2018-09-18 03:17:20 +09:00
Hide_D	47c3090f3a	NPC 생성 루프 수정	2018-09-18 03:15:40 +09:00
Hide_D	476dac1ac1	주목, 왕이되면 NPC 부대장 하나 더 추가	2018-09-18 02:56:35 +09:00
Hide_D	8ca0d0ced4	메시지 전송 시 장수명 순서대로 정렬	2018-09-18 02:31:41 +09:00
Hide_D	ab197489d7	집합장 NPC 삭턴이 실행되지 않는 문제 수정	2018-09-18 02:25:03 +09:00
Hide_D	99736d187b	통합 제의 임시 삭제	2018-09-18 02:15:48 +09:00
Hide_D	197c09bd0d	집합장 턴을 그나마 확인할 수 있도록 삭턴 조정	2018-09-18 02:02:26 +09:00
Hide_D	6cc634ba1f	집합장은 턴이 항상 풀로 차도록..	2018-09-18 02:01:55 +09:00
Hide_D	4c89ad91d2	부대장 시작 도시를 랜덤으로	2018-09-18 01:56:32 +09:00
Hide_D	d66233bce0	NPC 부대장 버그 수정	2018-09-18 01:51:28 +09:00
Hide_D	b485e6927e	부대장 번호 버그 수정	2018-09-18 01:47:48 +09:00
Hide_D	74b9e8bd7b	집합장 명칭을 부대장으로 변경	2018-09-18 01:46:37 +09:00
Hide_D	545742ecc0	부대 탄 사람은 발령 로직에서 최대한 배제	2018-09-18 01:27:30 +09:00
Hide_D	d9f1f65352	NPC 부대 생성 버그 수정	2018-09-18 01:18:03 +09:00
Hide_D	0904d17a5f	집합장 등장 수식 수정	2018-09-18 00:36:05 +09:00
Hide_D	87171b4246	집합장 테스트	2018-09-18 00:29:44 +09:00
Hide_D	78f8b56203	reset_token에서 불필요한 명령 제거	2018-09-17 23:06:24 +09:00
Hide_D	c160c5a555	천통시 모든 국가 등재 장수의 이름이 9글자 인 경우 발생하는 버그 수정	2018-09-12 01:46:16 +09:00
Hide_D	31c7bf5348	메뉴 아이템 길이 버그	2018-09-12 01:16:17 +09:00
Hide_D	6eadf718fc	meta keyword 추가	2018-09-12 00:35:50 +09:00
Hide_D	effced24d1	sitemap을 위하여 메뉴를 php에서 직접 출력하도록 변경	2018-09-12 00:12:32 +09:00
Hide_D	09f399db9a	robots.txt 재등록	2018-09-11 23:50:29 +09:00
Hide_D	2b73f6faea	로봇에 대문자 들어가서 삭제	2018-09-11 23:50:16 +09:00
Hide_D	943662605e	Robots.txt 설명 추가	2018-09-11 23:48:02 +09:00
Hide_D	9a04962bd6	대문에 meta 태그 추가	2018-09-11 23:03:10 +09:00
Hide_D	c371f6bbb5	refresh_token 변수가 잘못된 것 수정	2018-09-11 11:13:37 +09:00
Hide_D	8324e2e454	access token 체크용 디버그	2018-09-11 11:08:37 +09:00
Hide_D	30307c1b56	로그인 인증 버그 체크	2018-09-11 10:55:53 +09:00
Hide_D	f139d0d2a8	로그인 인증 디버깅용 코드 추가	2018-09-10 23:12:27 +09:00
Hide_D	33843764a7	로그인 토큰을 제대로 못 받은 경우 추가	2018-09-10 23:07:44 +09:00
Hide_D	aca7d7c571	createOTP 반환형 버그	2018-09-10 01:49:11 +09:00
Hide_D	bff72f609c	세션 로그인시 oauth token 값이 제대로 저장 안되는 버그 수정	2018-09-10 01:09:55 +09:00
Hide_D	adb03b7420	인증시 로그아웃이 바로 풀리는 버그 수정	2018-09-10 00:38:06 +09:00
Hide_D	2094e18b60	IE에서 인증이 이상한 문제 해결	2018-09-10 00:35:59 +09:00
Hide_D	541d8ddd40	토큰 시간 초과시 즉시 로그아웃 되도록 변경	2018-09-10 00:22:57 +09:00
Hide_D	f996172218	Merge branch 'kakao_login' into devel	2018-09-09 23:58:51 +09:00
Hide_D	f9ffc1c1f3	oauth 인증중 token_valid_until만 table column으로 분리	2018-09-09 23:57:26 +09:00
Hide_D	05085ad504	5일이 지난후 로그인 토큰을 미리 초기화 가능하도록 수정	2018-09-09 23:18:23 +09:00
Hide_D	64aecaf28b	메인 페이지에 '비밀번호 초기화' 추가	2018-09-09 21:53:00 +09:00
Hide_D	7b3ef45300	카카오 로그인 작업 개선	2018-09-09 21:16:44 +09:00
Hide_D	bd25de930b	카카오 로그인용 디버깅 코드 제거	2018-09-09 20:22:34 +09:00
Hide_D	15d43c9653	카카오 로그인 초기 구현	2018-09-09 20:19:00 +09:00
Hide_D	5b7eba61cc	반계에 '동그라미' 오타 제거	2018-09-09 15:54:17 +09:00