여백 주기

This reverts commit 0843da7a7c.

.gitignore

@@ -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

README.md

@@ -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키를 입력해야 합니다.
 
 
 ## 라이선스

e_lib/linkify/linkify-string.min.js

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

e_lib/select2/i18n/ko.js

@@ -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}})();

e_lib/select2/select2-bootstrap4.css

@@ -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; } }

e_lib/select2/select2.css

@@ -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; }

e_lib/summernote/plugin/image-sammo/summernote-image-flip.js

@@ -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);
+              });
+          };
+      }
+  });
+}));

f_install/j_setup_db.php

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

f_install/sql/common_schema.sql

@@ -32,6 +32,7 @@ CREATE TABLE `member` (
 	`PICTURE` VARCHAR(64) NULL DEFAULT 'default.jpg',
 	`IMGSVR` INT(1) NULL DEFAULT '0',
 	`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,

hwe/_119_b.php

@@ -40,10 +40,10 @@ case "분당김":
     $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
 
     $db->update('general', [
-        'turntime'=>$db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
+        'turntime'=>$db->sqleval('DATE_SUB(turntime, INTERVAL %i MINUTE)', $minute)
     ], true);
     $db->update('auction', [
-        'expire'=>$db->sqleval('DATE_ADD(expire, INTERVAL %i MINUTE)', $minute)
+        'expire'=>$db->sqleval('DATE_SUB(expire, INTERVAL %i MINUTE)', $minute)
     ], true);
     break;
 case "분지연":

hwe/_admin8.php

@@ -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>";
 }
 ?>

hwe/_admin_force_rehall.php

@@ -0,0 +1,25 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+
+if($session->userGrade < 5) {
+    die('권한 부족');
+}
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+if(!$gameStor->isunited){
+    die('아직 천통하지 않았습니다');
+}
+
+foreach($db->queryFirstColumn(
+    'SELECT no FROM general WHERE npc != 0 and age >= %i',
+    GameConst::$retirementYear
+) as $generalNo){
+    CheckHall($generalNo);
+}

hwe/a_bestGeneral.php

@@ -6,8 +6,6 @@ include "func.php";
 
 $btn = Util::getReq('btn');
 
-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -51,6 +49,12 @@ increaseRefresh("명장일람", 1);
 <div style="margin:auto;width=1000px;">
 <?php
 
+$ownerNameList = [];
+if($gameStor->isunited){
+    foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+        $ownerNameList[$ownerID] = $ownerName;
+    }
+}
 
 $nationName = [0=>'재야'];
 $nationColor = [0=>'#000000'];
@@ -62,8 +66,11 @@ foreach (getAllNationStaticInfo() as $nation) {
 $types = [
     ["명 성", "int", function($v){$v['value'] = $v['experience']; return $v; }],
     ["계 급", "int", function($v){$v['value'] = $v['dedication']; return $v; }],
-    ["계 략 성 공", "int", function($v){
+    ["계 략 성 공", "int", function($v) use ($gameStor){
         $v['value'] = $v['firenum'];
+        if($gameStor->isunited){
+            return $v;
+        }
         $v['nationName'] = '???';
         $v['pictureFullPath'] = GetImageURL(0)."/default.jpg";
         $v['name'] = '???'; 
@@ -168,7 +175,7 @@ $generals = array_map(function($general) use($nationColor, $nationName) {
 
     return $general;
 }, $db->query(
-    "SELECT nation,no,name,name2 as owner_name, picture, imgsvr, 
+    "SELECT nation,no,name,name2 as owner_name, owner, picture, imgsvr, 
     experience, dedication, firenum, warnum, killnum, killcrew, deathcrew, 
     dex0, dex10, dex20, dex30, dex40, 
     ttw, ttd, ttl, tlw, tld, tll, tpw, tpd, tpl, tiw, tid, til,
@@ -181,7 +188,8 @@ $templates = new \League\Plates\Engine('templates');
 
 foreach($types as $idx=>[$typeName, $typeValue, $typeFunc]){
     $validCnt = 0;
-    $typeGenerals = array_map(function($general) use($typeValue, $typeFunc, &$validCnt){
+    $typeGenerals = array_map(function($general) use($typeValue, $typeFunc, &$validCnt, $ownerNameList){
+        $general['owner_name'] = $ownerNameList[$general['owner']]??null;
         $general = ($typeFunc)($general);
         $value = $general['value'];
 

hwe/a_emperior2.php

@@ -6,8 +6,6 @@ include "func.php";
 
 $select = Util::getReq('select', 'int', 0);
 
-extractMissingPostToGlobals();
-
 $db = DB::db();
 $connect=$db->get();
 

hwe/a_emperior_detail.php

@@ -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'])){

hwe/a_genList.php

@@ -6,8 +6,6 @@ include "func.php";
 
 $type = Util::getReq('type', 'int', 9);
 
-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -32,6 +30,13 @@ if ($type <= 0 || $type > 15) {
     $type = 9;
 }
 
+$ownerNameList = [];
+if($gameStor->isunited){
+    foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+        $ownerNameList[$ownerID] = $ownerName;
+    }
+}
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -84,26 +89,26 @@ foreach (getAllNationStaticInfo() as $nation) {
     $nationlevel[$nation['nation']] = $nation['level'];
 }
 
-switch ($type) { //FIXME:  $query 처리 조심.
-    case  1: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by nation"; break;
-    case  2: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by leader desc"; break;
-    case  3: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by power desc"; break;
-    case  4: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by intel desc"; break;
-    case  5: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by experience desc"; break;
-    case  6: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by dedication desc"; break;
-    case  7: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by level desc"; break;
-    case  8: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by killturn"; break;
-    default:
-    case  9: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by connect desc"; break;
-    case 10: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by experience desc"; break;
-    case 11: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by personal"; break;
-    case 12: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by special desc"; break;
-    case 13: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by special2 desc"; break;
-    case 14: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by age desc"; break;
-    case 15: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by npc desc"; break;
-}
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$gencount = MYDB_num_rows($genresult);
+
+[$orderKey, $orderDesc] = [
+    1=>['nation', false],
+    2=>['leader', true],
+    3=>['power', true],
+    4=>['intel', true],
+    5=>['experience', true],
+    6=>['dedication', true],
+    7=>['level', true],
+    8=>['killturn', false],
+    9=>['connect', true],
+    10=>['experience', true],
+    11=>['personal', true],
+    12=>['special', true],
+    13=>['special2', true],
+    14=>['age', true],
+    15=>['npc', true],
+][$type];
+
+$generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by %b %l', $orderKey, $orderDesc?'desc':'');
 
 echo"
 <table align=center width=1000 class='tb_layout bg0'>
@@ -124,8 +129,7 @@ echo"
         <td width=45 align=center id=bg1>삭턴</td>
         <td width=70 align=center id=bg1>벌점</td>
     </tr>";
-for ($j=0; $j < $gencount; $j++) {
-    $general = MYDB_fetch_array($genresult);
+foreach($generalList as $general){
     $nation = $nationname[$general['nation']];
 
     if ($general['level'] == 12) {
@@ -154,6 +158,8 @@ for ($j=0; $j < $gencount; $j++) {
         $intel = "{$general['intel']}";
     }
 
+    
+
     if ($general['npc'] >= 2) {
         $name = "<font color=cyan>{$general['name']}</font>";
     } elseif ($general['npc'] == 1) {
@@ -162,6 +168,10 @@ for ($j=0; $j < $gencount; $j++) {
         $name =  "{$general['name']}";
     }
 
+    if(key_exists($general['owner'], $ownerNameList)){
+        $name = $name.'<br><small>('.$ownerNameList[$general['owner']].')</small>';
+    }
+
     $general['connect'] = Util::round($general['connect'] / 10) * 10;
 
     $imageTemp = GetImageURL($general['imgsvr']);

hwe/a_hallOfFame.php

@@ -92,12 +92,22 @@ $types = [
 
 $templates = new \League\Plates\Engine('templates');
 
+$ownerNameList = [];
+foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+    $ownerNameList[$ownerID] = $ownerName;
+}
+
 foreach($types as $idx=>[$typeName, $typeValue]) {
     $hallResult = $db->query('SELECT * FROM ng_hall WHERE `type`=%i AND %? ORDER BY `value` DESC LIMIT 10', $idx, $searchFilter);
 
-    $hallResult = array_map(function($general)use($typeValue){
+    $hallResult = array_map(function($general)use($typeValue, $ownerNameList){
         $aux = Json::decode($general['aux']);
         $general += $aux;
+
+        if(key_exists($general['owner'], $ownerNameList)){
+            $general['owner_name'] = $ownerNameList[$general['owner']];
+        }
+
         if(!key_exists('bgColor', $general)){
             if(!key_exists('color', $general)){
                 $general['bgColor'] = GameConst::$basecolor4;

hwe/a_history.php

@@ -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();

hwe/a_kingdomList.php

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

hwe/a_npcList.php

@@ -6,8 +6,6 @@ include "func.php";
 
 $type = Util::getReq('type', 'int', 1);
 
-extractMissingPostToGlobals();
-
 if($type <= 0 || $type > 8){
     $type = 1;
 }

hwe/b_auction.php

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

hwe/b_battleCenter.php

@@ -16,8 +16,6 @@ if ($type < 0 || $type > 3) {
     $type = 0;
 }
 
-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -35,7 +33,7 @@ $query = "select nation from general where no='$gen'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $general = MYDB_fetch_array($result);
 
-$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
+$query = "select no,nation,level,con,turntime,belong,permission,penalty from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
@@ -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();
 }
 
 //잘못된 접근
@@ -160,7 +161,7 @@ for ($i=0; $i < $gencount; $i++) {
             <?=getBatResRecent($gen, 24)?>
         </td>
     </tr>
-<?php if($npc > 1 || $meLevel >= 5): ?>
+<?php if($npc > 1 || $permission >= 2): ?>
     <tr>
         <td align=center id=bg1><font color=orange size=3>개인 기록</font></td>
         <td align=center id=bg1><font color=orange size=3>&nbsp;</font></td>

hwe/b_chiefboard.php

@@ -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>
-

hwe/b_chiefcenter.php

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

hwe/b_currentCity.php

@@ -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>

hwe/b_dipcenter.php

@@ -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, permission, penalty 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')?>
@@ -81,7 +85,6 @@ var editable = <?=($me['level']>=5?'true':'false')?>;
         <td width=80  align=center class=bg1>상태</td>
         <td width=60  align=center class=bg1>기간</td>
         <td width=100 align=center class=bg1>종 료 시 점</td>
-        <td align=center class=bg1>비 고</td>
     </tr>
 <?php
 $admin = $gameStor->getValues(['year','month']);
@@ -107,19 +110,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 +144,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 +161,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 +212,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 +225,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 +273,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>

hwe/b_genList.php

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

hwe/b_myBossInfo.php

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

hwe/b_myCityInfo.php

@@ -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>

hwe/b_myGenInfo.php

@@ -9,13 +9,12 @@ if($type <= 0 || $type > 15) {
     $type = 1;
 }
 
-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
 increaseRefresh("세력장수", 1);
@@ -31,6 +30,14 @@ if($me['level'] == 0) {
 
 $sel = [$type => "selected"];
 
+$ownerNameList = [];
+if($gameStor->isunited){
+    foreach(RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]){
+        $ownerNameList[$ownerID] = $ownerName;
+    }
+}
+
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -76,48 +83,26 @@ $sel = [$type => "selected"];
 <?php
 
 $nationLevel = DB::db()->queryFirstField('select level from nation where nation = %i', $me['nation']);
-$orderByText = '';//FIXME: 쿼리 재작성
-switch($type) {
-    case  1: $orderByText = " order by level desc"; break;
-    case  2: $orderByText = " order by dedication desc"; break;
-    case  3: $orderByText = " order by experience desc"; break;
-    case  4: $orderByText = " order by leader desc"; break;
-    case  5: $orderByText = " order by power desc"; break;
-    case  6: $orderByText = " order by intel desc"; break;
-    case  7: $orderByText = " order by gold desc"; break;
-    case  8: $orderByText = " order by rice desc"; break;
-    case  9: $orderByText = " order by crew desc"; break;
-    case 10: $orderByText = " order by connect desc"; break;
-    case 11: $orderByText = " order by personal"; break;
-    case 12: $orderByText = " order by special desc"; break;
-    case 13: $orderByText = " order by special2 desc"; break;
-    case 14: $orderByText = " order by belong desc"; break;
-    case 15: $orderByText = " order by npc desc"; break;
-}
-$query = 
-    "select 
-        npc,
-        special,
-        special2,
-        personal,
-        picture,
-        imgsvr,
-        name,
-        level,
-        dedication,
-        experience,
-        injury,
-        leader,
-        power,
-        intel,
-        gold,
-        rice,
-        belong,
-        connect,
-        killturn
-    from general where nation='{$me['nation']}' ".$orderByText;
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($genresult);
+
+[$orderKey, $orderDesc] = [
+    1=>['level', true],
+    2=>['dedication', true],
+    3=>['experience', true],
+    4=>['leader', true],
+    5=>['power', true],
+    6=>['intel', true],
+    7=>['gold', true],
+    8=>['rice', true],
+    9=>['crew', true],
+    10=>['connect', true],
+    11=>['personal', true],
+    12=>['special', true],
+    13=>['special2', true],
+    14=>['belong', true],
+    15=>['npc', true],
+][$type];
+
+$generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect,gold,rice,crew,belong from general where nation = %i order by %b %l', $me['nation'], $orderKey, $orderDesc?'desc':'');
 
 echo"
 <table align=center class='tb_layout bg0'>
@@ -138,8 +123,7 @@ echo"
         <td width=48 align=center id=bg1>사 관</td>
         <td width=70 align=center id=bg1>벌점</td>
     </tr>";
-for($j=0; $j < $gencount; $j++) {
-    $general = MYDB_fetch_array($genresult);
+foreach($generalList as $general){
 
     if($general['level'] == 12) {
         $lbonus = $nationLevel * 2;
@@ -171,6 +155,10 @@ for($j=0; $j < $gencount; $j++) {
     elseif($general['npc'] == 1) { $name = "<font color=skyblue>{$general['name']}</font>"; }
     else { $name =  "{$general['name']}"; }
 
+    if(key_exists($general['owner'], $ownerNameList)){
+        $name = $name.'<br><small>('.$ownerNameList[$general['owner']].')</small>';
+    }
+
     $imageTemp = GetImageURL($general['imgsvr']);
     echo "
     <tr>

hwe/b_myKingdomInfo.php

@@ -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>

hwe/b_myPage.php

@@ -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;
 }
@@ -30,7 +28,7 @@ $connect=$db->get();
 
 increaseRefresh("내정보", 1);
 
-$query = "select no,npc,mode,tnmt,myset from general where owner='{$userID}'";
+$query = "select no,npc,mode,tnmt,myset,train,atmos from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $me = MYDB_fetch_array($result);
 
@@ -48,13 +46,30 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
         $submit = 'hidden';
     }
 
-    $me['myset'] -= 1;
+    if($mode == 0){
+        $db->update('general', [
+            'myset'=>$db->sqleval('myset-1'),
+            'mode'=>$mode,
+            'train'=>max(0, $me['train'] - 3),
+            'atmos'=>max(0, $me['atmos'] - 3),
+        ], 'owner=%i AND mode!=%i', $userID, $mode);
+    }
+    else{
+        $db->update('general', [
+            'myset'=>$db->sqleval('myset-1'),
+            'mode'=>$mode
+        ], 'owner=%i AND mode!=%i', $userID, $mode);
+    }
 
-    $db->update('general', [
-        'myset'=>$db->sqleval('myset-1'),
-        'mode'=>$mode,
-        'tnmt'=>$tnmt
-    ], 'owner=%i', $userID);
+    if($db->affectedRows()){
+        $me['myset'] -= 1;
+    }
+
+    if($me['tnmt'] != $tnmt){
+        $db->update('general', [
+            'tnmt'=>$tnmt
+        ], 'owner=%i', $userID);
+    }
 
     $me['mode'] = $mode;
     $me['tnmt'] = $tnmt;

hwe/b_nationboard.php

@@ -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>
-

hwe/b_nationrule.php

@@ -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>
-

hwe/battle_simulator.php

@@ -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>

hwe/c_auction.php

@@ -27,7 +27,6 @@ $sel = Util::getReq('sel', 'int');
 $msg = '';
 $msg2 = '';
 
-extractMissingPostToGlobals();
 
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();

hwe/c_chiefboard.php

@@ -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');

hwe/c_dipcenter.php

@@ -12,18 +12,21 @@ $rate = Util::getReq('rate', 'int');
 $bill = Util::getReq('bill', 'int');
 $secretlimit = Util::getReq('secretlimit', 'int');
 
-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
 
-$me = $db->queryFirstRow('SELECT `no`,nation,`level` FROM general WHERE `owner`=%i', $userID);
+$me = $db->queryFirstRow('SELECT `no`,nation,`level`,permission,penalty FROM general WHERE `owner`=%i', $userID);
 
 //내가 수뇌부이어야함
-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

hwe/c_double.php

@@ -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++) {

hwe/c_myBossInfo.php

@@ -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,belong from general where no='$outlist'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
 
@@ -76,6 +74,13 @@ if($btn == "임명") {
         exit();
     }
 
+    //추방할사람이 외교권자이면 불가
+    $permission = checkSecretPermission($general);
+    if($permission == 4){
+        header('location:b_myBossInfo.php');
+        exit();
+    }
+
     //NPC 부대장 추방 불가
     if($general['npc'] == 5){
         header('location:b_myBossInfo.php');
@@ -145,18 +150,21 @@ if($btn == "추방") {
                     'level'=>0,
                     'nation'=>0,
                     'belong'=>0,
+                    'permission'=>'normal',
                 ], 'no=%i', $general['no']);
             }
             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']);
             }
         }
@@ -302,27 +310,29 @@ if($btn == "임명" && $level >= 5 && $level <= 11) {
 
 if($btn == "임명" && $level >= 2 && $level <= 4 && $citylist > 0) {
     switch($level) {
-    case 4: $lv = 1; break;
-    case 3: $lv = 2; break;
-    case 2: $lv = 3; break;
+    case 4: $genlv = 'gen1'; $genlvset = 'gen1set'; break;
+    case 3: $genlv = 'gen2'; $genlvset = 'gen2set'; break;
+    case 2: $genlv = 'gen3'; $genlvset = 'gen3set'; break;
     }
 
-    $query = "select gen{$lv} from city where nation='{$me['nation']}' and city='$citylist'";
+    $query = "select {$genlv} from city where nation='{$me['nation']}' and city='$citylist'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $city = MYDB_fetch_array($result);
     if(!$city){
         header('location:b_myBossInfo.php');
         die();
     }
-    $oldlist = $city["gen{$lv}"];
+    $oldlist = $city[$genlv];
 
     if($oldlist != 0) {
         //기존 장수 일반으로
-        $query = "update general set level=1 where no='$oldlist'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('general', [
+            'level'=>1
+        ], 'no=%i', $oldlist);
         //기존 자리 공석으로
-        $query = "update city set gen{$lv}=0 where city='$citylist'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('city', [
+            $genlv=>0
+        ], 'city = %i AND nation = %i', $citylist , $me['nation']);
     }
     if($genlist != 0) {
         $valid = 0;
@@ -334,17 +344,26 @@ if($btn == "임명" && $level >= 2 && $level <= 4 && $citylist > 0) {
 
         if($valid == 1) {
             // 신임 장수의 원래 자리 해제
-            $query = "update city set gen1=0 where gen1='$genlist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update city set gen2=0 where gen2='$genlist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update city set gen3=0 where gen3='$genlist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $db->update('city', [
+                'gen1'=>0,
+            ], 'gen1=%i', $genlist);
+            $db->update('city', [
+                'gen2'=>0,
+            ], 'gen2=%i', $genlist);
+            $db->update('city', [
+                'gen3'=>0,
+            ], 'gen3=%i', $genlist);
+
             //신임 장수
-            $query = "update general set level='$level' where no='$genlist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update city set gen{$lv}='$genlist',gen{$lv}set='1' where city='$citylist'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $db->update('city', [
+                $genlv=>$genlist,
+                $genlvset=>1
+            ], 'city=%i AND nation=%i', $citylist, $general['nation']);
+            if($db->affectedRows() > 0){
+                $db->update('general',[
+                    'level'=>$level
+                ], 'no=%i', $genlist);
+            }
         }
     }
     header('location:b_myBossInfo.php');

hwe/c_nationboard.php

@@ -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');

hwe/c_nationrule.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');

hwe/c_tournament.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();

hwe/c_troop.php

@@ -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();

hwe/c_vacation.php

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

hwe/c_vote.php

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

hwe/commandlist.php

@@ -111,7 +111,7 @@ function myCommandList() {
         echo "
     <tr height=28>
         <td width=24 align=center height=24 id=bg0><b>$j</b></td>
-        <td width=71 align=center height=24 id=bg1 style='overflow:hidden;'><b>{$year}年 {$month}月</b></td>
+        <td width=71 align=center height=24 id=bg1 style='max-width:68px;white-space:nowrap;overflow:hidden;'><b>{$year}年 {$month}月</b></td>
         <td width=42 align=center bgcolor=black><b>$turndate</b></td>
         <td width=150 align=center height=24 style=table-layout:fixed;>$turn[$i]</td>
     </tr>";

hwe/css/board.css

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

hwe/css/common.css

@@ -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;
+}

hwe/css/diplomacy.css

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

hwe/css/main.css

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

hwe/css/map.css

@@ -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;
@@ -55,6 +61,7 @@
     position:absolute;
     right:0;
     bottom:0;
+    text-align:right;
 }
 
 .map_body .map_toggle_cityname::after{
@@ -65,6 +72,18 @@
     content: "켜기"
 }
 
+.map_body .map_toggle_single_tap{
+    display:none;
+}
+
+.map_body .map_toggle_single_tap::after{
+    content: "끄기"
+}
+
+.map_body .map_toggle_single_tap.active::after{
+    content: "켜기"
+}
+
 .world_map .city_tooltip{
     position: absolute;
     z-index:6;

hwe/css/msg.css

@@ -59,12 +59,16 @@
     height:667px;
 }
 
-.private_message{
-    height:667px;
+.diplomacy_message{
+    flex: 1;
 }
 
 .national_message{
-    height:1350px;
+    height:667px;
+}
+
+.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{

hwe/func.php

@@ -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,25 +399,89 @@ function myNationInfo() {
 ";
 }
 
+function checkSecretMaxPermission($me){
+    $secretMax = 4;
+    if($penalty['noTopSecret']??false){
+        $secretMax = 1;
+    }
+    else if($penalty['noChief']??false){
+        $secretMax = 1;
+    }
+    else if($penalty['noAmbassador']??false){
+        $secretMax = 2;
+    }
+    return $secretMax;
+}
+
+function checkSecretPermission($me, $checkSecretLimit=true){
+    if(!key_exists('penalty', $me) || !key_exists('permission', $me)){
+        trigger_error ('canAccessSecret() 함수에 필요한 인자가 부족');
+    }
+    $penalty = Json::decode($me['penalty'])??[];
+    $permission = $me['permission'];
+
+    if(!$me['nation']){
+        return -1;
+    }
+
+    if($me['level'] == 0){
+        return -1;
+    }
+    
+
+    if($pernalty['noSecret']??false){
+        return 0;
+    }
+
+    $secretMin = 0;
+    $secretMax = checkSecretMaxPermission($me);
+    
+
+    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($checkSecretLimit){
+        $db = DB::db();
+        $secretLimit = $db->queryFirstField('SELECT secretlimit FROM nation WHERE nation = %i', $me['nation']);
+        if ($me['belong'] >= $secretLimit) {
+            $secretMin = 1;
+        }
+    }
+
+    return min($secretMin, $secretMax);
+}
+
 function addCommand($typename, $value, $valid = 1, $color=0) {
     if($valid == 1) {
         switch($color) {
             case 0:
                 echo "
-    <option style=color:white;background-color:black; value={$value}>{$typename}</option>";
+    <option style='color:white;background-color:black;' value='{$value}'>{$typename}</option>";
                 break;
             case 1:
                 echo "
-    <option style=color:skyblue;background-color:black; value={$value}>{$typename}</option>";
+    <option style='color:skyblue;background-color:black;' value='{$value}'>{$typename}</option>";
                 break;
             case 2:
                 echo "
-    <option style=color:orange;background-color:black; value={$value}>{$typename}</option>";
+    <option style='color:orange;background-color:black;' value='{$value}'>{$typename}</option>";
                 break;
         }
     } else {
         echo "
-    <option style=color:white;background-color:red; value={$value}>{$typename}(불가)</option>";
+    <option style='color:white;background-color:red;' value='{$value}'>{$typename}(불가)</option>";
     }
 }
 
@@ -437,7 +501,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 +557,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 +583,7 @@ function commandTable() {
         addCommand("물자조달(랜덤경험)", 9, 0);
     }
     commandGroup("", 1);
-    commandGroup("========= 군 사 ==========");
+    commandGroup("======= 군 사 ========");
     if($me['level'] >= 1 && $citycount > 0) {
         addCommand("첩보(통솔경험, 자금$develcost3, 군량$develcost3)", 31);
         addCommand("징병(통솔경험)", 11);
@@ -544,7 +608,7 @@ function commandTable() {
     }
 
     commandGroup("", 1);
-    commandGroup("========= 인 사 ==========");
+    commandGroup("======= 인 사 ========");
     addCommand("이동(통솔경험, 자금$develcost, 사기↓)", 21);
     addCommand("강행(통솔경험, 자금$develcost5, 병력/사기/훈련↓)", 30);
     
@@ -554,7 +618,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 +643,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 +656,7 @@ function commandTable() {
         addCommand("선동(통솔경험, 자금$develcost5, 군량$develcost5)", 35, 0);
     }
     commandGroup("", 1);
-    commandGroup("========= 개 인 ==========");
+    commandGroup("======= 개 인 ========");
     if($me['level'] >= 1) {
         addCommand("단련(자금$develcost, 군량$develcost)", 41);
     } else {
@@ -843,8 +910,8 @@ function generalInfo($no) {
 
     if($nation['color'] == "") { $nation['color'] = "#000000"; }
 
-    if($general['age'] < 60)     { $general['age'] = "<font color=limegreen>{$general['age']} 세</font>"; }
-    elseif($general['age'] < 80) { $general['age'] = "<font color=yellow>{$general['age']} 세</font>"; }
+    if($general['age'] < GameConst::$retirementYear*0.75)     { $general['age'] = "<font color=limegreen>{$general['age']} 세</font>"; }
+    elseif($general['age'] < GameConst::$retirementYear) { $general['age'] = "<font color=yellow>{$general['age']} 세</font>"; }
     else                  { $general['age'] = "<font color=red>{$general['age']} 세</font>"; }
 
     $general['connect'] = Util::round($general['connect'] / 10) * 10;
@@ -1125,59 +1192,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(
@@ -1428,10 +1442,10 @@ function checkDelay() {
         $threshold = 1;
     }
     else if($term >= 10){
-        $threshold = 2;
+        $threshold = 3;
     }
     else{
-        $threshold = 3;
+        $threshold = 6;
     }
     //지연 해야할 밀린 턴 횟수
     $iter = intdiv($timeMinDiff, $term);
@@ -1939,6 +1953,7 @@ function updateTurntime($no) {
                 'npc'=>$general['npc_org'],
                 'killturn'=>$general['killturn'],
                 'mode'=>2,
+                'permission'=>'normal',
                 'name2'=>null
             ], 'no=%i',$no);
 
@@ -1954,7 +1969,7 @@ function updateTurntime($no) {
                 nextRuler($general);
             }
 
-            //도시의 태수, 군사, 시중직도 초기화
+            //도시의 태수, 군사, 종사직도 초기화
             $query = "update city set gen1='0' where gen1='{$general['no']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
             $query = "update city set gen2='0' where gen2='{$general['no']}'";
@@ -2063,7 +2078,7 @@ function updateTurntime($no) {
         }
     }
 
-    if($general['age'] >= 80 && $general['npc'] == 0) {
+    if($general['age'] >= GameConst::$retirementYear && $general['npc'] == 0) {
         if($admin['isunited'] == 0) {
             CheckHall($no);
         }
@@ -2136,6 +2151,11 @@ function CheckHall($no) {
 
     [$scenarioIdx, $scenarioName, $startTime] = $gameStor->getValuesAsArray(['scenario', 'scenario_text', 'starttime']);
 
+    $ownerName = $general['name2'];
+    if($general['owner']){
+        $ownerName = RootDB::db()->queryFirstField('SELECT name FROM member WHERE no = %i', $general['owner']);
+    }
+
     foreach($types as $idx=>$typeName) {
         
 
@@ -2165,7 +2185,7 @@ function CheckHall($no) {
             'imgsvr'=>$general['imgsvr'],
             'startTime'=>$startTime,
             'unitedTime'=>$unitedDate,
-            'owner_name'=>$general['name2'],
+            'owner_name'=>$ownerName,
             'serverID'=>UniqueConst::$serverID,
             'serverIdx'=>$serverCnt,
             'serverName'=>UniqueConst::$serverName,
@@ -2173,7 +2193,7 @@ function CheckHall($no) {
         ];
         $jsonAux = Json::encode($aux);
 
-        $db->insertUpdate('ng_hall', [
+        $db->insertIgnore('ng_hall', [
             'server_id'=>UniqueConst::$serverID,
             'scenario'=>$scenarioIdx,
             'general_no'=>$no,
@@ -2181,10 +2201,21 @@ function CheckHall($no) {
             'value'=>$general[$typeName]??0,
             'owner'=>$general['owner']??null,
             'aux'=>$jsonAux
-        ],[
-            'value'=>$general[$typeName]??0,
-            'aux'=>$jsonAux
         ]);
+
+        if($db->affectedRows() == 0){
+            $db->update('ng_hall', [
+                'value'=>$general[$typeName]??0,
+                'aux'=>$jsonAux
+            ], 
+            'server_id = %s AND scenario = %i AND general_no = %i AND type = %i AND value < %d', 
+            UniqueConst::$serverID,
+            $scenarioIdx,
+            $no,
+            $idx,
+            $general[$typeName]??0);
+        }
+        
     }
 }
 
@@ -2545,7 +2576,7 @@ function deleteNation($general) {
     $oldNation['aux'] = Json::decode($oldNation['aux']);
 
     // 전 장수 재야로    // 전 장수 소속 무소속으로
-    $query = "update general set belong=0,troop=0,level=0,nation=0,makelimit=12 where nation='{$general['nation']}'";
+    $query = "update general set belong=0,troop=0,level=0,nation=0,permission='normal',makelimit=12 where nation='{$general['nation']}'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     // 도시 공백지로
     $query = "update city set nation=0,front=0,gen1=0,gen2=0,gen3=0 where nation='{$general['nation']}'";

hwe/func_command.php

@@ -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] = "집합";
@@ -471,9 +478,7 @@ function processCommand($no) {
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
-    $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar from general where no='$no'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
+    $general = $db->queryFirstRow('SELECT npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar,myset from general where no = %i', $no);
     
     list($month, $killturn) = $gameStor->getValuesAsArray(['month', 'killturn']);
     $log = [];
@@ -533,23 +538,30 @@ function processCommand($no) {
             }
 
             //장수정보 재로드
-            $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar from general where no='$no'";
+            $query = "select npc,no,name,picture,imgsvr,nation,nations,city,troop,injury,affinity,leader,leader2,power,power2,intel,intel2,experience,dedication,level,gold,rice,crew,crewtype,train,atmos,weap,book,horse,item,turntime,makenation,makelimit,killturn,block,dedlevel,explevel,age,belong,personal,special,special2,term,turn0,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar,myset from general where no='$no'";
             $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
             $general = MYDB_fetch_array($result);
         }
 
         $command = DecodeCommand($general['turn0']);
+        $newKillturn = $killturn;
         //삭턴 처리
         if($general['npc'] >= 2 || $general['killturn'] > $killturn) {
-            $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $newKillturn = $general['killturn'] - 1;
         } elseif($command[0] == 0) {
-            $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $newKillturn = $general['killturn'] - 1;
         } else {
-            $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn='{$killturn}' where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $newKillturn = $killturn;
         }
+
+        $newMySet = min($general['myset'] + 1, 3);
+        $db->update('general', [
+            'recturn'=>$db->sqleval('turn0'),
+            'resturn'=>'FAIL',
+            'con'=>0,
+            'killturn'=>$newKillturn,
+            'myset'=>$newMySet
+        ], 'no = %i', $general['no']);
         //FIXME: 운영자 같이 사망하면 안되는 인물에 대한 처리가 필요
 
         //연속턴 아닌경우 텀 리셋

hwe/func_converter.php

@@ -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'],
@@ -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;
@@ -453,36 +453,32 @@ function getTechCall($tech) : string {
 function getDexLevelList(): array{
     return [
         [0, 'navy', 'F-'],
-        [2500, 'navy', 'F'],
-        [7500, 'navy', 'F+'],
-        [15000, 'skyblue', 'E-'],
-        [25000, 'skyblue', 'E'],
-        [37500, 'skyblue', 'E+'],
-        [52500, 'seagreen', 'D-'],
-        [70000, 'seagreen', 'D'],
-        [90000, 'seagreen', 'D+'],
-        [112500, 'teal', 'C-'],
-        [137500, 'teal', 'C'],
-        [165000, 'teal', 'C+'],
-        [195000, 'limegreen', 'B-'],
-        [227500, 'limegreen', 'B'],
-        [262500, 'limegreen', 'B+'],
-        [300000, 'gold', 'A-'],
-        [340000, 'gold', 'A'],
-        [382500, 'gold', 'A+'],
-        [427500, 'darkorange', 'S-'],
-        [475000, 'darkorange', 'S'],
-        [525000, 'darkorange', 'S+'],
-        [577500, 'tomato', 'SS-'],
-        [632500, 'tomato', 'SS'],
-        [690000, 'tomato', 'SS+'],
-        [750000, 'red', 'SSS-'],
-        [812500, 'red', 'SSS'],
-        [877500, 'red', 'SSS+'],
-        [945000, 'darkviolet', 'Z-'],
-        [1015000, 'darkviolet', 'Z'],
-        [1087500, 'darkviolet', 'Z+'],
-        [1162500, 'white', '?']
+        [350, 'navy', 'F'],
+        [1375, 'navy', 'F+'],
+        [3500, 'skyblue', 'E-'],
+        [7125, 'skyblue', 'E'],
+        [12650, 'skyblue', 'E+'],
+        [20475, 'seagreen', 'D-'],
+        [31000, 'seagreen', 'D'],
+        [44625, 'seagreen', 'D+'],
+        [61750, 'teal', 'C-'],
+        [82775, 'teal', 'C'],
+        [108100, 'teal', 'C+'],
+        [138125, 'limegreen', 'B-'],
+        [173250, 'limegreen', 'B'],
+        [213875, 'limegreen', 'B+'],
+        [260400, 'darkorange', 'A-'],
+        [313225, 'darkorange', 'A'],
+        [372750, 'darkorange', 'A+'],
+        [439375, 'tomato', 'S-'],
+        [513500, 'tomato', 'S'],
+        [595525, 'tomato', 'S+'],
+        [685850, 'darkviolet', 'Z-'],
+        [784875, 'darkviolet', 'Z'],
+        [893000, 'darkviolet', 'Z+'],
+        [1010625, 'gold', 'EX-'],
+        [1138150, 'gold', 'EX'],
+        [1275975, 'white', 'EX+'],
     ];
 }
 
@@ -520,7 +516,7 @@ function getDexLevel(int $dex) : int {
 }
 
 function getDexLog($dex1, $dex2) {
-    $ratio = (getDexLevel($dex1) - getDexLevel($dex2)) / 50 + 1;
+    $ratio = (getDexLevel($dex1) - getDexLevel($dex2)) / 55 + 1;
     return $ratio;
 }
 

hwe/func_gamerule.php

@@ -774,6 +774,11 @@ function checkMerge() {
             'data'=>Json::encode($oldNation)
         ]);
 
+        $db->update('general', [
+            'nation'=>0,
+            'permission'=>'normal',
+        ], '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),"");
         // 아국 모든 도시들 상대국 소속으로
@@ -916,6 +921,11 @@ function checkSurrender() {
             'data'=>Json::encode($oldNation)
         ]);
 
+        $db->update('general', [
+            'nation'=>0,
+            'permission'=>'normal',
+        ], '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),"");
         // 군주가 있는 위치 구함
@@ -976,10 +986,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) {
@@ -1051,11 +1057,6 @@ function updateNationState() {
                     ]);
                     $troopID = $db->insertId();
 
-                    $db->update('nation', [
-                        'gennum'=>$nation['gennum']+1,
-                        'totaltech'=>Util::valueFit($nation['gennum']+1, GameConst::$initialNationGenLimit) * $nation['tech'],
-                    ], 'nation=%i', $nation['nation']);
-
                     $command = EncodeCommand(0, 0, 0, 26); //집합
                     $db->update('general', [
                         'troop'=>$troopID,
@@ -1078,10 +1079,13 @@ function updateNationState() {
 
             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']);

hwe/func_message.php

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

hwe/func_npc.php

@@ -204,6 +204,21 @@ function processAI($no) {
                 'killturn'=>1
             ], 'no=%i', $general['no']);
         }
+        else if($general['level'] == 12){
+            $newRuler = $db->queryFirstField('SELECT `no` FROM general WHERE nation = %i AND no != %i ORDER BY RAND() LIMIT 1', $general['nation'], $general['no']);
+            if($newRuler){
+                $command = EncodeCommand(0, 0, $newRuler, 54); //선양
+                $db->update('general', [
+                    'turn0'=>$command,
+                    'turn1'=>$command,
+                    'turn2'=>$command,
+                    'turn3'=>$command,
+                    'turn4'=>$command,
+                    'killturn'=>rand(70,75),
+                ], 'no=%i', $general['no']);
+            }
+            
+        }
         else{
             $command = EncodeCommand(0, 0, 0, 26); //집합
             $db->update('general', [
@@ -437,12 +452,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']);
         }
 
@@ -1338,7 +1353,7 @@ function NPCStaffWork($general, $nation, $dipState){
     return Util::choiceRandomUsingWeight($commandList);
 }
 
-//종전하기, 지급율
+//종전하기, 지급률
 //$command = $fourth * 100000000 + $type * 100000 + $crew * 100 + 11;
 
 function Promotion($nation, $level) {
@@ -1416,6 +1431,10 @@ function Promotion($nation, $level) {
         $query = "update general set level={$i2} where no='{$level['no']}'";
         MYDB_query($query, $connect) or Error("Promotion_02 ".MYDB_error($connect),"");
     }
+
+    $db->update('general', [
+        'permission'=>'ambassador',
+    ], 'nation=%i AND npc < 2 AND level > 4', $nation);
 }
 
 function TaxRate($nation) {

hwe/func_process.php

@@ -369,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 = max(GameConst::$initialNationGenLimit, $gencount);
+            $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'];
 
@@ -437,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();
@@ -637,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();
@@ -1910,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:
@@ -1925,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:
@@ -1945,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:
@@ -2011,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:

hwe/func_process_chief.php

@@ -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</>"]);
 }
 
@@ -1981,31 +1968,36 @@ function process_76(&$general) {
         $avgNation = MYDB_fetch_array($result);
         $gencount = 5 + Util::round($avgNation['gennum'] / 10);
 
-        $query = "select avg(age) as age, max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0) as dex0, avg(dex10) as dex10, avg(dex20) as dex20, avg(dex30) as dex30, avg(dex40) as dex40 from general where nation='{$general['nation']}'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $avgGen = MYDB_fetch_array($result);
+        $avgGen = $db->queryFirstRow('SELECT max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0+dex10+dex20+dex30) / 4 as dex_t, avg(age) as age, avg(dex40) as dex40 from general where npc < 5 and nation = %i', $general['nation']);
 
         //의병추가
         $npc = 4;
         $npcid = $admin['npccount'];
         for($i=0; $i < $gencount; $i++) {
-            // 무장 40%, 지장 40%, 무지장 20%
-            $type = rand() % 10;
-            switch($type) {
-            case 0: case 1: case 2: case 3:
-                $leader = GameConst::$defaultStatMax - 10 + rand()%11;
-                $intel = GameConst::$defaultStatMin + rand()%6;
-                $power = GameConst::$defaultStatTotal - $leader - $intel;
+            //무장 50%, 지장 50%, 무지장 0%
+            $stat_tier1 = GameConst::$defaultStatMax - 10 + rand()%11;
+            $stat_tier3 = GameConst::$defaultStatMin + rand()%6;
+            $stat_tier2 = GameConst::$defaultStatTotal - $stat_tier1 - $stat_tier3;
+            $type = Util::choiceRandomUsingWeight([
+                'power'=>5,
+                'intel'=>5,
+                'neutral'=>0
+            ]);
+            switch($type){
+            case 'power':
+                $leader = $stat_tier1;
+                $power = $stat_tier2;
+                $intel = $stat_tier3;
                 break;
-            case 4: case 5: case 6: case 7:
-                $leader = GameConst::$defaultStatMax - 10 + rand()%11;
-                $power = GameConst::$defaultStatMin + rand()%6;
-                $intel = GameConst::$defaultStatTotal - $leader - $power;
+            case 'intel':
+                $leader = $stat_tier1;
+                $power = $stat_tier3;
+                $intel = $stat_tier2;
                 break;
-            case 8: case 9:
-                $leader = GameConst::$defaultStatMin + rand()%6;
-                $power = GameConst::$defaultStatMax - 10 + rand()%11;
-                $intel = GameConst::$defaultStatTotal - $leader - $power;
+            case 'neutral':
+                $leader = $stat_tier3;
+                $power = $stat_tier1;
+                $intel = $stat_tier2;
                 break;
             }
             // 국내 최고능치 기준으로 랜덤성 스케일링
@@ -2039,7 +2031,7 @@ function process_76(&$general) {
                 $intel -= $over3;
             }
             // 낮은 능치쪽으로 합산
-            if($type == 0) {
+            if($type == 'power') {
                 $intel = $intel + $over1 + $over2 + $over3;
             } else {
                 $power = $power + $over1 + $over2 + $over3;
@@ -2079,7 +2071,7 @@ function process_76(&$general) {
                     '1','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0',
                     '0','0','0','$turntime','$killturn','{$avgGen['age']}','1','$personal','0','0','0','0','',
                     '0','$bornyear','$deadyear',
-                    '{$avgGen['dex0']}','{$avgGen['dex10']}','{$avgGen['dex20']}','{$avgGen['dex30']}','{$avgGen['dex40']}'
+                    '{$avgGen['dex_t']}','{$avgGen['dex_t']}','{$avgGen['dex_t']}','{$avgGen['dex_t']}','{$avgGen['dex40']}'
                 )",
                 $connect
             ) or Error(__LINE__.MYDB_error($connect),"");

hwe/func_process_personnel.php

@@ -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',
@@ -124,12 +131,30 @@ function process_25(&$general) {
             $generals[$nation] = $cnt;
         }
 
+        foreach($db->queryAllLists('SELECT count(no), nation FROM general WHERE 3 <= npc and npc <= 4 AND nation > 0 GROUP BY nation') as list($cnt, $nation)){
+            //의병, 인탐장은 1/3로 카운트
+            if(key_exists($nation, $generals)){
+                $generals[$nation] += $cnt / 3;
+            }
+            else{
+                $generals[$nation] = $cnt / 3;
+            }
+        }
+
         $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 +166,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 +192,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) {
@@ -216,6 +253,7 @@ function process_25(&$general) {
             'nation'=>$nation['nation'],
             'nations'=>Json::encode($joinedNations),
             'level'=>1,
+            'permission'=>'normal',
             'experience'=>$db->sqleval('experience + %i', $exp),
             'city'=>$king['city'],
             'belong'=>1
@@ -252,7 +290,7 @@ function process_29(&$general) {
     $history = [];
     $date = substr($general['turntime'],11,5);
 
-    $admin = $gameStor->getValues(['startyear','year','month','develcost','npccount','turnterm','scenario']);
+    $admin = $gameStor->getValues(['startyear','year','month','develcost','npccount','turnterm','scenario','maxgeneral']);
 
     $query = "select nation,name,level,gennum,scout from nation where nation='{$general['nation']}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -263,30 +301,39 @@ function process_29(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:재야입니다. 인재탐색 실패. <1>$date</>";
     } elseif($nation['level'] <= 0) {
         $log[] = "<C>●</>{$admin['month']}월:방랑군입니다. 인재탐색 실패. <1>$date</>";
-    } elseif($admin['year'] < $admin['startyear']+3 && $nation['gennum'] >= GameConst::$initialNationGenLimit) {
-        $log[] = "<C>●</>{$admin['month']}월:현재 <D>{$nation['name']}</>{$josaUn} 탐색이 제한되고 있습니다. 인재탐색 실패.";
     } elseif($general['gold'] < $admin['develcost']) {
         $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. 인재탐색 실패. <1>$date</>";
     } else {
-        $query = "select no from general where nation='{$general['nation']}' and npc<2";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $gencount = MYDB_num_rows($result);
 
-        $query = "select no from general where nation='{$general['nation']}' and npc=3";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $npccount = MYDB_num_rows($result);
+        $max_gen_cnt = $admin['maxgeneral'];
 
-        $query = "select no from general where nation!='{$general['nation']}' and npc=3";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $otherNpccount = MYDB_num_rows($result);
-        $otherNpccount = Util::round(sqrt($otherNpccount + 1)) - 1;
-        
-        if($gencount <= 0) { $gencount = 1; }
-        if($npccount <= 0) { $npccount = 1; }
-        $criteria = $gencount * $npccount + $otherNpccount;
+        $total_gen_cnt = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc <= 2');
+        $total_npc_cnt = $db->queryFirstField('SELECT count(`no`) FROM general WHERE 3 <= npc AND npc <= 4');
+
+        $gen_cnt = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc <= 2 AND nation = %i', $general['nation']);
+        $npc_cnt = $db->queryFirstField('SELECT count(`no`) FROM general WHERE 3 <= npc AND npc <= 4 AND nation = %i', $general['nation']);
+
+        $nation_cnt = $db->queryFirstField('SELECT count(`nation`) FROM nation WHERE `level` > 0');
+
+        $curr_cnt = Util::toInt($total_gen_cnt + $total_npc_cnt / 2);
+        $remain_slot = $max_gen_cnt - $curr_cnt;
+
+        $avg_cnt = $curr_cnt / $nation_cnt;
+
+        $found_prop_main = pow($remain_slot / $max_gen_cnt, 6);
+        $found_prop_small = 1 / ($total_npc_cnt / 3 + 1);
+        $found_prop_big = 1 / $max_gen_cnt;
+
+        if($total_npc_cnt < 50){
+            $found_prop = max($found_prop_main, $found_prop_small);
+        }
+        else{
+            $found_prop = max($found_prop_main, $found_prop_big);
+        }
+        $found_npc = Util::randBool($found_prop);
 
         // 탐색 실패
-        if(rand() % $criteria > 0) {
+        if(!$found_npc) {
             $exp = 100;
             $ded = 70;
             switch(Util::choiceRandomUsingWeight([$general['leader'], $general['power'], $general['intel']])) {
@@ -316,7 +363,17 @@ function process_29(&$general) {
                 $name = "{$name}{$count}";
             }
 
-            if($nation['scout'] != 0) {
+            $join_prop = 0.55 * $avg_cnt / ($gen_cnt + $npc_cnt / 2);
+
+            $no_scout = false;
+            if($nation['scout'] != 0){
+                $no_scout = true;
+            }
+            else if($admin['year'] < $admin['startyear']+3 && $nation['gennum'] >= GameConst::$initialNationGenLimit){
+                $no_scout = true;
+            }
+
+            if($no_scout || !Util::randBool($join_prop)) {
                 $scoutType = "발견";
                 $scoutLevel = 0;
                 $scoutNation = 0;
@@ -332,50 +389,35 @@ function process_29(&$general) {
             $alllog[] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <Y>$name</>{$josaRa}는 <C>인재</>를 {$scoutType}하였습니다!";
             pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y>$name</>{$josaRa}는 <C>인재</>를 {$scoutType}");
 
-            $query = "select max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0) as dex0, avg(dex10) as dex10, avg(dex20) as dex20, avg(dex30) as dex30, avg(dex40) as dex40 from general where nation='{$general['nation']}'";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $avgGen = MYDB_fetch_array($result);
+            $avgGen = $db->queryFirstRow('SELECT max(leader+power+intel) as lpi, avg(dedication) as ded,avg(experience) as exp, avg(dex0+dex10+dex20+dex30) / 4 as dex_t, avg(dex40) as dex40 from general where npc < 5 and nation = %i', $general['nation']);
 
-            // 체섭시 무장 20%, 지장 20%, 무지장 60%
-            // 마이너 무장 40%, 지장 40%, 무지장 20%
-            $type = rand() % 10;
-            if($admin['scenario'] < 100) {
-                switch($type) {
-                case 0: case 1:
-                    $leader = GameConst::$defaultStatMax - 10 + rand()%11;
-                    $intel = GameConst::$defaultStatMin + rand()%6;
-                    $power = GameConst::$defaultStatTotal - $leader - $intel;
-                    break;
-                case 2: case 3:
-                    $leader = GameConst::$defaultStatMax - 10 + rand()%11;
-                    $power = GameConst::$defaultStatMin + rand()%6;
-                    $intel = GameConst::$defaultStatTotal - $leader - $power;
-                    break;
-                case 4: case 5: case 6: case 7: case 8: case 9:
-                    $leader = GameConst::$defaultStatMin + rand()%6;
-                    $power = GameConst::$defaultStatMax - 10 + rand()%11;
-                    $intel = GameConst::$defaultStatTotal - $leader - $power;
-                    break;
-                }
-            } else {
-                switch($type) {
-                case 0: case 1: case 2: case 3:
-                    $leader = GameConst::$defaultStatMax - 10 + rand()%11;
-                    $intel = GameConst::$defaultStatMin + rand()%6;
-                    $power = GameConst::$defaultStatTotal - $leader - $intel;
-                    break;
-                case 4: case 5: case 6: case 7:
-                    $leader = GameConst::$defaultStatMax - 10 + rand()%11;
-                    $power = GameConst::$defaultStatMin + rand()%6;
-                    $intel = GameConst::$defaultStatTotal - $leader - $power;
-                    break;
-                case 8: case 9:
-                    $leader = GameConst::$defaultStatMin + rand()%6;
-                    $power = GameConst::$defaultStatMax - 10 + rand()%11;
-                    $intel = GameConst::$defaultStatTotal - $leader - $power;
-                    break;
-                }
+            //무장 40%, 지장 40%, 무지장 20%
+            $stat_tier1 = GameConst::$defaultStatMax - 10 + rand()%11;
+            $stat_tier3 = GameConst::$defaultStatMin + rand()%6;
+            $stat_tier2 = GameConst::$defaultStatTotal - $stat_tier1 - $stat_tier3;
+            $type = Util::choiceRandomUsingWeight([
+                'power'=>4,
+                'intel'=>4,
+                'neutral'=>2
+            ]);
+            switch($type){
+            case 'power':
+                $leader = $stat_tier1;
+                $power = $stat_tier2;
+                $intel = $stat_tier3;
+                break;
+            case 'intel':
+                $leader = $stat_tier1;
+                $power = $stat_tier3;
+                $intel = $stat_tier2;
+                break;
+            case 'neutral':
+                $leader = $stat_tier3;
+                $power = $stat_tier1;
+                $intel = $stat_tier2;
+                break;
             }
+
             // 국내 최고능치 기준으로 랜덤성 스케일링
             if($avgGen['lpi'] > 210) {
                 $leader = Util::round($leader * $avgGen['lpi'] / GameConst::$defaultStatTotal * (60+rand()%31)/100);
@@ -407,7 +449,7 @@ function process_29(&$general) {
                 $intel -= $over3;
             }
             // 낮은 능치쪽으로 합산
-            if($type == 0) {
+            if($type == 'power') {
                 $intel = $intel + $over1 + $over2 + $over3;
             } else {
                 $power = $power + $over1 + $over2 + $over3;
@@ -434,12 +476,12 @@ function process_29(&$general) {
             $bornyear = $admin['year'];
             $deadyear = $admin['year'] + 3;
             $age = 20;
-            $specage = Util::round((80 - $age)/12) + $age;
-            $specage2 = Util::round((80 - $age)/3) + $age;
+            $specage = Util::round((GameConst::$retirementYear - $age)/12) + $age;
+            $specage2 = Util::round((GameConst::$retirementYear - $age)/3) + $age;
             //$specage = $age + 1 + rand() % 3;
             //$specage2 = $age + 5 + rand() % 5;
-            // 10년 ~ 50년
-            $killturn = rand()%480 + 120;
+            // 20년 ~ 50년
+            $killturn = Util::randRangeInt(20, 50) * 12;
 
             @MYDB_query("
                 insert into general (
@@ -455,7 +497,7 @@ function process_29(&$general) {
                     '$scoutLevel','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0',
                     '0','0','0','$turntime','$killturn','$age','1','$personal','0','$specage','0','$specage2','',
                     '0','$bornyear','$deadyear',
-                    '{$avgGen['dex0']}','{$avgGen['dex10']}','{$avgGen['dex20']}','{$avgGen['dex30']}','{$avgGen['dex40']}'
+                    '{$avgGen['dex_t']}','{$avgGen['dex_t']}','{$avgGen['dex_t']}','{$avgGen['dex_t']}','{$avgGen['dex40']}'
                 )",
                 $connect
             ) or Error(__LINE__.MYDB_error($connect),"");
@@ -568,11 +610,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 +679,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 +698,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) {
@@ -815,18 +861,28 @@ function process_54(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:현재 통합 진행중입니다. 선양 실패.";
     } else {
         //군주 교체
-        $query = "update general set level='12' where no='$who'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        // 태수,군사,시중이었다면 해제
-        $query = "update city set gen1='0' where gen1='$who'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $query = "update city set gen2='0' where gen2='$who'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $query = "update city set gen3='0' where gen3='$who'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('general', [
+            'level'=>12,
+            'permission'=>'normal'
+        ], 'no=%i', $who);
 
-        $query = "update general set resturn='SUCCESS',level='1',experience=experience*0.7 where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        // 태수,군사,종사이었다면 해제
+        $db->update('city', [
+            'gen1'=>0,
+        ], 'gen1=%i', $who);
+        $db->update('city', [
+            'gen2'=>0,
+        ], 'gen2=%i', $who);
+        $db->update('city', [
+            'gen3'=>0,
+        ], 'gen3=%i', $who);
+        
+        $db->update('general', [
+            'resturn'=>'SUCCESS',
+            'level'=>1,
+            'permission'=>'auditor',
+            'experience'=>$db->sqleval('experience*0.7'),
+        ], 'no=%i', $general['no']);
 
         $josaYi = JosaUtil::pick($general['name'], '이');
         $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y><b>【선양】</b></><Y>{$general['name']}</>{$josaYi} <D><b>{$nation['name']}</b></>의 군주 자리를 <Y>{$nextruler['name']}</>에게 선양했습니다.";
@@ -1028,7 +1084,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']}'";

hwe/func_template.php

@@ -136,7 +136,7 @@ function commandButton() {
     }
     
     $db = DB::db();
-    $me = $db->queryFirstRow("select no,nation,level,belong from general where owner=%i", $userID);
+    $me = $db->queryFirstRow("select no,nation,level,belong,permission,penalty from general where owner=%i", $userID);
 
     $nation = $db->queryFirstRow("select nation,level,color,secretlimit from nation where nation=%i",$me['nation'])??[
         'nation'=>0,
@@ -150,22 +150,21 @@ 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,
         'fgColor'=>$fgColor,
         'meLevel'=>$me['level'],
         'nationLevel'=>$nation['level'],
-        'showSecret'=>$showSecret
+        'showSecret'=>$showSecret,
+        'permission'=>$permission,
     ]);
 }
 

hwe/func_time_event.php

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

hwe/func_tournament.php

@@ -235,6 +235,8 @@ function startTournament($auto, $type) {
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
 
+    $prevWinner = $gameStor->prev_winner;
+
     eraseTnmtFightLogAll();
 
     switch($auto) {
@@ -263,12 +265,24 @@ function startTournament($auto, $type) {
     $query = "truncate tournament";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
+    $opener = $db->queryFirstField('SELECT `general`.`name` FROM `general` JOIN `nation` ON `general`.`nation` = `nation`.`nation` WHERE `general`.`level` = 12 AND `nation`.`level` = 7 ORDER BY rand() LIMIT 1');
+    if(!$opener){
+        $opener = $gameStor->prev_winner;
+    }
+
+    if($opener){
+        $openerText = "황제 <Y>{$opener}</>의 명으로 ";
+    }
+    else{
+        $openerText = '';
+    }
+
     $history = [];
     switch($type) {
-    case 0: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>전력전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>영웅</span>들을 모집하고 있습니다!"; break;
-    case 1: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>통솔전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>명사</span>들을 모집하고 있습니다!"; break;
-    case 2: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>일기토</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>용사</span>들을 모집하고 있습니다!"; break;
-    case 3: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: <C>설전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>책사</span>들을 모집하고 있습니다!"; break;
+    case 0: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: $openerText<C>전력전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>영웅</span>들을 모집하고 있습니다!"; break;
+    case 1: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: $openerText<C>통솔전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>명사</span>들을 모집하고 있습니다!"; break;
+    case 2: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: $openerText<C>일기토</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>용사</span>들을 모집하고 있습니다!"; break;
+    case 3: $history[] = "<S>◆</>{$admin['year']}년 {$admin['month']}월: $openerText<C>설전</> 대회가 개최됩니다! 천하의 <span class='ev_highlight'>책사</span>들을 모집하고 있습니다!"; break;
     }
     pushWorldHistory($history, $admin['year'], $admin['month']);
 }

hwe/index.php

@@ -88,6 +88,9 @@ $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('../e_lib/linkify/linkify.min.js')?>
+<?=WebUtil::printJS('../e_lib/linkify/linkify-string.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printJS('js/main.js')?>
@@ -105,7 +108,7 @@ $(function(){
 
     setInterval(function(){
         refreshMsg();
-    }, 10000);
+    }, 5000);
 });
 </script>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
@@ -114,6 +117,7 @@ $(function(){
 <?=WebUtil::printCSS('css/main.css')?>
 <?=WebUtil::printCSS('css/map.css')?>
 <?=WebUtil::printCSS('css/msg.css')?>
+<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.1/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
 <link href="https://fonts.googleapis.com/css?family=Nanum+Gothic|Nanum+Myeongjo|Nanum+Pen+Script" rel="stylesheet">
 
 </head>
@@ -230,7 +234,7 @@ else if($session->userGrade == 4){
 ?>
 
 </table>
-<table class="tb_layout bg0" style="width:1000px;">
+<table class="tb_layout bg0" style="width:1000px;" id='map_position'>
     <tr>
         <td style='width:700px;height:520px;' colspan=2>
             <?=getMapHtml($mapTheme)?>
@@ -262,7 +266,7 @@ else if($session->userGrade == 4){
         </td>
     </tr>
     <tr>
-        <td align=right style="'width:650px;border:none;">
+        <td align=right style="'width:650px;border:none;"><br>
             <?php commandTable(); ?>
             <input id="mainBtnSubmit" type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px; value='실 행' onclick='refreshing(this, 3,form2)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px; value='갱 신' onclick='refreshing(this, 0,0)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;font-size:13px; value='로비로' onclick=location.replace('../')><br>
         </td>
@@ -276,17 +280,17 @@ else if($session->userGrade == 4){
     </tr>
     <tr><td colspan=2><?=commandButton()?></td></tr>
 </table>
-<table class="tb_layout bg0">
+<table class="tb_layout bg0" id='history_position'>
     <tr>
         <td width=498 class='bg1 center'><b>장수 동향</b></td>
         <td width=498 class='bg1 center'><b>개인 기록</b></td>
     </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">
@@ -302,25 +306,39 @@ else if($session->userGrade == 4){
 </div>
 <div><?=allButton()?></div>
 <div id="message_board"><div style="left:0;" class="board_side bg0">
-        <div class="board_header bg0">전체 메시지(최고99자)</div>
-        <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">
-
+        <div class="board_header bg0" id='public_talk_position'>전체 메시지(최고99자)</div>
+        <section class="public_message">
+        <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="public">이전 메시지 불러오기</button>
         </section>
+        <div class="board_header bg0" id='secret_talk_position'>개인 메시지(최고99자)</div>
+        <section class="private_message">
+        <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="private">이전 메시지 불러오기</button>
+        </section>
+    </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>
+<div id='sidebar' class='btn-group-vertical'>
+<button type="button" class="btn btn-primary" onclick='refreshing(this, 0,0)'><i class="fas fa-sync-alt"></i>&nbsp;갱신</button>
+<a class="btn btn-secondary" href="#map_position" role="button">지도 & 턴입력</a>
+<a class="btn btn-secondary" href="#history_position" role="button">장수 동향</a>
+<a class="btn btn-secondary" href="#public_talk_position" role="button">국가 메시지</a>
+<a class="btn btn-secondary" href="#secret_talk_position" role="button">개인 메시지</a>
+</div>
 <?php
 if ($con == 1) {
     MessageBox("접속제한이 얼마 남지 않았습니다!");
 }
 if ($me['newmsg'] == 1) {
-    MessageBox("개인 서신이 도착했습니다!");
+    MessageBox("새로운 서신이 도착했습니다!");
 }
 if ($me['newvote'] == 1) {
     $develcost = $admin['develcost']*5;

hwe/install.php

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

hwe/j_autoreset.php

@@ -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;

hwe/j_basic_info.php

@@ -2,6 +2,7 @@
 namespace sammo;
 
 include('lib.php');
+include 'func.php';
 
 $result = [
     "generalID"=>null,
@@ -11,14 +12,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`, belong, 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);

hwe/j_board_article_add.php

@@ -0,0 +1,77 @@
+<?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, name, level, permission, con, turntime, belong, penalty, `picture`,`imgsvr` FROM general WHERE owner=%i', $userID);
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+if($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'=>'권한이 부족합니다. 수뇌부가 아닙니다.'
+    ]);
+}
+
+$icon = GetImageURL($me['imgsvr'], $me['picture']);
+
+$db->insert('board', [
+    'nation_no'=>$me['nation'],
+    'is_secret'=>$isSecretBoard,
+    'date'=>TimeUtil::DatetimeNow(),
+    'general_no'=>$me['no'],
+    'author'=>$me['name'],
+    'author_icon'=>$icon,
+    'title'=>$title,
+    'text'=>$text
+]);
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success',
+    'row_id'=>$db->insertId()
+]);

hwe/j_board_comment_add.php

@@ -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, name, 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()
+]);

hwe/j_board_get_articles.php

@@ -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[$comment['document_no']]['comment'][] = $comment;
+}
+
+Json::die([
+    'result'=>true,
+    'articles'=>$articles,
+    'reason'=>'success'
+]);
+

hwe/j_diplomacy_destroy_letter.php

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

hwe/j_diplomacy_get_letter.php

@@ -0,0 +1,84 @@
+<?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) AND state != \'cancelled\' ORDER BY date desc',
+        $me['nation'], $me['nation']
+    ) as $letter
+){
+
+    if($permission < 3 && $letter['text_detail']){
+        $letter['text_detail'] = '(권한이 부족합니다)';
+    }
+    $letter['aux'] = Json::decode($letter['aux']);
+    $letter['src'] = $letter['aux']['src'];
+    $letter['dest'] = $letter['aux']['dest'];
+
+    $letter['src']['nationID'] = $letter['src_nation_id'];
+    $letter['dest']['nationID'] = $letter['dest_nation_id'];
+
+    $letters[$letter['no']] = [
+        'no'=>$letter['no'],
+        'src'=>$letter['src'],
+        'dest'=>$letter['dest'],
+        'prev_no'=>$letter['prev_no'],
+        'state'=>$letter['state'],
+        'state_opt'=>($letter['aux']['state_opt']??null),
+        'brief'=>$letter['text_brief'],
+        'detail'=>$letter['text_detail'],
+        'date'=>$letter['date']
+    ];
+}
+
+$nations = [];
+foreach(getAllNationStaticInfo() as $nation){
+    if($nation['nation'] == 0 || $nation['nation'] == $me['nation']){
+        continue;
+    }
+    $nations[] = $nation;
+}
+
+Json::die([
+    'result'=>true,
+    'nations'=>$nations,
+    'letters'=>$letters,
+    'myNationID'=>$me['nation'],
+    'reason'=>'success'
+]);
+

hwe/j_diplomacy_respond_letter.php

@@ -0,0 +1,129 @@
+<?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, name, nation, level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+if($letterNo === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 입력입니다.'
+    ]);
+}
+
+$permission = checkSecretPermission($me);
+if ($permission < 4) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'권한이 부족합니다. 수뇌부가 아닙니다.'
+    ]);
+}
+
+$reason = trim($reason);
+
+$letter = $db->queryFirstRow('SELECT * FROM ng_diplomacy WHERE no=%i AND dest_nation_id = %i AND state = \'proposed\'', $letterNo, $me['nation']);
+if(!$letter){
+    Json::die([
+        'result'=>false,
+        'reason'=>'서신이 없습니다.'
+    ]);
+}
+
+$aux = Json::decode($letter['aux']);
+$me['icon'] = GetImageURL($me['imgsvr'], $me['picture']);
+
+$srcNation = getNationStaticInfo($letter['src_nation_id']);
+$destNation = getNationStaticInfo($letter['dest_nation_id']);
+
+$src = new MessageTarget($me['no'], $me['name'], $destNation['nation'], $destNation['name'], $destNation['color'], $me['icon']);
+$dest = new MessageTarget(0, '', $srcNation['nation'], $srcNation['name'], $srcNation['color']);
+
+$now = new \DateTime();
+$unlimited = new \DateTime('9999-12-31');
+
+if($isAgree){
+    $aux['dest']['generalName'] = $me['name'];
+    $aux['dest']['generalIcon'] = $me['icon'];
+
+    $db->update('ng_diplomacy', [
+        'state'=>'activated',
+        'dest_signer'=>$me['no'],
+        'aux'=>Json::encode($aux)
+    ], 'no=%i', $letterNo);
+    //TODO: 외교 서신에 대한 메시지를 양국에 발송해야함
+
+    $prevLetterNo = $letter['prev_no'];
+    while($prevLetterNo !== null){
+        $db->update('ng_diplomacy', [
+            'state'=>'replaced',
+        ], 'no=%i', $prevLetterNo);
+        $prevLetterNo = $db->queryFirstField('SELECT prev_no FROM ng_diplomacy WHERE state != \'cancelled\' AND no = %i', $prevLetterNo);
+    }
+    $msgText = "외교 서신 #{$letterNo}가 승인되었습니다.";
+}
+else{
+    $aux['reason'] = [
+        'who'=>$me['no'],
+        'action'=>'disagree',
+        'reason'=>$reason
+    ];
+    $db->update('ng_diplomacy', [
+        'state'=>'cancelled',
+        'aux'=>Json::encode($aux)
+    ], 'no=%i', $letterNo);
+    $msgText = "외교 서신 #{$letterNo}가 거부되었습니다.";
+    if($reason){
+        $msgText .= ' 이유 : '.$reason;
+    }
+}
+
+$msg = new Message(
+    Message::MSGTYPE_DIPLOMACY,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
+
+$msg = new Message(
+    Message::MSGTYPE_NATIONAL,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success'
+]);

hwe/j_diplomacy_rollback_letter.php

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

hwe/j_diplomacy_send_letter.php

@@ -0,0 +1,191 @@
+<?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('brief');
+$textDetail = Util::getReq('detail');
+
+increaseRefresh("외교부", 1);
+
+if($prevNo < 1){
+    $prevNo = null;
+}
+
+$me = $db->queryFirstRow('SELECT no, name, nation, level, permission, con, turntime, belong, penalty, picture, imgsvr FROM general WHERE owner=%i', $userID);
+
+$con = checkLimit($me['con']);
+if ($con >= 2) {
+    Json::die([
+        'result'=>false,
+        'reason'=>'접속 제한입니다.'
+    ]);
+}
+
+if($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'];
+
+if($prevNo !== null){
+    //state는 체크하지 않는걸로 하자. 파기한 것을 재 송신하는 경우도 있을 수 있음.
+    $prevLetter = $db->queryFirstRow(
+        'SELECT no, src_nation_id, dest_nation_id, state, aux FROM ng_diplomacy WHERE no = %i AND src_nation_id IN (%i, %i) AND dest_nation_id IN (%i, %i)',
+        $prevNo,
+        $srcNationNo, $destNationNo,
+        $srcNationNo, $destNationNo
+    );
+
+    if(!$prevLetter){
+        Json::die([
+            'result'=>false,
+            'reason'=>'이전 문서가 없습니다.'
+        ]);
+    }
+
+    //새로 나온 문서가 있는지 확인하자
+    $newerLetter = $db->queryFirstField(
+        'SELECT count(no) FROM ng_diplomacy WHERE prev_no = %i AND state != \'cancelled\'', $prevNo
+    );
+    if($newerLetter){
+        Json::die([
+            'result'=>false,
+            'reason'=>'해당 문서에 대한 새로운 문서가 이미 있습니다.'
+        ]);
+    }
+
+    if($prevLetter['src_nation_id'] != $srcNationNo){
+        $destNationNo = $prevLetter['src_nation_id'];
+    }
+    else{
+        $destNationNo = $prevLetter['dest_nation_id'];
+    }
+
+    if($prevLetter['state'] == 'proposed'){
+        $prevAux = Json::decode($prevLetter['aux']);
+        $prevAux['reason'] = [
+            'who'=>$me['no'],
+            'action'=>'new_letter',
+            'reason'=>'new_letter'
+        ];
+        $db->update('ng_diplomacy', [
+            'state'=>'replaced',
+            'aux'=>Json::encode($prevAux)
+        ], 'no=%i', $prevNo);
+    }
+}
+
+$nations = $db->query('SELECT nation, name, color FROM nation WHERE nation IN (%i, %i)', $srcNationNo, $destNationNo);
+if(count($nations) != 2){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 국가입니다.'
+    ]);
+}
+
+if($nations[0]['nation'] == $me['nation']){
+    //index 순서에 따라 또 모름.
+    $srcNation = $nations[0];
+    $destNation = $nations[1];
+}
+else{
+    $srcNation = $nations[1];
+    $destNation = $nations[0];
+}
+
+$me['icon'] = GetImageURL($me['imgsvr'], $me['picture']);
+
+$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'],
+            'generalIcon'=>$me['icon']
+        ],
+        'dest'=>[
+            'nationName'=>$destNation['name'],
+            'nationColor'=>$destNation['color']
+        ]
+    ]),
+]);
+$newLetterNo = $db->insertId();
+
+$src = new MessageTarget($me['no'], $me['name'], $srcNation['nation'], $srcNation['name'], $srcNation['color'], $me['icon']);
+$dest = new MessageTarget(0, '', $destNation['nation'], $destNation['name'], $destNation['color']);
+
+$now = new \DateTime();
+$unlimited = new \DateTime('9999-12-31');
+
+$josaYi = JosaUtil::pick($newLetterNo, '이');
+if($prevNo){
+    $msgText = "문서 #{$prevNo}의 새로운 외교 문서 #{$newLetterNo}{$josaYi} 준비되었습니다. 외교부에서 확인해주세요.";
+}
+else{
+    $msgText = "새로운 외교 문서 #{$newLetterNo}{$josaYi} 준비되었습니다. 외교부에서 확인해주세요.";
+}
+
+
+$msg = new Message(
+    Message::MSGTYPE_DIPLOMACY,
+    $src,
+    $dest,
+    $msgText,
+    $now,
+    $unlimited,
+    ['invalid' => true]
+);
+$msgID = $msg->send();
+
+Json::die([
+    'result'=>true,
+    'reason'=>'success',
+    'row_id'=>$db->insertId()
+]);

hwe/j_general_set_permission.php

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

hwe/j_image_upload.php

@@ -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
+]);

hwe/j_install.php

@@ -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
 ));

hwe/j_msg_delete.php

@@ -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);

hwe/j_msg_get_old.php

@@ -0,0 +1,118 @@
+<?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', 'diplomacy'])){
+    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();
+
+$me = DB::db()->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
+
+if($me === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'장수가 사망했습니다.'
+    ]);
+}
+
+[$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']];
+$permission = checkSecretPermission($me, false);
+
+$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 if($reqType == 'national'){
+    $result['national'] = array_map(function(Message $msg)use (&$nextSequence){
+        if($msg->id > $nextSequence){
+            $nextSequence = $msg->id;
+        }
+        return $msg->toArray();
+    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, $reqTo, 20));
+}
+else{
+    $result['diplomacy'] = array_map(function(Message $msg)use (&$nextSequence, $permission){
+        if($msg->id > $nextSequence){
+            $nextSequence = $msg->id;
+        }
+        $values = $msg->toArray();
+        if($msg->dest->nationID != 0 && $permission < 3){
+            $values['text'] = '(외교 메시지입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
+            $values['option']['invalid'] = true;
+        }
+        return $values;
+    }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, $reqTo, 20));
+}
+
+Json::die($result);

hwe/j_msg_get_recent.php

@@ -4,57 +4,115 @@ 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, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']];
+$permission = checkSecretPermission($me, false);
+
 $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));
 
-$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($msg->dest->nationID != 0 && $permission < 3){
+        $values['text'] = '(외교 메시지입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
+        $values['option']['invalid'] = true;
+    }
+    return $values;
+}, Message::getMessagesFromMailBox(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, 20, $reqSequence));
+
+if($lastType !== null){
+    array_pop($result[$lastType]);
+    $result['keepRecent'] = true;
+}
+else if($reqSequence <= 0){
+    $result['keepRecent'] = true;
+}
 
 $result['sequence'] = $nextSequence;
 $result['nationID'] = $nationID;

hwe/j_msg_submit.php

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

hwe/j_select_npc.php

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

hwe/j_server_basic_info.php

@@ -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

hwe/join_post.php

@@ -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);
@@ -164,11 +162,11 @@ if ($genius) {
     $specage2 = $age;
     $special2 = getSpecial2($leader, $power, $intel);
 } else {
-    $specage2 = Util::valueFit(Util::round((80 - $age)/4 - $relYear / 2), 3) + $age;
+    $specage2 = Util::valueFit(Util::round((GameConst::$retirementYear - $age)/4 - $relYear / 2), 3) + $age;
     $special2 = 0;
 }
 //내특
-$specage = Util::valueFit(Util::round((80 - $age)/12 - $relYear / 2), 3) + $age;
+$specage = Util::valueFit(Util::round((GameConst::$retirementYear - $age)/12 - $relYear / 2), 3) + $age;
 $special = 0;
 
 if ($admin['scenario'] >= 1000) {

hwe/js/board.js

@@ -0,0 +1,181 @@
+
+
+function submitArticle(){
+    var $article = $('#newArticle');
+    var $title = $article.find('.titleInput');
+    var $text = $article.find('.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.closest('.articleObj').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(idx, articleObj){
+    var $articleFrame = $('#articleTemplate > .articleFrame');
+    var $commentFrame = $($('#commentTemplate').prop('content'));
+
+    var $article = $articleFrame.clone();
+    $article.addClass('articleObj')
+        .data('no', articleObj.no)
+        .data('author', articleObj.general_no);
+
+    
+    $article.find('.articleNo').text(articleObj.no);
+    $article.find('.authorName').text(articleObj.author);
+    $article.find('.articleTitle').text(articleObj.title);
+    $article.find('.date').text(articleObj.date);
+    if(articleObj.author_icon){
+        $article.find('.authorIcon').attr('src', articleObj.author_icon);
+    }
+    //$article.find('.text').text(articleObj.text);
+    $article.find('.text').html(nl2br(escapeHtml(articleObj.text)));
+    //TODO: 바꿀 것
+
+    var $articleComment = $article.find('.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);
+    });
+
+    $article.find('.submitComment').click(submitComment);
+    $article.find('.commentText').on('keypress', function (e) {
+        if(e.which === 13){
+            $article.find('.submitComment').click();
+        }
+    });
+    $article.find('.inputCommentHeader').click(function(){
+        $article.find('.commentText').focus();
+    })
+
+    var $board = $('#board');
+
+    $board.prepend($article);
+}
+
+function drawArticles(articlesObj){
+    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 resizeTextarea($obj){
+    $obj.height(1).height($obj.prop('scrollHeight')+12 );
+}
+
+$(function(){
+    $('textarea.autosize').on('keydown keyup', function(){
+        resizeTextarea($(this));
+    })
+
+$('#submitArticle').click(submitArticle);
+
+loadArticles()
+.then(drawArticles, errUnknown)
+.fail(function(reason){
+    alert(reason);
+});
+
+});