전쟁 기한 공식을 스택형으로 변경

장수 아이콘에 generalIcon 클래스 추가

css/login.css

@@ -52,7 +52,7 @@ input::-webkit-input-placeholder {
 
 }
 
-.login-button{
+.login_btn_group{
     margin-top: 5px;
 }
 
@@ -98,6 +98,10 @@ input::-webkit-input-placeholder {
     z-index:800;
 }
 
+#login_card{
+    z-index:801;
+}
+
 #btn_kakao_login{
     cursor: pointer;
     height:46px;

e_lib/bootstrap.bundle.min.js

@@ -1,7 +1,7 @@
 /*!
-  * Bootstrap v4.1.0 (https://getbootstrap.com/)
+  * Bootstrap v4.1.3 (https://getbootstrap.com/)
   * Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
   */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("jquery")):"function"==typeof define&&define.amd?define(["exports","jquery"],e):e(t.bootstrap={},t.jQuery)}(this,function(t,e){"use strict";function i(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}function s(t,e,n){return e&&i(t.prototype,e),n&&i(t,n),t}function c(r){for(var t=1;t<arguments.length;t++){var o=null!=arguments[t]?arguments[t]:{},e=Object.keys(o);"function"==typeof Object.getOwnPropertySymbols&&(e=e.concat(Object.getOwnPropertySymbols(o).filter(function(t){return Object.getOwnPropertyDescriptor(o,t).enumerable}))),e.forEach(function(t){var e,n,i;e=r,i=o[n=t],n in e?Object.defineProperty(e,n,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[n]=i})}return r}for(var r,n,o,a,l,f,h,u,d,p,g,m,_,v,E,y,b,T,C,w,I,D,A,S,O,N,k,L,P,x,j,R,M,H,W,F,U,B,K,V,Q,Y,G,q,z,X,J,Z,$,tt,et,nt,it,rt,ot,st,at,lt,ct,ft,ht,ut,dt,pt,gt=function(i){var e="transitionend";function t(t){var e=this,n=!1;return i(this).one(l.TRANSITION_END,function(){n=!0}),setTimeout(function(){n||l.triggerTransitionEnd(e)},t),this}var l={TRANSITION_END:"bsTransitionEnd",getUID:function(t){for(;t+=~~(1e6*Math.random()),document.getElementById(t););return t},getSelectorFromElement:function(t){var e=t.getAttribute("data-target");e&&"#"!==e||(e=t.getAttribute("href")||"");try{return 0<i(document).find(e).length?e:null}cLine truncated
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("jquery")):"function"==typeof define&&define.amd?define(["exports","jquery"],t):t(e.bootstrap={},e.jQuery)}(this,function(e,t){"use strict";function i(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}function s(e,t,n){return t&&i(e.prototype,t),n&&i(e,n),e}function l(r){for(var e=1;e<arguments.length;e++){var o=null!=arguments[e]?arguments[e]:{},t=Object.keys(o);"function"==typeof Object.getOwnPropertySymbols&&(t=t.concat(Object.getOwnPropertySymbols(o).filter(function(e){return Object.getOwnPropertyDescriptor(o,e).enumerable}))),t.forEach(function(e){var t,n,i;t=r,i=o[n=e],n in t?Object.defineProperty(t,n,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[n]=i})}return r}for(var r,n,o,a,c,u,f,h,d,p,m,g,_,v,y,E,b,w,C,T,S,D,A,I,O,N,k,x,P,L,j,H,M,F,W,R,U,B,q,K,Q,Y,V,z,G,J,Z,X,$,ee,te,ne,ie,re,oe,se,ae,le,ce,ue,fe,he,de,pe,me,ge,_e,ve,ye,Ee,be,we=function(i){var t="transitionend";function e(e){var t=this,n=!1;return i(this).one(l.TRANSITION_END,function(){n=!0}),setTimeout(function(){n||l.triggerTransitionEnd(t)},e),this}var l={TRANSITION_END:"bsTransitionEnd",getUID:function(e){for(;e+=~~(1e6*Math.random()),document.getElementById(e););return e},getSelectorFromElement:function(e){var t=e.getAttribute("data-target");t&&"#"!==t||(t=e.getAttribute("href")||"");try{return document.querySeLine truncated
 //# sourceMappingURL=bootstrap.bundle.min.js.map

e_lib/bootstrap.bundle.min.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../rollupPluginBabelHelpers","../../node_modules/popper.js/dist/esm/popper.js","../../js/src/util.js","../../js/src/alert.js","../../js/src/button.js","../../js/src/carousel.js","../../js/src/collapse.js","../../js/src/dropdown.js","../../js/src/modal.js","../../js/src/tooltip.js","../../js/src/popover.js","../../js/src/scrollspy.js","../../js/src/tab.js","../../js/src/index.js"],"names":["_defineProperties","target","props","i","length","descriptor","enumerable","configurable","writable","Object","defineProperty","key","_createClass","Constructor","protoProps","staticProps","prototype","_objectSpread","arguments","source","ownKeys","keys","getOwnPropertySymbols","concat","filter","sym","getOwnPropertyDescriptor","forEach","obj","value","$","NAME","DATA_KEY","EVENT_KEY","JQUERY_NO_CONFLICT","Event","ClassName","Alert","DATA_API_KEY","Selector","Button","Default","DefaultType","Direction","Carousel","Dimension","Collapse","Util","TRANSITION_END","transitionEndEmulator","duration","_this","this","called","one","setTimeout","triggerTransitionEnd","getUID","prefix","Math","random","document","getElementById","getSelectorFromElement","element","selector","getAttribute","find","err","getTransitionDurationFromElement","transitionDuration","css","parseFloat","split","reflow","offsetHeight","trigger","supportsTransitionEnd","Boolean","isElement","nodeType","typeCheckConfig","componentName","config","configTypes","property","hasOwnProperty","call","expectedLine truncated
+{"version":3,"sources":["../../node_modules/popper.js/dist/esm/popper.js","../../js/src/util.js","../../js/src/alert.js","../../js/src/button.js","../../js/src/carousel.js","../../js/src/collapse.js","../../js/src/dropdown.js","../../js/src/modal.js","../../js/src/tooltip.js","../../js/src/popover.js","../../js/src/scrollspy.js","../../js/src/tab.js","../../js/src/index.js"],"names":["$","NAME","DATA_KEY","EVENT_KEY","JQUERY_NO_CONFLICT","Event","ClassName","Alert","DATA_API_KEY","Selector","Button","Default","DefaultType","Direction","Carousel","Dimension","Collapse","Util","TRANSITION_END","transitionEndEmulator","duration","_this","this","called","one","setTimeout","triggerTransitionEnd","getUID","prefix","Math","random","document","getElementById","getSelectorFromElement","element","selector","getAttribute","querySelector","err","getTransitionDurationFromElement","transitionDuration","css","parseFloat","split","reflow","offsetHeight","trigger","supportsTransitionEnd","Boolean","isElement","obj","nodeType","typeCheckConfig","componentName","config","configTypes","property","Object","prototype","hasOwnProperty","call","expectedTypes","value","valueType","toString","match","toLowerCase","RegExp","test","Error","toUpperCase","fn","emulateTransitionEnd","event","special","bindType","delegateType","handle","target","is","handleObj","handler","apply","arguments","CLOSE","CLOSED","CLICK_DATA_API","_element","_proto","close","rootElement","_getRootElement","_triggerCloseEvent","iLine truncated

e_lib/bootstrap.min.css

@@ -1,12 +1,12 @@
 /*!
- * Bootswatch v4.1.1
+ * Bootswatch v4.1.3
  * Homepage: https://bootswatch.com
  * Copyright 2012-2018 Thomas Park
  * Licensed under MIT
  * Based on Bootstrap
 *//*!
- * Bootstrap v4.1.1 (https://getbootstrap.com/)
+ * Bootstrap v4.1.3 (https://getbootstrap.com/)
  * Copyright 2011-2018 The Bootstrap Authors
  * Copyright 2011-2018 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic");:root{--blue:#375a7f;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#E74C3C;--orange:#fd7e14;--yellow:#F39C12;--green:#00bc8c;--teal:#20c997;--cyan:#3498DB;--white:#fff;--gray:#999;--gray-dark:#303030;--primary:#375a7f;--secondary:#444;--success:#00bc8c;--info:#3498DB;--warning:#F39C12;--danger:#E74C3C;--light:#303030;--dark:#303030;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:"Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";--font-family-monospace:SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace}*,*::before,*::after{-webkit-box-sizing:border-box;box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:"Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";font-size:0.9375rem;font-weight:400;line-height:1.5;color:#fff;text-align:left;background-color:#222}[tabindex="-1"]:focus{outline:0 !Line truncated
+ */@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic");:root{--blue:#375a7f;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#E74C3C;--orange:#fd7e14;--yellow:#F39C12;--green:#00bc8c;--teal:#20c997;--cyan:#3498DB;--white:#fff;--gray:#999;--gray-dark:#303030;--primary:#375a7f;--secondary:#444;--success:#00bc8c;--info:#3498DB;--warning:#F39C12;--danger:#E74C3C;--light:#303030;--dark:#adb5bd;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:"Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";--font-family-monospace:SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace}*,*::before,*::after{-webkit-box-sizing:border-box;box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:"Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";font-size:0.9375rem;font-weight:400;line-height:1.5;color:#fff;text-align:left;background-color:#222}[tabindex="-1"]:focus{outline:0 !Line truncated

e_lib/download2.js

@@ -0,0 +1,132 @@
+//download.js v3.0, by dandavis; 2008-2014. [CCBY2] see http://danml.com/download.html for tests/usage
+// v1 landed a FF+Chrome compat way of downloading strings to local un-named files, upgraded to use a hidden frame and optional mime
+// v2 added named files via a[download], msSaveBlob, IE (10+) support, and window.URL support for larger+faster saves than dataURLs
+// v3 added dataURL and Blob Input, bind-toggle arity, and legacy dataURL fallback was improved with force-download mime and base64 support
+
+// data can be a string, Blob, File, or dataURL
+
+		 
+						 
+						 
+function download(data, strFileName, strMimeType) {
+	
+	var self = window, // this script is only for browsers anyway...
+		u = "application/octet-stream", // this default mime also triggers iframe downloads
+		m = strMimeType || u, 
+		x = data,
+		D = document,
+		a = D.createElement("a"),
+		z = function(a){return String(a);},
+		
+		
+		B = self.Blob || self.MozBlob || self.WebKitBlob || z,
+		BB = self.MSBlobBuilder || self.WebKitBlobBuilder || self.BlobBuilder,
+		fn = strFileName || "download",
+		blob, 
+		b,
+		ua,
+		fr;
+
+	//if(typeof B.bind === 'function' ){ B=B.bind(self); }
+	
+	if(String(this)==="true"){ //reverse arguments, allowing download.bind(true, "text/xml", "export.xml") to act as a callback
+		x=[x, m];
+		m=x[0];
+		x=x[1]; 
+	}
+	
+	
+	
+	//go ahead and download dataURLs right away
+	if(String(x).match(/^data\:[\w+\-]+\/[\w+\-]+[,;]/)){
+		return navigator.msSaveBlob ?  // IE10 can't do a[download], only Blobs:
+			navigator.msSaveBlob(d2b(x), fn) : 
+			saver(x) ; // everyone else can save dataURLs un-processed
+	}//end if dataURL passed?
+	
+	try{
+	
+		blob = x instanceof B ? 
+			x : 
+			new B([x], {type: m}) ;
+	}catch(y){
+		if(BB){
+			b = new BB();
+			b.append([x]);
+			blob = b.getBlob(m); // the blob
+		}
+		
+	}
+	
+	
+	
+	function d2b(u) {
+		var p= u.split(/[:;,]/),
+		t= p[1],
+		dec= p[2] == "base64" ? atob : decodeURIComponent,
+		bin= dec(p.pop()),
+		mx= bin.length,
+		i= 0,
+		uia= new Uint8Array(mx);
+
+		for(i;i<mx;++i) uia[i]= bin.charCodeAt(i);
+
+		return new B([uia], {type: t});
+	 }
+	  
+	function saver(url, winMode){
+		
+		
+		if ('download' in a) { //html5 A[download] 			
+			a.href = url;
+			a.setAttribute("download", fn);
+			a.innerHTML = "downloading...";
+			D.body.appendChild(a);
+			setTimeout(function() {
+				a.click();
+				D.body.removeChild(a);
+				if(winMode===true){setTimeout(function(){ self.URL.revokeObjectURL(a.href);}, 250 );}
+			}, 66);
+			return true;
+		}
+		
+		//do iframe dataURL download (old ch+FF):
+		var f = D.createElement("iframe");
+		D.body.appendChild(f);
+		if(!winMode){ // force a mime that will download:
+			url="data:"+url.replace(/^data:([\w\/\-\+]+)/, u);
+		}
+		 
+	
+		f.src = url;
+		setTimeout(function(){ D.body.removeChild(f); }, 333);
+		
+	}//end saver 
+		
+
+	if (navigator.msSaveBlob) { // IE10+ : (has Blob, but not a[download] or URL)
+		return navigator.msSaveBlob(blob, fn);
+	} 	
+	
+	if(self.URL){ // simple fast and modern way using Blob and URL:
+		saver(self.URL.createObjectURL(blob), true);
+	}else{
+		// handle non-Blob()+non-URL browsers:
+		if(typeof blob === "string" || blob.constructor===z ){
+			try{
+				return saver( "data:" +  m   + ";base64,"  +  self.btoa(blob)  ); 
+			}catch(y){
+				return saver( "data:" +  m   + "," + encodeURIComponent(blob)  ); 
+			}
+		}
+		
+		// Blob but not URL:
+		fr=new FileReader();
+		fr.onload=function(e){
+			saver(this.result); 
+		};
+		fr.readAsDataURL(blob);
+	}	
+	return true;
+} /* end download() */
+

e_lib/moment.min.js

@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.moment=t()}(this,function(){"use strict";var e,i;function c(){return e.apply(null,arguments)}function o(e){return e instanceof Array||"[object Array]"===Object.prototype.toString.call(e)}function u(e){return null!=e&&"[object Object]"===Object.prototype.toString.call(e)}function l(e){return void 0===e}function d(e){return"number"==typeof e||"[object Number]"===Object.prototype.toString.call(e)}function h(e){return e instanceof Date||"[object Date]"===Object.prototype.toString.call(e)}function f(e,t){var n,s=[];for(n=0;n<e.length;++n)s.push(t(e[n],n));return s}function m(e,t){return Object.prototype.hasOwnProperty.call(e,t)}function _(e,t){for(var n in t)m(t,n)&&(e[n]=t[n]);return m(t,"toString")&&(e.toString=t.toString),m(t,"valueOf")&&(e.valueOf=t.valueOf),e}function y(e,t,n,s){return Ot(e,t,n,s,!0).utc()}function g(e){return null==e._pf&&(e._pf={empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],meridiem:null,rfc2822:!1,weekdayMismatch:!1}),e._pf}function p(e){if(null==e._isValid){var t=g(e),n=i.call(t.parsedDateParts,function(e){return null!=e}),s=!isNaN(e._d.getTime())&&t.overflow<0&&!t.empty&&!t.invalidMonth&&!t.invalidWeekday&&!t.weekdayMismatch&&!t.nullInput&&!t.invalidFormat&&!t.userInvalidated&&(!t.meridiem||t.meridiem&&n);Line truncated

e_lib/summernote/lang/summernote-ko-KR.js

@@ -0,0 +1,155 @@
+(function($) {
+  $.extend($.summernote.lang, {
+    'ko-KR': {
+      font: {
+        bold: '굵게',
+        italic: '기울임꼴',
+        underline: '밑줄',
+        clear: '글자 효과 없애기',
+        height: '줄간격',
+        name: '글꼴',
+        superscript: '위 첨자',
+        subscript: '아래 첨자',
+        strikethrough: '취소선',
+        size: '글자 크기'
+      },
+      image: {
+        image: '사진',
+        insert: '사진 추가',
+        resizeFull: '100% 크기로 변경',
+        resizeHalf: '50% 크기로 변경',
+        resizeQuarter: '25% 크기로 변경',
+        floatLeft: '왼쪽 정렬',
+        floatRight: '오른쪽 정렬',
+        floatNone: '정렬하지 않음',
+        shapeRounded: '스타일: 둥근 모서리',
+        shapeCircle: '스타일: 원형',
+        shapeThumbnail: '스타일: 액자',
+        shapeNone: '스타일: 없음',
+        dragImageHere: '텍스트 혹은 사진을 이곳으로 끌어오세요',
+        dropImage: '텍스트 혹은 사진을 내려놓으세요',
+        selectFromFiles: '파일 선택',
+        maximumFileSize: 'Maximum file size',
+        maximumFileSizeError: 'Maximum file size exceeded.',
+        url: '사진 URL',
+        remove: '사진 삭제',
+        original: 'Original'
+      },
+      video: {
+        video: '동영상',
+        videoLink: '동영상 링크',
+        insert: '동영상 추가',
+        url: '동영상 URL',
+        providers: '(YouTube, Vimeo, Vine, Instagram, DailyMotion, Youku 사용 가능)'
+      },
+      link: {
+        link: '링크',
+        insert: '링크 추가',
+        unlink: '링크 삭제',
+        edit: '수정',
+        textToDisplay: '링크에 표시할 내용',
+        url: '이동할 URL',
+        openInNewWindow: '새창으로 열기'
+      },
+      table: {
+        table: '테이블',
+        addRowAbove: 'Add row above',
+        addRowBelow: 'Add row below',
+        addColLeft: 'Add column left',
+        addColRight: 'Add column right',
+        delRow: 'Delete row',
+        delCol: 'Delete column',
+        delTable: 'Delete table'
+      },
+      hr: {
+        insert: '구분선 추가'
+      },
+      style: {
+        style: '스타일',
+        p: '본문',
+        blockquote: '인용구',
+        pre: '코드',
+        h1: '제목 1',
+        h2: '제목 2',
+        h3: '제목 3',
+        h4: '제목 4',
+        h5: '제목 5',
+        h6: '제목 6'
+      },
+      lists: {
+        unordered: '글머리 기호',
+        ordered: '번호 매기기'
+      },
+      options: {
+        help: '도움말',
+        fullscreen: '전체 화면',
+        codeview: '코드 보기'
+      },
+      paragraph: {
+        paragraph: '문단 정렬',
+        outdent: '내어쓰기',
+        indent: '들여쓰기',
+        left: '왼쪽 정렬',
+        center: '가운데 정렬',
+        right: '오른쪽 정렬',
+        justify: '양쪽 정렬'
+      },
+      color: {
+        recent: '마지막으로 사용한 색',
+        more: '다른 색 선택',
+        background: '배경색',
+        foreground: '글자색',
+        transparent: '투명',
+        setTransparent: '투명',
+        reset: '취소',
+        resetToDefault: '기본 값으로 변경'
+      },
+      shortcut: {
+        shortcuts: '키보드 단축키',
+        close: '닫기',
+        textFormatting: '글자 스타일 적용',
+        action: '기능',
+        paragraphFormatting: '문단 스타일 적용',
+        documentStyle: '문서 스타일 적용',
+        extraKeys: 'Extra keys'
+      },
+      help: {
+        'insertParagraph': 'Insert Paragraph',
+        'undo': 'Undoes the last command',
+        'redo': 'Redoes the last command',
+        'tab': 'Tab',
+        'untab': 'Untab',
+        'bold': 'Set a bold style',
+        'italic': 'Set a italic style',
+        'underline': 'Set a underline style',
+        'strikethrough': 'Set a strikethrough style',
+        'removeFormat': 'Clean a style',
+        'justifyLeft': 'Set left align',
+        'justifyCenter': 'Set center align',
+        'justifyRight': 'Set right align',
+        'justifyFull': 'Set full align',
+        'insertUnorderedList': 'Toggle unordered list',
+        'insertOrderedList': 'Toggle ordered list',
+        'outdent': 'Outdent on current paragraph',
+        'indent': 'Indent on current paragraph',
+        'formatPara': 'Change current block\'s format as a paragraph(P tag)',
+        'formatH1': 'Change current block\'s format as H1',
+        'formatH2': 'Change current block\'s format as H2',
+        'formatH3': 'Change current block\'s format as H3',
+        'formatH4': 'Change current block\'s format as H4',
+        'formatH5': 'Change current block\'s format as H5',
+        'formatH6': 'Change current block\'s format as H6',
+        'insertHorizontalRule': 'Insert horizontal rule',
+        'linkDialog.show': 'Show Link Dialog'
+      },
+      history: {
+        undo: '실행 취소',
+        redo: '다시 실행'
+      },
+      specialChar: {
+        specialChar: '특수문자',
+        select: '특수문자를 선택하세요'
+      }
+    }
+  });
+})(jQuery);

e_lib/summernote/plugin/databasic/summernote-ext-databasic.css

@@ -0,0 +1,16 @@
+.ext-databasic {
+	position: relative;
+	display: block;
+	min-height: 50px;
+	background-color: cyan;
+	text-align: center;
+	padding: 20px;
+	border: 1px solid white;
+	border-radius: 10px;
+}
+
+.ext-databasic p {
+	color: white;
+	font-size: 1.2em;
+	margin: 0;
+}

e_lib/summernote/plugin/databasic/summernote-ext-databasic.js

@@ -0,0 +1,292 @@
+(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($) {
+  // pull in some summernote core functions
+  var ui = $.summernote.ui;
+  var dom = $.summernote.dom;
+
+  // define the popover plugin
+  var DataBasicPlugin = function(context) {
+    var self = this;
+    var options = context.options;
+    var lang = options.langInfo;
+
+    self.icon = '<i class="fa fa-object-group"/>';
+
+    // add context menu button for dialog
+    context.memo('button.databasic', function() {
+      return ui.button({
+        contents: self.icon,
+        tooltip: lang.databasic.insert,
+        click: context.createInvokeHandler('databasic.showDialog')
+      }).render();
+    });
+
+    // add popover edit button
+    context.memo('button.databasicDialog', function() {
+      return ui.button({
+        contents: self.icon,
+        tooltip: lang.databasic.edit,
+        click: context.createInvokeHandler('databasic.showDialog')
+      }).render();
+    });
+
+    //  add popover size buttons
+    context.memo('button.databasicSize100', function() {
+      return ui.button({
+        contents: '<span class="note-fontsize-10">100%</span>',
+        tooltip: lang.image.resizeFull,
+        click: context.createInvokeHandler('editor.resize', '1')
+      }).render();
+    });
+    context.memo('button.databasicSize50', function() {
+      return ui.button({
+        contents: '<span class="note-fontsize-10">50%</span>',
+        tooltip: lang.image.resizeHalf,
+        click: context.createInvokeHandler('editor.resize', '0.5')
+      }).render();
+    });
+    context.memo('button.databasicSize25', function() {
+      return ui.button({
+        contents: '<span class="note-fontsize-10">25%</span>',
+        tooltip: lang.image.resizeQuarter,
+        click: context.createInvokeHandler('editor.resize', '0.25')
+      }).render();
+    });
+
+    self.events = {
+      'summernote.init': function(we, e) {
+        // update existing containers
+        $('data.ext-databasic', e.editable).each(function() { self.setContent($(this)); });
+        // TODO: make this an undo snapshot...
+      },
+      'summernote.keyup summernote.mouseup summernote.change summernote.scroll': function() {
+        self.update();
+      },
+      'summernote.dialog.shown': function() {
+        self.hidePopover();
+      }
+    };
+
+    self.initialize = function() {
+      // create dialog markup
+      var $container = options.dialogsInBody ? $(document.body) : context.layoutInfo.editor;
+
+      var body = '<div class="form-group row-fluid">' +
+          '<label>' + lang.databasic.testLabel + '</label>' +
+          '<input class="ext-databasic-test form-control" type="text" />' +
+          '</div>';
+      var footer = '<button href="#" class="btn btn-primary ext-databasic-save">' + lang.databasic.insert + '</button>';
+
+      self.$dialog = ui.dialog({
+        title: lang.databasic.name,
+        fade: options.dialogsFade,
+        body: body,
+        footer: footer
+      }).render().appendTo($container);
+
+      // create popover
+      self.$popover = ui.popover({
+        className: 'ext-databasic-popover'
+      }).render().appendTo('body');
+      var $content = self.$popover.find('.popover-content');
+
+      context.invoke('buttons.build', $content, options.popover.databasic);
+    };
+
+    self.destroy = function() {
+      self.$popover.remove();
+      self.$popover = null;
+      self.$dialog.remove();
+      self.$dialog = null;
+    };
+
+    self.update = function() {
+      // Prevent focusing on editable when invoke('code') is executed
+      if (!context.invoke('editor.hasFocus')) {
+        self.hidePopover();
+        return;
+      }
+
+      var rng = context.invoke('editor.createRange');
+      var visible = false;
+
+      if (rng.isOnData()) {
+        var $data = $(rng.sc).closest('data.ext-databasic');
+
+        if ($data.length) {
+          var pos = dom.posFromPlaceholder($data[0]);
+
+          self.$popover.css({
+            display: 'block',
+            left: pos.left,
+            top: pos.top
+          });
+
+          // save editor target to let size buttons resize the container
+          context.invoke('editor.saveTarget', $data[0]);
+
+          visible = true;
+        }
+      }
+
+      // hide if not visible
+      if (!visible) {
+        self.hidePopover();
+      }
+    };
+
+    self.hidePopover = function() {
+      self.$popover.hide();
+    };
+
+    // define plugin dialog
+    self.getInfo = function() {
+      var rng = context.invoke('editor.createRange');
+
+      if (rng.isOnData()) {
+        var $data = $(rng.sc).closest('data.ext-databasic');
+
+        if ($data.length) {
+          // Get the first node on range(for edit).
+          return {
+            node: $data,
+            test: $data.attr('data-test')
+          };
+        }
+      }
+
+      return {};
+    };
+
+    self.setContent = function($node) {
+      $node.html('<p contenteditable="false">' + self.icon + ' ' + lang.databasic.name + ': ' +
+        $node.attr('data-test') + '</p>');
+    };
+
+    self.updateNode = function(info) {
+      self.setContent(info.node
+        .attr('data-test', info.test));
+    };
+
+    self.createNode = function(info) {
+      var $node = $('<data class="ext-databasic"></data>');
+
+      if ($node) {
+        // save node to info structure
+        info.node = $node;
+        // insert node into editor dom
+        context.invoke('editor.insertNode', $node[0]);
+      }
+
+      return $node;
+    };
+
+    self.showDialog = function() {
+      var info = self.getInfo();
+      var newNode = !info.node;
+      context.invoke('editor.saveRange');
+
+      self
+        .openDialog(info)
+        .then(function(dialogInfo) {
+          // [workaround] hide dialog before restore range for IE range focus
+          ui.hideDialog(self.$dialog);
+          context.invoke('editor.restoreRange');
+
+          // insert a new node
+          if (newNode) {
+            self.createNode(info);
+          }
+
+          // update info with dialog info
+          $.extend(info, dialogInfo);
+
+          self.updateNode(info);
+        })
+        .fail(function() {
+          context.invoke('editor.restoreRange');
+        });
+    };
+
+    self.openDialog = function(info) {
+      return $.Deferred(function(deferred) {
+        var $inpTest = self.$dialog.find('.ext-databasic-test');
+        var $saveBtn = self.$dialog.find('.ext-databasic-save');
+        var onKeyup = function(event) {
+          if (event.keyCode === 13) {
+            $saveBtn.trigger('click');
+          }
+        };
+
+        ui.onDialogShown(self.$dialog, function() {
+          context.triggerEvent('dialog.shown');
+
+          $inpTest.val(info.test).on('input', function() {
+            ui.toggleBtn($saveBtn, $inpTest.val());
+          }).trigger('focus').on('keyup', onKeyup);
+
+          $saveBtn
+            .text(info.node ? lang.databasic.edit : lang.databasic.insert)
+            .click(function(event) {
+              event.preventDefault();
+
+              deferred.resolve({ test: $inpTest.val() });
+            });
+
+          // init save button
+          ui.toggleBtn($saveBtn, $inpTest.val());
+        });
+
+        ui.onDialogHidden(self.$dialog, function() {
+          $inpTest.off('input keyup');
+          $saveBtn.off('click');
+
+          if (deferred.state() === 'pending') {
+            deferred.reject();
+          }
+        });
+
+        ui.showDialog(self.$dialog);
+      });
+    };
+  };
+
+  // Extends summernote
+  $.extend(true, $.summernote, {
+    plugins: {
+      databasic: DataBasicPlugin
+    },
+
+    options: {
+      popover: {
+        databasic: [
+          ['databasic', ['databasicDialog', 'databasicSize100', 'databasicSize50', 'databasicSize25']]
+        ]
+      }
+    },
+
+    // add localization texts
+    lang: {
+      'en-US': {
+        databasic: {
+          name: 'Basic Data Container',
+          insert: 'insert basic data container',
+          edit: 'edit basic data container',
+          testLabel: 'test input'
+        }
+      }
+    }
+
+  });
+}));

e_lib/summernote/plugin/hello/summernote-ext-hello.js

@@ -0,0 +1,81 @@
+(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($) {
+  // Extends plugins for adding hello.
+  //  - plugin is external module for customizing.
+  $.extend($.summernote.plugins, {
+    /**
+     * @param {Object} context - context object has status of editor.
+     */
+    'hello': function(context) {
+      var self = this;
+
+      // ui has renders to build ui elements.
+      //  - you can create a button with `ui.button`
+      var ui = $.summernote.ui;
+
+      // add hello button
+      context.memo('button.hello', function() {
+        // create button
+        var button = ui.button({
+          contents: '<i class="fa fa-child"/> Hello',
+          tooltip: 'hello',
+          click: function() {
+            self.$panel.show();
+            self.$panel.hide(500);
+            // invoke insertText method with 'hello' on editor module.
+            context.invoke('editor.insertText', 'hello');
+          }
+        });
+
+        // create jQuery object from button instance.
+        var $hello = button.render();
+        return $hello;
+      });
+
+      // This events will be attached when editor is initialized.
+      this.events = {
+        // This will be called after modules are initialized.
+        'summernote.init': function(we, e) {
+          console.log('summernote initialized', we, e);
+        },
+        // This will be called when user releases a key on editable.
+        'summernote.keyup': function(we, e) {
+          console.log('summernote keyup', we, e);
+        }
+      };
+
+      // This method will be called when editor is initialized by $('..').summernote();
+      // You can create elements for plugin
+      this.initialize = function() {
+        this.$panel = $('<div class="hello-panel"/>').css({
+          position: 'absolute',
+          width: 100,
+          height: 100,
+          left: '50%',
+          top: '50%',
+          background: 'red'
+        }).hide();
+
+        this.$panel.appendTo('body');
+      };
+
+      // This methods will be called when editor is destroyed by $('..').summernote('destroy');
+      // You should remove elements on `initialize`.
+      this.destroy = function() {
+        this.$panel.remove();
+        this.$panel = null;
+      };
+    }
+  });
+}));

e_lib/summernote/plugin/specialchars/summernote-ext-specialchars.js

@@ -0,0 +1,312 @@
+(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($.summernote.plugins, {
+    'specialchars': function(context) {
+      var self = this;
+      var ui = $.summernote.ui;
+
+      var $editor = context.layoutInfo.editor;
+      var options = context.options;
+      var lang = options.langInfo;
+
+      var KEY = {
+        UP: 38,
+        DOWN: 40,
+        LEFT: 37,
+        RIGHT: 39,
+        ENTER: 13
+      };
+      var COLUMN_LENGTH = 15;
+      var COLUMN_WIDTH = 35;
+
+      var currentColumn = 0;
+      var currentRow = 0;
+      var totalColumn = 0;
+      var totalRow = 0;
+
+      // special characters data set
+      var specialCharDataSet = [
+        '"', '&', '<', '>', '¡', '¢',
+        '£', '¤', '¥', '¦', '§',
+        '¨', '©', 'ª', '«', '¬',
+        '®', '¯', '°', '±', '²',
+        '³', '´', 'µ', '¶', '·',
+        '¸', '¹', 'º', '»', '¼',
+        '½', '¾', '¿', '×', '÷',
+        'ƒ', 'ˆ', '˜', '–', '—',
+        '‘', '’', '‚', '“', '”',
+        '„', '†', '‡', '•', '…',
+        '‰', '′', '″', '‹', '›',
+        '‾', '⁄', '€', 'ℑ', '℘',
+        'ℜ', '™', 'ℵ', '←', '↑',
+        '→', '↓', '↔', '↵', '⇐',
+        '⇑', '⇒', '⇓', '⇔', '∀',
+        '∂', '∃', '∅', '∇', '∈',
+        '∉', '∋', '∏', '∑', '−',
+        '∗', '√', '∝', '∞', '∠',
+        '∧', '∨', '∩', '∪', '∫',
+        '∴', '∼', '≅', '≈', '≠',
+        '≡', '≤', '≥', '⊂', '⊃',
+        '⊄', '⊆', '⊇', '⊕', '⊗',
+        '⊥', '⋅', '⌈', '⌉', '⌊',
+        '⌋', '◊', '♠', '♣', '♥',
+        '♦'
+      ];
+
+      context.memo('button.specialchars', function() {
+        return ui.button({
+          contents: '<i class="fa fa-font fa-flip-vertical">',
+          tooltip: lang.specialChar.specialChar,
+          click: function() {
+            self.show();
+          }
+        }).render();
+      });
+
+      /**
+       * Make Special Characters Table
+       *
+       * @member plugin.specialChar
+       * @private
+       * @return {jQuery}
+       */
+      this.makeSpecialCharSetTable = function() {
+        var $table = $('<table/>');
+        $.each(specialCharDataSet, function(idx, text) {
+          var $td = $('<td/>').addClass('note-specialchar-node');
+          var $tr = (idx % COLUMN_LENGTH === 0) ? $('<tr/>') : $table.find('tr').last();
+
+          var $button = ui.button({
+            callback: function($node) {
+              $node.html(text);
+              $node.attr('title', text);
+              $node.attr('data-value', encodeURIComponent(text));
+              $node.css({
+                width: COLUMN_WIDTH,
+                'margin-right': '2px',
+                'margin-bottom': '2px'
+              });
+            }
+          }).render();
+
+          $td.append($button);
+
+          $tr.append($td);
+          if (idx % COLUMN_LENGTH === 0) {
+            $table.append($tr);
+          }
+        });
+
+        totalRow = $table.find('tr').length;
+        totalColumn = COLUMN_LENGTH;
+
+        return $table;
+      };
+
+      this.initialize = function() {
+        var $container = options.dialogsInBody ? $(document.body) : $editor;
+
+        var body = '<div class="form-group row-fluid">' + this.makeSpecialCharSetTable()[0].outerHTML + '</div>';
+
+        this.$dialog = ui.dialog({
+          title: lang.specialChar.select,
+          body: body
+        }).render().appendTo($container);
+      };
+
+      this.show = function() {
+        var text = context.invoke('editor.getSelectedText');
+        context.invoke('editor.saveRange');
+        this.showSpecialCharDialog(text).then(function(selectChar) {
+          context.invoke('editor.restoreRange');
+
+          // build node
+          var $node = $('<span></span>').html(selectChar)[0];
+
+          if ($node) {
+            // insert video node
+            context.invoke('editor.insertNode', $node);
+          }
+        }).fail(function() {
+          context.invoke('editor.restoreRange');
+        });
+      };
+
+      /**
+       * show image dialog
+       *
+       * @param {jQuery} $dialog
+       * @return {Promise}
+       */
+      this.showSpecialCharDialog = function(text) {
+        return $.Deferred(function(deferred) {
+          var $specialCharDialog = self.$dialog;
+          var $specialCharNode = $specialCharDialog.find('.note-specialchar-node');
+          var $selectedNode = null;
+          var ARROW_KEYS = [KEY.UP, KEY.DOWN, KEY.LEFT, KEY.RIGHT];
+          var ENTER_KEY = KEY.ENTER;
+
+          function addActiveClass($target) {
+            if (!$target) {
+              return;
+            }
+            $target.find('button').addClass('active');
+            $selectedNode = $target;
+          }
+
+          function removeActiveClass($target) {
+            $target.find('button').removeClass('active');
+            $selectedNode = null;
+          }
+
+          // find next node
+          function findNextNode(row, column) {
+            var findNode = null;
+            $.each($specialCharNode, function(idx, $node) {
+              var findRow = Math.ceil((idx + 1) / COLUMN_LENGTH);
+              var findColumn = ((idx + 1) % COLUMN_LENGTH === 0) ? COLUMN_LENGTH : (idx + 1) % COLUMN_LENGTH;
+              if (findRow === row && findColumn === column) {
+                findNode = $node;
+                return false;
+              }
+            });
+            return $(findNode);
+          }
+
+          function arrowKeyHandler(keyCode) {
+            // left, right, up, down key
+            var $nextNode;
+            var lastRowColumnLength = $specialCharNode.length % totalColumn;
+
+            if (KEY.LEFT === keyCode) {
+              if (currentColumn > 1) {
+                currentColumn = currentColumn - 1;
+              } else if (currentRow === 1 && currentColumn === 1) {
+                currentColumn = lastRowColumnLength;
+                currentRow = totalRow;
+              } else {
+                currentColumn = totalColumn;
+                currentRow = currentRow - 1;
+              }
+            } else if (KEY.RIGHT === keyCode) {
+              if (currentRow === totalRow && lastRowColumnLength === currentColumn) {
+                currentColumn = 1;
+                currentRow = 1;
+              } else if (currentColumn < totalColumn) {
+                currentColumn = currentColumn + 1;
+              } else {
+                currentColumn = 1;
+                currentRow = currentRow + 1;
+              }
+            } else if (KEY.UP === keyCode) {
+              if (currentRow === 1 && lastRowColumnLength < currentColumn) {
+                currentRow = totalRow - 1;
+              } else {
+                currentRow = currentRow - 1;
+              }
+            } else if (KEY.DOWN === keyCode) {
+              currentRow = currentRow + 1;
+            }
+
+            if (currentRow === totalRow && currentColumn > lastRowColumnLength) {
+              currentRow = 1;
+            } else if (currentRow > totalRow) {
+              currentRow = 1;
+            } else if (currentRow < 1) {
+              currentRow = totalRow;
+            }
+
+            $nextNode = findNextNode(currentRow, currentColumn);
+
+            if ($nextNode) {
+              removeActiveClass($selectedNode);
+              addActiveClass($nextNode);
+            }
+          }
+
+          function enterKeyHandler() {
+            if (!$selectedNode) {
+              return;
+            }
+
+            deferred.resolve(decodeURIComponent($selectedNode.find('button').attr('data-value')));
+            $specialCharDialog.modal('hide');
+          }
+
+          function keyDownEventHandler(event) {
+            event.preventDefault();
+            var keyCode = event.keyCode;
+            if (keyCode === undefined || keyCode === null) {
+              return;
+            }
+            // check arrowKeys match
+            if (ARROW_KEYS.indexOf(keyCode) > -1) {
+              if ($selectedNode === null) {
+                addActiveClass($specialCharNode.eq(0));
+                currentColumn = 1;
+                currentRow = 1;
+                return;
+              }
+              arrowKeyHandler(keyCode);
+            } else if (keyCode === ENTER_KEY) {
+              enterKeyHandler();
+            }
+            return false;
+          }
+
+          // remove class
+          removeActiveClass($specialCharNode);
+
+          // find selected node
+          if (text) {
+            for (var i = 0; i < $specialCharNode.length; i++) {
+              var $checkNode = $($specialCharNode[i]);
+              if ($checkNode.text() === text) {
+                addActiveClass($checkNode);
+                currentRow = Math.ceil((i + 1) / COLUMN_LENGTH);
+                currentColumn = (i + 1) % COLUMN_LENGTH;
+              }
+            }
+          }
+
+          ui.onDialogShown(self.$dialog, function() {
+            $(document).on('keydown', keyDownEventHandler);
+
+            self.$dialog.find('button').tooltip();
+
+            $specialCharNode.on('click', function(event) {
+              event.preventDefault();
+              deferred.resolve(decodeURIComponent($(event.currentTarget).find('button').attr('data-value')));
+              ui.hideDialog(self.$dialog);
+            });
+          });
+
+          ui.onDialogHidden(self.$dialog, function() {
+            $specialCharNode.off('click');
+
+            self.$dialog.find('button').tooltip('destroy');
+
+            $(document).off('keydown', keyDownEventHandler);
+
+            if (deferred.state() === 'pending') {
+              deferred.reject();
+            }
+          });
+
+          ui.showDialog(self.$dialog);
+        });
+      };
+    }
+  });
+}));

e_lib/summernote/summernote-bs4.css

@@ -0,0 +1 @@
+@font-face{font-family:"summernote";font-style:normal;font-weight:normal;src:url("./font/summernote.eot?dbafe969167589eda84514394d126413");src:url("./font/summernote.eot?#iefix") format("embedded-opentype"),url("./font/summernote.woff?dbafe969167589eda84514394d126413") format("woff"),url("./font/summernote.ttf?dbafe969167589eda84514394d126413") format("truetype")}[class^="note-icon-"]:before,[class*=" note-icon-"]:before{display:inline-block;font:normal normal normal 14px summernote;font-size:inherit;-webkit-font-smoothing:antialiased;text-decoration:inherit;text-rendering:auto;text-transform:none;vertical-align:middle;speak:none;-moz-osx-font-smoothing:grayscale}.note-icon-align-center:before,.note-icon-align-indent:before,.note-icon-align-justify:before,.note-icon-align-left:before,.note-icon-align-outdent:before,.note-icon-align-right:before,.note-icon-align:before,.note-icon-arrow-circle-down:before,.note-icon-arrow-circle-left:before,.note-icon-arrow-circle-right:before,.note-icon-arrow-circle-up:before,.note-icon-arrows-alt:before,.note-icon-arrows-h:before,.note-icon-arrows-v:before,.note-icon-bold:before,.note-icon-caret:before,.note-icon-chain-broken:before,.note-icon-circle:before,.note-icon-close:before,.note-icon-code:before,.note-icon-col-after:before,.note-icon-col-before:before,.note-icon-col-remove:before,.note-icon-eraser:before,.note-icon-font:before,.note-icon-frame:before,.note-icon-italic:before,.note-icon-link:before,.note-icon-magic:before,.note-icon-mLine truncated

e_lib/summernote/summernote-bs4.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"summernote-bs4.js","sources":["../src/js/base/renderer.js","../src/js/bs4/ui.js","../src/js/base/core/func.js","../src/js/base/core/lists.js","../src/js/base/core/env.js","../src/js/base/core/dom.js","../src/js/base/summernote-en-US.js","../src/js/base/core/key.js","../src/js/base/core/range.js","../src/js/base/core/async.js","../src/js/base/editing/History.js","../src/js/base/editing/Style.js","../src/js/base/editing/Bullet.js","../src/js/base/editing/Typing.js","../src/js/base/editing/Table.js","../src/js/base/module/Editor.js","../src/js/base/module/Clipboard.js","../src/js/base/module/Dropzone.js","../src/js/base/module/Codeview.js","../src/js/base/module/Statusbar.js","../src/js/base/module/Fullscreen.js","../src/js/base/module/Handle.js","../src/js/base/module/AutoLink.js","../src/js/base/module/AutoSync.js","../src/js/base/module/Placeholder.js","../src/js/base/module/Buttons.js","../src/js/base/module/Toolbar.js","../src/js/base/module/LinkDialog.js","../src/js/base/module/LinkPopover.js","../src/js/base/module/ImageDialog.js","../src/js/base/module/ImagePopover.js","../src/js/base/module/TablePopover.js","../src/js/base/module/VideoDialog.js","../src/js/base/module/HelpDialog.js","../src/js/base/module/AirPopover.js","../src/js/base/module/HintPopover.js","../src/js/base/Context.js","../src/js/summernote.js","../src/js/bs4/settings.js"],"sourcesContent":["import $ from 'jquery';\n\nclass Renderer {\n  constructor(markup, children, options, callbLine truncated

e_lib/summernote/summernote-bs4.min.js

@@ -0,0 +1,3 @@
+/*! Summernote v0.8.10 | (c) 2013- Alan Hong and other contributors | MIT license */
+
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e(t.jQuery)}(this,function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e=function(){function e(t,e,o,n){this.markup=t,this.children=e,this.options=o,this.callback=n}return e.prototype.render=function(e){var o=t(this.markup);if(this.options&&this.options.contents&&o.html(this.options.contents),this.options&&this.options.className&&o.addClass(this.options.className),this.options&&this.options.data&&t.each(this.options.data,function(t,e){o.attr("data-"+t,e)}),this.options&&this.options.click&&o.on("click",this.options.click),this.children){var n=o.find(".note-children-container");this.children.forEach(function(t){t.render(n.length?n:o)})}return this.callback&&this.callback(o,this.options),this.options&&this.options.callback&&this.options.callback(o),e&&e.append(o),o},e}(),o=function(o,n){return function(){var i="object"==typeof arguments[1]?arguments[1]:arguments[0],r=t.isArray(arguments[0])?arguments[0]:[];return i&&i.children&&(r=i.children),new e(o,r,i,n)}},n=o('<div class="note-editor note-frame card"/>'),i=o('<div class="note-toolbar-wrapper"><div class="note-toolbar card-header" role="toolbar"></div></div>'),r=o('<div class="note-editing-area"/>'),s=o('<textarea class="note-codable" role="textbox" aria-multiline="true"/>'),a=o('<div class="note-editable card-block" contentEditable="true" role="textbox" ariLine truncated

f_config/config.php

@@ -77,7 +77,7 @@ function getExceptionTraceAsString($exception) {
             }   
             $args = join(", ", $args);
         }
-        $rtn[] = sprintf( "#%s %s(%s): %s(%s)",
+        $rtn[] = sprintf( "#%s %s:%s %s(%s)",
                                  $count,
                                  isset($frame['file']) ? $frame['file'] : 'unknown file',
                                  isset($frame['line']) ? $frame['line'] : 'unknown line',

f_install/j_create_admin.php

@@ -52,6 +52,7 @@ $rootDB->insert('member',[
     'oauth_type' => 'NONE',
     'id' => $username,
     'email' => null,
+    'token_valid_until'=>'2999-01-01 00:00:00',
     'pw' => $finalPassword,
     'salt' => $userSalt,
     'grade'=> 6,

f_install/j_setup_db.php

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

f_install/sql/common_schema.sql

@@ -20,16 +20,18 @@ ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 CREATE TABLE `member` (
 	`NO` INT(11) NOT NULL AUTO_INCREMENT,
 	`oauth_id` BIGINT(20) NULL DEFAULT NULL,
-	`oauth_type` ENUM('NONE','KAKAO') NOT NULL,
 	`ID` VARCHAR(64) NOT NULL,
 	`EMAIL` VARCHAR(64) NULL DEFAULT NULL,
+	`oauth_type` ENUM('NONE','KAKAO') NOT NULL,
+	`oauth_info` TEXT NOT NULL DEFAULT '{}',
+	`token_valid_until` DATETIME NULL DEFAULT NULL,
 	`PW` CHAR(128) NOT NULL,
 	`salt` CHAR(16) NOT NULL,
 	`third_use` INT(1) NOT NULL DEFAULT '0',
 	`NAME` VARCHAR(64) NOT NULL,
 	`PICTURE` VARCHAR(64) NULL DEFAULT 'default.jpg',
 	`IMGSVR` INT(1) NULL DEFAULT '0',
-	`acl` text NOT NULL DEFAULT '{}' COMMENT 'json',
+	`acl` TEXT NOT NULL DEFAULT '{}' COMMENT 'json',
 	`GRADE` INT(1) NULL DEFAULT '1',
 	`REG_NUM` INT(3) NULL DEFAULT '0',
 	`REG_DATE` DATETIME NOT NULL,

f_install/templates/common.orig.css

@@ -87,3 +87,40 @@
     background: url('_tK_gameImagePath_/map/che/miniche_road.png') no-repeat;
     background-size: 700px 500px;
 }
+
+/*루드라사움 지도*/
+.map_theme_ludo_rathowm .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/ludo_rathowm/back.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_ludo_rathowm .map_bgroad{
+    background: url('_tK_gameImagePath_/map/ludo_rathowm/road.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_ludo_rathowm.map_detail.map_spring .map_title_text{
+    background:
+        url('_tK_gameImagePath_/spring.gif') no-repeat right;
+}
+
+.map_theme_ludo_rathowm.map_detail.map_summer .map_title_text{
+    background:
+        url('_tK_gameImagePath_/summer.gif') no-repeat right;
+}
+
+.map_theme_ludo_rathowm.map_detail.map_fall .map_title_text{
+    background:
+        url('_tK_gameImagePath_/fall.gif') no-repeat right;
+}
+
+.map_theme_ludo_rathowm.map_detail.map_winter .map_title_text{
+    background:
+        url('_tK_gameImagePath_/winter.gif') no-repeat right;
+}
+
+.world_map.map_theme_ludo_rathowm .map_title .map_title_text::before {
+    color:white;
+    content:'LP';
+    margin-right:1ch;
+}

f_install/templates/menu.orig.js

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

f_install/templates/menu.orig.json

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

hwe/_simul.php

@@ -1,1660 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$session = Session::requireGameLogin()->setReadOnly();
-$userID = Session::getUserID();
-
-//로그인 검사
-
-$isgen = Util::getReq('isgen');
-
-$leader1 = Util::getReq('leader1', 'int', 0);
-$power1 = Util::getReq('power1', 'int', 0);
-$intel1 = Util::getReq('intel1', 'int', 0);
-$type1 = Util::getReq('type1', 'int', 0);
-$crew1 = Util::getReq('crew1', 'int', 0);
-$train1 = Util::getReq('train1', 'int', 0);
-$atmos1 = Util::getReq('atmos1', 'int', 0);
-$level1 = Util::getReq('level1', 'int', 0);
-$explevel1 = Util::getReq('explevel1', 'int', 0);
-$tech1 = Util::getReq('tech1', 'int', 0);
-
-$dex10 = Util::getReq('dex10', 'int', 0);
-$dex110 = Util::getReq('dex110', 'int', 0);
-$dex120 = Util::getReq('dex120', 'int', 0);
-$dex130 = Util::getReq('dex130', 'int', 0);
-$dex140 = Util::getReq('dex140', 'int', 0);
-
-$dx10 = array_fill(0, 20, '');
-$dx110 = array_fill(0, 20, '');
-$dx120 = array_fill(0, 20, '');
-$dx130 = array_fill(0, 20, '');
-$dx140 = array_fill(0, 20, '');
-
-$leader2 = Util::getReq('leader2', 'int', 0);
-$power2 = Util::getReq('power2', 'int', 0);
-$intel2 = Util::getReq('intel2', 'int', 0);
-$type2 = Util::getReq('type2', 'int', 0);
-$crew2 = Util::getReq('crew2', 'int', 0);
-$train2 = Util::getReq('train2', 'int', 0);
-$atmos2 = Util::getReq('atmos2', 'int', 0);
-$level2 = Util::getReq('level2', 'int', 0);
-$explevel2 = Util::getReq('explevel2', 'int', 0);
-$tech2 = Util::getReq('tech2', 'int', 0);
-
-$dex20 = Util::getReq('dex20', 'int', 0);
-$dex210 = Util::getReq('dex210', 'int', 0);
-$dex220 = Util::getReq('dex220', 'int', 0);
-$dex230 = Util::getReq('dex230', 'int', 0);
-$dex240 = Util::getReq('dex240', 'int', 0);
-
-$dx20 = array_fill(0, 20, '');
-$dx210 = array_fill(0, 20, '');
-$dx220 = array_fill(0, 20, '');
-$dx230 = array_fill(0, 20, '');
-$dx240 = array_fill(0, 20, '');
-
-$def = Util::getReq('def', 'int', 0);
-$wall = Util::getReq('wall', 'int', 0);
-$atmos3 = Util::getReq('atmos3', 'int', 0);
-$train3 = Util::getReq('train3', 'int', 0);
-
-$sellevel1 = array_fill(0, 13, '');
-$sel1 = array_fill(0,44, '');
-$tch1 = array_fill(0,11, '');
-
-$sellevel2 = array_fill(0, 13, '');
-$sel2 = array_fill(0,44, '');
-$tch2 = array_fill(0,11, '');
-
-$dec = 0;
-$rice = 0;
-
-$db = DB::db();
-$gameStor = KVStorage::getStorage($db, 'game_env');
-$connect=$db->get();
-increaseRefresh("시뮬", 2);
-
-$query = "select no,tournament,con,turntime from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$admin = $gameStor->getAll();
-
-$con = checkLimit($me['con']);
-if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
-
-if($session->userGrade < 3) {
-    echo "특별회원이 아닙니다.";
-    exit();
-}
-
-$mydeathnumSum = 0;
-$mykillnumSum = 0;
-$expSum = 0;
-$ricingSum = 0;
-$expSum2 = 0;
-$ricingSum2 = 0;
-
-if($isgen == "장수평균" || $isgen == "성벽평균") {
-    $simulCount = 1000;
-} else {
-    $simulCount = 1;
-}
-
-$general = [
-    'no'=>1
-];
-$oppose = [
-    'no'=>2
-];
-$city = [
-    'gen1'=>0,
-    'gen2'=>0,
-    'gen3'=>0,
-];
-
-if($isgen == "장수공격" || $isgen == "성벽공격" || $isgen == "장수평균" || $isgen == "성벽평균") {
-    $msg2 = "";
-    for($i=0; $i < $simulCount; $i++) {
-        $general['leader'] = $leader1;
-        $general['power'] = $power1;
-        $general['intel'] = $intel1;
-        $general['crewtype'] = $type1;
-        $general['crew'] = $crew1;
-        $general['train'] = $train1;
-        $general['atmos'] = $atmos1;
-        $general['level'] = $level1;
-        $general['explevel'] = $explevel1;
-        $general['dex0'] = $dex10;
-        $general['dex10'] = $dex110;
-        $general['dex20'] = $dex120;
-        $general['dex30'] = $dex130;
-        $general['dex40'] = $dex140;
-
-        $general['injury'] = 0;
-        $general['horse'] = 0;
-        $general['weap'] = 0;
-        $general['book'] = 0;
-
-        $oppose['leader'] = $leader2;
-        $oppose['power'] = $power2;
-        $oppose['intel'] = $intel2;
-        $oppose['crewtype'] = $type2;
-        $oppose['crew'] = $crew2;
-        $oppose['train'] = $train2;
-        $oppose['atmos'] = $atmos2;
-        $oppose['level'] = $level2;
-        $oppose['explevel'] = $explevel2;
-        $oppose['dex0'] = $dex20;
-        $oppose['dex10'] = $dex210;
-        $oppose['dex20'] = $dex220;
-        $oppose['dex30'] = $dex230;
-        $oppose['dex40'] = $dex240;
-
-        $oppose['injury'] = 0;
-        $oppose['horse'] = 0;
-        $oppose['weap'] = 0;
-        $oppose['book'] = 0;
-
-        $city['def'] = $def;
-        $city['wall'] = $wall;
-        $city['agri'] = 0;
-        $city['comm'] = 0;
-        $city['secu'] = 0;
-
-        if($isgen == "장수공격" || $isgen == "장수평균") {
-            $opposecount = 1;
-        } else {
-            $opposecount = 0;
-        }
-
-        $warphase = getRate($admin, $general['crewtype'], "spd");   //병종간 페이즈 수 얻기
-
-        // 우선 스케일링
-        $city['def'] *= 10;
-        $city['wall'] *= 10;
-
-        $msg = "";
-        $msg .= "<C>●</>1월:공격장수가 <R>공격</>합니다.<br>";
-
-        $exp = 0;   //병사 소진 시킨 만큼
-        $opexp = 0;
-        $exp2 = 1;  //능력경험치
-        $phase = 0;
-        while($phase < $warphase) {
-            // 장수가 없어서 도시 공격
-            if($opposecount == 0) {
-                $josaRo = JosaUtil::pick(GameUnitConst::byID($general['crewtype'])->name, '로');
-                $msg .= "<C>●</>".GameUnitConst::byID($general['crewtype'])->name."{$josaRo} 성을 <M>공격</>합니다.<br>";
-
-                $mykillnum = 0; $mydeathnum = 0;
-                while($phase < $warphase) {
-                    $phase++;
-                    $myAtt = getAtt($general, $tech1, 0);
-                    $myDef = getDef($general, $tech1);
-                    $cityAtt = getCityAtt($city);
-                    $cityDef = getCityDef($city);
-
-                    // 감소할 병사 수
-                    $cityCrew = GameConst::$armperphase + $myAtt - $cityDef;
-                    $myCrew = GameConst::$armperphase + $cityAtt - $myDef;
-                    $cityweight = $myAtt - $cityDef;
-                    $myweight = $cityAtt - $myDef;
-
-                    //훈련 사기따라
-                    $myCrew = getCrew($myCrew, $atmos3, $general['train']);
-                    $cityCrew = getCrew($cityCrew, $general['atmos'], $train3);
-                    //숙련도 따라
-                    $genDexAtt = getGenDex($general, $general['crewtype']);
-                    $genDexDef = getGenDex($general, 40);
-                    $cityCrew *= getDexLog($genDexAtt, ($train3-60)*7200);
-                    $myCrew *= getDexLog(($atmos3-60)*7200, $genDexDef);
-
-                    $avoid = 1;
-                    // 병종간 특성
-                    if(intdiv($general['crewtype'], 10) == 3) {   // 귀병
-                        $int = $general['intel'] + getBookEff($general['book']);
-                        if($general['crewtype'] == 30) {
-                            $ratio2 = $int * 5;   // 0~500 즉 50%
-                        } elseif($general['crewtype'] == 31) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 32) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 33) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 34) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 35) {
-                            $ratio2 = $int * 8;   // 0~800 즉 80%
-                        } elseif($general['crewtype'] == 36) {
-                            $ratio2 = $int * 8;   // 0~800 즉 80%
-                        } elseif($general['crewtype'] == 37) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 38) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        }
-                        $ratio = rand() % 1000; // 0~999
-                        if($ratio <= $ratio2) {
-                            $ratio = rand() % 100; // 0~99
-                            if($ratio >= 30) {
-                                $type = rand() % 3;
-                                switch($type) {
-                                case 0:
-                                    $msg .= "<C>●</><D>급습</>을 <C>성공</>했다!<br>";
-                                    $cityCrew *= 1.2;
-                                    break;
-                                case 1:
-                                    $msg .= "<C>●</><D>위보</>를 <C>성공</>했다!<br>";
-                                    $cityCrew *= 1.4;
-                                    break;
-                                case 2:
-                                    $msg .= "<C>●</><D>혼란</>을 <C>성공</>했다!<br>";
-                                    $cityCrew *= 1.6;
-                                    break;
-                                }
-                            } else {
-                                $type = rand() % 3;
-                                switch($type) {
-                                case 0:
-                                    $msg .= "<C>●</><D>급습</>을 <R>실패</>했다!<br>";
-                                    $cityCrew /= 1.2;
-                                    $myCrew *= 1.2;
-                                    break;
-                                case 1:
-                                    $msg .= "<C>●</><D>위보</>를 <R>실패</>했다!<br>";
-                                    $cityCrew /= 1.4;
-                                    $myCrew *= 1.4;
-                                    break;
-                                case 2:
-                                $msg .= "<C>●</><D>혼란</>을 <R>실패</>했다!<br>";
-                                $cityCrew /= 1.6;
-                                $myCrew *= 1.6;
-                                    break;
-                                }
-                            }
-                        }
-                    } elseif($general['crewtype'] == 40) { // 정란
-                        $cityCrew = $cityCrew * 1.5;
-                    } elseif($general['crewtype'] == 41) { // 충차
-                        $cityCrew = $cityCrew * 2.0;
-                    } elseif($general['crewtype'] == 42) { // 벽력거
-                        $cityCrew = $cityCrew * 1.5;
-                    }
-                    //군주, 참모, 장군 공격 보정 5%
-                    if($general['level'] == 12 || $general['level'] == 11 || $general['level'] == 10 || $general['level'] == 8 || $general['level'] == 6) {
-                        $cityCrew = $cityCrew * 1.05;
-                    }
-                    //레벨 보정
-                    $cityCrew = $cityCrew * (100 + $general['explevel']/6)/100;
-
-                    //크리
-                    $rd = rand() % 100; // 0 ~ 99
-                    $ratio = CriticalRatio3($general['leader'], $general['power'], $general['intel']);
-                    if($ratio >= $rd && $avoid == 1) {
-                        $msg .= "<C>●</><C>필살</>공격!</><br>";
-                        $cityCrew = CriticalScore2($cityCrew);
-                        $avoid = 0;
-                    }
-                    //회피
-                    $ratio = rand() % 100; // 0 ~ 99
-                    $ratio2 = getRate($admin, $general['crewtype'], "avd");   //회피율
-                    if($ratio < $ratio2 && $avoid == 1) {
-                        $msg .= "<C>●</><C>회피</>했다!</><br>";
-                        $myCrew /= 10; // 10%만 소모
-                        $avoid = 0;
-                    }
-
-                    //랜타추가
-                    $cityCrew *= (rand() % 21 + 90)/100; // 90~110%
-                    $myCrew *= (rand() % 21 + 90)/100; // 90~110%
-
-                    $general['crew'] -= Util::round($myCrew);
-                    $city['def'] -= Util::round($cityCrew);
-                    $city['wall'] -= Util::round($cityCrew);
-
-                    $tempMyCrew = $myCrew; $tempCityCrew = $cityCrew;
-                    $tempGeneralCrew = $general['crew']; $tempCityDef = $city['def'];
-
-                    if($city['wall'] <= 0) { $city['wall'] = 0; }
-
-                    if($city['def'] < 0) {
-                        $offset =  Util::round($tempCityDef*$tempMyCrew/$tempCityCrew);
-                        $myCrew += $offset;
-                        $general['crew'] -= $offset;
-                        $cityCrew += $tempCityDef;
-                        $city['def'] = 0;
-                    }
-                    if($general['crew'] < 0) {
-                        $offset =  Util::round($tempGeneralCrew*$tempCityCrew/$tempMyCrew);
-                        $cityCrew += $offset;
-                        $city['def'] -= $offset;
-                        $myCrew += $tempGeneralCrew;
-                        $general['crew'] = 0;
-                    }
-
-                    $exp += $cityCrew;
-                    $opexp += $myCrew;
-                    $general['crew'] = Util::round($general['crew']);
-                    $cityCrew = Util::round($cityCrew);
-                    $myCrew =  Util::round($myCrew);
-                    $myAtt = round($myAtt, 2);
-                    $myDef = round($myDef, 2);
-                    $cityAtt = round($cityAtt, 2);
-                    $cityDef = round($cityDef, 2);
-                    $msg .= "<C>●</> $phase : <Y1>【공격장수】</> <C>{$general['crew']} (-$myCrew)</> VS <C>{$city['def']} (-$cityCrew)</> <Y1>【성벽】</><br>";
-
-                    $mykillnum += $cityCrew; $mydeathnum += $myCrew;
-
-                    if($city['def'] <= 0) { break; }
-                    if($general['crew'] <= 0) { break; }
-                }
-
-                // 도시쌀 소모 계산
-                $opexp =  Util::round($opexp / 50);
-                $rice = Util::round($opexp * 4 * getCrewtypeRice(0, 0) * ($train3/100 - 0.2));
-
-                //원래대로 스케일링
-                $city['def'] = Util::round($city['def'] / 10);
-                $city['wall'] = Util::round($city['wall'] / 10);
-                //내정 감소
-                $dec =  Util::round($cityCrew / 10);
-                $city['agri'] -= $dec;
-                $city['comm'] -= $dec;
-                $city['secu'] -= $dec;
-                if($city['agri'] < 0) { $city['agri'] = 0; }
-                if($city['comm'] < 0) { $city['comm'] = 0; }
-                if($city['secu'] < 0) { $city['secu'] = 0; }
-                $msg .= "<S>★</>병사수 변화 : <C>-$mydeathnum</> vs <C>-$mykillnum</><br>";
-                $msg .= "<R>★</>【성벽】내정 감소량 : $dec 【성벽】쌀 소모 : $rice<br>";
-
-//                $msg2 .= "<S>★</>병사수 변화 : <C>-$mydeathnum</> vs <C>-$mykillnum</>　　　";
-//                $msg2 .= "<R>★</>【성벽】내정 감소량 : $dec 【성벽】쌀 소모 : $rice<br>";
-
-                if($city['def'] == 0 || $general['crew'] == 0) {
-                    break;
-                }
-            // 장수 대결
-            } else {
-                $josaUl = JosaUtil::pick(GameUnitConst::byID($oppose['crewtype'])->name, '을');
-                $josaRo = JosaUtil::pick(GameUnitConst::byID($general['crewtype'])->name, '로');
-                $msg .= "<C>●</>".GameUnitConst::byID($general['crewtype'])->name."{$josaRo} <Y>수비장수</>의 ".GameUnitConst::byID($oppose['crewtype'])->name."{$josaUl} 공격합니다.<br>";
-
-                $mykillnum = 0; $mydeathnum = 0;
-                while($phase < $warphase) {
-                    $phase++;
-
-                    $myAtt = getAtt($general, $tech1, 0);
-                    $myDef = getDef($general, $tech1);
-                    $opAtt = getAtt($oppose, $tech2, 0);
-                    $opDef = getDef($oppose, $tech2);
-                    // 감소할 병사 수
-                    $myCrew = GameConst::$armperphase + $opAtt - $myDef;
-                    $opCrew = GameConst::$armperphase + $myAtt - $opDef;
-                    //훈련 사기따라
-                    $myCrew = getCrew($myCrew, $oppose['atmos'], $general['train']);
-                    $opCrew = getCrew($opCrew, $general['atmos'], $oppose['train']);
-                    //숙련도 따라
-                    $genDexAtt = getGenDex($general, $general['crewtype']);
-                    $genDexDef = getGenDex($general, $oppose['crewtype']);
-                    $oppDexAtt = getGenDex($oppose, $oppose['crewtype']);
-                    $oppDexDef = getGenDex($oppose, $general['crewtype']);
-                    $opCrew *= getDexLog($genDexAtt, $oppDexDef);
-                    $myCrew *= getDexLog($oppDexAtt, $genDexDef);
-
-                    $myAvoid = 1;
-                    $opAvoid = 1;
-                    // 병종간 특성
-                    if(intdiv($general['crewtype'], 10) == 3) {   // 귀병
-                        $int = $general['intel'] + getBookEff($general['book']);
-                        if($general['crewtype'] == 30) {
-                            $ratio2 = $int * 5;   // 0~500 즉 50%
-                        } elseif($general['crewtype'] == 31) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 32) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 33) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 34) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 35) {
-                            $ratio2 = $int * 8;   // 0~800 즉 80%
-                        } elseif($general['crewtype'] == 36) {
-                            $ratio2 = $int * 8;   // 0~800 즉 80%
-                        } elseif($general['crewtype'] == 37) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($general['crewtype'] == 38) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        }
-                        $ratio = rand() % 1000; // 0~999
-                        if($ratio <= $ratio2) {
-                            $ratio = rand() % 100;
-                            if($ratio >= 30) {
-                                $type = rand() % 5; // 0~4
-                                switch($type) {
-                                case 0:
-                                    $msg .= "<C>●</><D>위보</>를 <C>성공</>했다!<br>";
-                                    $opCrew *= 1.2;
-                                    break;
-                                case 1:
-                                    $msg .= "<C>●</><D>매복</>을 <C>성공</>했다!<br>";
-                                    $opCrew *= 1.4;
-                                    break;
-                                case 2:
-                                    $msg .= "<C>●</><D>반목</>을 <C>성공</>했다!<br>";
-                                    $opCrew *= 1.6;
-                                    break;
-                                case 3:
-                                    $msg .= "<C>●</><D>화계</>를 <C>성공</>했다!<br>";
-                                    $opCrew *= 1.8;
-                                    break;
-                                case 4:
-                                    $msg .= "<C>●</><D>혼란</>을 <C>성공</>했다!<br>";
-                                    $opCrew *= 2.0;
-                                    break;
-                                }
-                            } else {
-                                $type = rand() % 5; // 0~4
-                                switch($type) {
-                                case 0:
-                                    $msg .= "<C>●</><D>위보</>를 <R>실패</>했다!<br>";
-                                    $opCrew /= 1.1;
-                                    $myCrew *= 1.1;
-                                    break;
-                                case 1:
-                                    $msg .= "<C>●</><D>매복</>을 <R>실패</>했다!<br>";
-                                    $opCrew /= 1.2;
-                                    $myCrew *= 1.2;
-                                    break;
-                                case 2:
-                                    $msg .= "<C>●</><D>반목</>을 <R>실패</>했다!<br>";
-                                    $opCrew /= 1.3;
-                                    $myCrew *= 1.3;
-                                    break;
-                                case 3:
-                                    $msg .= "<C>●</><D>화계</>를 <R>실패</>했다!<br>";
-                                    $opCrew /= 1.4;
-                                    $myCrew *= 1.4;
-                                    break;
-                                case 4:
-                                    $msg .= "<C>●</><D>혼란</>을 <R>실패</>했다!<br>";
-                                    $opCrew /= 1.5;
-                                    $myCrew *= 1.5;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    // 상대 장수 병종간 특성
-                    if(intdiv($oppose['crewtype'], 10) == 3) {   // 귀병
-                        $int = $oppose['intel'] + getBookEff($oppose['book']);
-                        if($oppose['crewtype'] == 30) {
-                            $ratio2 = $int * 5;   // 0~500 즉 50%
-                        } elseif($oppose['crewtype'] == 31) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($oppose['crewtype'] == 32) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($oppose['crewtype'] == 33) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($oppose['crewtype'] == 34) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($oppose['crewtype'] == 35) {
-                            $ratio2 = $int * 8;   // 0~800 즉 80%
-                        } elseif($oppose['crewtype'] == 36) {
-                            $ratio2 = $int * 8;   // 0~800 즉 80%
-                        } elseif($oppose['crewtype'] == 37) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        } elseif($oppose['crewtype'] == 38) {
-                            $ratio2 = $int * 6;   // 0~600 즉 60%
-                        }
-                        $ratio = rand() % 1000; // 0~999
-                        if($ratio <= $ratio2) {
-                            $ratio = rand() % 100;
-                            if($ratio >= 30) {
-                                $type = rand() % 5; // 0~4
-                                switch($type) {
-                                case 0:
-                                    $msg .= "<C>●</><D>위보</>에 당했다!<br>";
-                                    $myCrew *= 1.2;
-                                    break;
-                                case 1:
-                                    $msg .= "<C>●</><D>매복</>에 당했다!<br>";
-                                    $myCrew *= 1.4;
-                                    break;
-                                case 2:
-                                    $msg .= "<C>●</><D>반목</>에 당했다!<br>";
-                                    $myCrew *= 1.6;
-                                    break;
-                                case 3:
-                                    $msg .= "<C>●</><D>화계</>에 당했다!<br>";
-                                    $myCrew *= 1.8;
-                                    break;
-                                case 4:
-                                    $msg .= "<C>●</><D>혼란</>에 당했다!<br>";
-                                    $myCrew *= 2.0;
-                                    break;
-                                }
-                            } else {
-                                $type = rand() % 5; // 0~4
-                                switch($type) {
-                                case 0:
-                                    $msg .= "<C>●</><D>위보</>를 간파했다!<br>";
-                                    $myCrew /= 1.1;
-                                    $opCrew *= 1.1;
-                                    break;
-                                case 1:
-                                    $msg .= "<C>●</><D>매복</>을 간파했다!<br>";
-                                    $myCrew /= 1.2;
-                                    $opCrew *= 1.2;
-                                    break;
-                                case 2:
-                                    $msg .= "<C>●</><D>반목</>을 간파했다!<br>";
-                                    $myCrew /= 1.3;
-                                    $opCrew *= 1.3;
-                                    break;
-                                case 3:
-                                    $msg .= "<C>●</><D>화계</>를 간파했다!<br>";
-                                    $myCrew /= 1.4;
-                                    $opCrew *= 1.4;
-                                    break;
-                                case 4:
-                                    $msg .= "<C>●</><D>혼란</>을 간파했다!<br>";
-                                    $myCrew /= 1.5;
-                                    $opCrew *= 1.5;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    if($oppose['crewtype'] == 43) { // 목우
-                        $r = 0;
-                        $r += $oppose['atmos'];
-                        $r += $oppose['train'];
-                        $ratio = rand() % 400;  // 최대 50% 저지
-                        if($ratio < $r && $opAvoid == 1) {
-                            $msg .= "<C>●</><R>저지</>당했다!</><br>";
-                            $opAvoid = 0;
-                            continue;
-                        }
-                    }
-
-                    // my 입장 상성
-                    // 보병계열 > 궁병계열
-                    if(intdiv($general['crewtype'], 10) == 0 && intdiv($oppose['crewtype'], 10) == 1) {
-                        $myCrew *= 0.8;
-                        $opCrew *= 1.2;
-                    }
-                    // 궁병계열 > 기병계열
-                    if(intdiv($general['crewtype'], 10) == 1 && intdiv($oppose['crewtype'], 10) == 2) {
-                        $myCrew *= 0.8;
-                        $opCrew *= 1.2;
-                    }
-                    // 기병계열 > 보병계열
-                    if(intdiv($general['crewtype'], 10) == 2 && intdiv($oppose['crewtype'], 10) == 0) {
-                        $myCrew *= 0.8;
-                        $opCrew *= 1.2;
-                    }
-                    // 차병계열
-                    if(intdiv($general['crewtype'], 10) == 4) {
-                        $myCrew *= 1.2;
-                        $opCrew *= 0.8;
-                    }
-
-                    // op 입장 상성
-                    // 보병계열 > 궁병계열
-                    if(intdiv($oppose['crewtype'], 10) == 0 && intdiv($general['crewtype'], 10) == 1) {
-                        $opCrew *= 0.8;
-                        $myCrew *= 1.2;
-                    }
-                    // 궁병계열 > 기병계열
-                    if(intdiv($oppose['crewtype'], 10) == 1 && intdiv($general['crewtype'], 10) == 2) {
-                        $opCrew *= 0.8;
-                        $myCrew *= 1.2;
-                    }
-                    // 기병계열 > 보병계열
-                    if(intdiv($oppose['crewtype'], 10) == 2 && intdiv($general['crewtype'], 10) == 0) {
-                        $opCrew *= 0.8;
-                        $myCrew *= 1.2;
-                    }
-                    // 차병계열
-                    if(intdiv($oppose['crewtype'], 10) == 4) {
-                        $opCrew *= 1.2;
-                        $myCrew *= 0.8;
-                    }
-
-                    //군주, 참모, 장군 공격 보정 5%
-                    if($general['level'] == 12 || $general['level'] == 11 || $general['level'] == 10 || $general['level'] == 8 || $general['level'] == 6) {
-                        $opCrew = $opCrew * 1.05;
-                    }
-                    //상대장수 관직 보정
-                    //군주, 참모, 모사 방어 보정 5%
-                    if($oppose['level'] == 12 || $oppose['level'] == 11 || $oppose['level'] == 9 || $oppose['level'] == 7 || $oppose['level'] == 5) {
-                        $opCrew = $opCrew * 0.95;
-                    } elseif($oppose['level'] == 4 && $oppose['no'] == $city['gen1']) { // 태수 보정
-                        $opCrew = $opCrew * 0.95;
-                    } elseif($oppose['level'] == 3 && $oppose['no'] == $city['gen2']) { // 군사 보정
-                        $opCrew = $opCrew * 0.95;
-                    } elseif($oppose['level'] == 2 && $oppose['no'] == $city['gen3']) { // 시중 보정
-                        $opCrew = $opCrew * 0.95;
-                    }
-
-                    //레벨 보정
-                    $myCrew = $myCrew * ((100 - $general['explevel']/3)/100);
-                    $opCrew = $opCrew / ((100 - $general['explevel']/3)/100);
-                    $myCrew = $myCrew / ((100 -  $oppose['explevel']/3)/100);
-                    $opCrew = $opCrew * ((100 -  $oppose['explevel']/3)/100);
-
-                    //크리
-                    $rd = rand() % 100; // 0 ~ 99
-                    $ratio = CriticalRatio3($general['leader'], $general['power'], $general['intel']);
-                    if($ratio >= $rd && $myAvoid == 1) {
-                        $msg .= "<C>●</><C>필살</>공격!</><br>";
-                        $opCrew = CriticalScore2($opCrew);
-                        $myAvoid = 0;
-                    }
-                    //크리
-                    $rd = rand() % 100; // 0 ~ 99
-                    $ratio = CriticalRatio3($oppose['leader'], $oppose['power'], $oppose['intel']);
-                    if($ratio >= $rd && $opAvoid == 1) {
-                        $msg .= "<C>●</>상대의 <R>필살</>공격!</><br>";
-                        $myCrew = CriticalScore2($myCrew);
-                        $opAvoid = 0;
-                    }
-                    //회피
-                    $ratio = rand() % 100; // 0 ~ 99
-                    $ratio2 = getRate($admin, $general['crewtype'], "avd");   //회피율
-                    if($ratio < $ratio2 && $myAvoid == 1) {
-                        $msg .= "<C>●</><C>회피</>했다!</><br>";
-                        $myCrew /= 10; // 10%만 소모
-                        $myAvoid = 0;
-                    }
-                    //회피
-                    $ratio = rand() % 100; // 0 ~ 99
-                    $ratio2 = getRate($admin, $oppose['crewtype'], "avd");   //회피율
-                    if($ratio < $ratio2 && $opAvoid == 1) {
-                        $msg .= "<C>●</>상대가 <R>회피</>했다!</><br>";
-                        $opCrew /= 10; // 10%만 소모
-                        $opAvoid = 0;
-                    }
-
-                    //랜타추가
-                    $opCrew *= (rand() % 21 + 90)/100; // 90~110%
-                    $myCrew *= (rand() % 21 + 90)/100; // 90~110%
-
-                    $general['crew'] -=  Util::round($myCrew);
-                    $oppose['crew'] -=  Util::round($opCrew);
-                    $tempMyCrew = $myCrew; $tempOpCrew = $opCrew;
-                    $tempGeneralCrew = $general['crew']; $tempOpposeCrew = $oppose['crew'];
-                    if($general['crew'] <= 0 && $oppose['crew'] <= 0) {
-                        $r1 = $tempGeneralCrew / $tempMyCrew;
-                        $r2 = $tempOpposeCrew / $tempOpCrew;
-
-                        if($r1 > $r2) {
-                            $offset =  Util::round($tempOpposeCrew*$tempMyCrew/$tempOpCrew);
-                            $myCrew += $offset;
-                            $general['crew'] -= $offset;
-                            $opCrew += $tempOpposeCrew;
-                            $oppose['crew'] = 0;
-                        } else {
-                            $offset =  Util::round($tempGeneralCrew*$tempOpCrew/$tempMyCrew);
-                            $opCrew += $offset;
-                            $oppose['crew'] -= $offset;
-                            $myCrew += $tempGeneralCrew;
-                            $general['crew'] = 0;
-                        }
-                    } elseif($general['crew'] * $oppose['crew'] <= 0) {
-                        if($oppose['crew'] < 0) {
-                            $offset = Util::round($tempOpposeCrew*$tempMyCrew/$tempOpCrew);
-                            $myCrew += $offset;
-                            $general['crew'] -= $offset;
-                            $opCrew += $tempOpposeCrew;
-                            $oppose['crew'] = 0;
-                        }
-                        if($general['crew'] < 0) {
-                            $offset = Util::round($tempGeneralCrew*$tempOpCrew/$tempMyCrew);
-                            $opCrew += $offset;
-                            $oppose['crew'] -= $offset;
-                            $myCrew += $tempGeneralCrew;
-                            $general['crew'] = 0;
-                        }
-                    }
-
-                    $exp += $opCrew;
-                    $opexp += $myCrew;
-                    $general['crew'] = Util::round($general['crew']);
-                    $oppose['crew'] = Util::round($oppose['crew']);
-                    $myCrew = Util::round($myCrew);
-                    $opCrew = Util::round($opCrew);
-                    $myAtt = round($myAtt, 2);
-                    $myDef = round($myDef, 2);
-                    $opAtt = round($opAtt, 2);
-                    $opDef = round($opDef, 2);
-                    $msg .= "<C>●</> $phase : <Y1>【공격장수】</> <C>{$general['crew']} (-$myCrew)</> VS <C>{$oppose['crew']} (-$opCrew)</> <Y1>【수비장수】</><br>";
-
-                    $mykillnum += $opCrew; $mydeathnum += $myCrew;
-
-                    if($oppose['crew'] <= 0) { break; }
-                    if($general['crew'] <= 0) { break; }
-                }
-
-                $msg .= "<S>★</>병사수 변화 : <C>-$mydeathnum</> vs <C>-$mykillnum</><br>";
-//                $msg2 .= "<S>★</>병사수 변화 : <C>-$mydeathnum</> vs <C>-$mykillnum</>　　　";
-            }
-        }
-
-        // 공헌, 명성 상승
-        $exp = Util::round($exp / 50);
-        $ricing = ($exp * 5 * getCrewtypeRice($general['crewtype'], $tech1));
-        $msg .= "★ 【공격장수】공헌 상승 : $exp 쌀 소비 : {$exp}x5x".getCrewtypeRice($general['crewtype'], $tech1)." = $ricing<br>";
-//        $msg2 .= "★ 【공격장수】공헌 상승 : $exp 쌀 소비 : {$exp}x5x".getCrewtypeRice($general['crewtype'], $tech1)." = $ricing<br>";
-
-        $msg = ConvertLog($msg, 1);
-
-        $mydeathnumSum += $mydeathnum;
-        $mykillnumSum += $mykillnum;
-        $expSum += $exp;
-        $ricingSum += $ricing;
-        $expSum2 += $dec;
-        $ricingSum2 += $rice;
-    }
-
-    $mydeathnumSum /= $simulCount;
-    $mykillnumSum /= $simulCount;
-    $expSum /= $simulCount;
-    $ricingSum /= $simulCount;
-    $expSum2 /= $simulCount;
-    $ricingSum2 /= $simulCount;
-    if($isgen == "성벽평균") {
-        $msg2 .= "{$simulCount}회 평균<br>";
-        $msg2 .= "<S>★</>병사수 변화 : <C>-$mydeathnumSum</> vs <C>-$mykillnumSum</>　　　";
-        $msg2 .= "<R>★</>【성벽】내정 감소량 : $expSum2 【성벽】쌀 소모 : $ricingSum2<br>";
-        $msg2 .= "★ 【공격장수】공헌 상승 : $expSum 쌀 소비 : {$expSum}x5x".getCrewtypeRice($general['crewtype'], $tech1)." = $ricingSum<br>";
-    } elseif($isgen == "장수평균") {
-        $msg2 .= "{$simulCount}회 평균<br>";
-        $msg2 .= "<S>★</>병사수 변화 : <C>-$mydeathnumSum</> vs <C>-$mykillnumSum</>　　　";
-        $msg2 .= "★ 【공격장수】공헌 상승 : $expSum 쌀 소비 : {$expSum}x5x".getCrewtypeRice($general['crewtype'], $tech1)." = $ricingSum<br>";
-    }
-
-    $msg2 = ConvertLog($msg2, 1);
-} else {
-    $leader1 = 70;
-    $power1 = 70;
-    $intel1 = 10;
-    $type1 = 0;
-    $crew1 = 7000;
-    $train1 = 100;
-    $atmos1 = 100;
-    $level1 = 1;
-    $explevel1 = 20;
-
-    $leader2 = 70;
-    $power2 = 70;
-    $intel2 = 10;
-    $type2 = 0;
-    $crew2 = 7000;
-    $train2 = 100;
-    $atmos2 = 100;
-    $level2 = 1;
-    $explevel2 = 20;
-
-    $def = 7000;
-    $wall = 7000;
-    $train3 = $admin['city_rate'];
-    $atmos3 = $admin['city_rate'];
-}
-
-switch($level1) {
-    case 12: $sellevel1[12] = "selected"; break;
-    case 11: $sellevel1[11] = "selected"; break;
-    case 10: $sellevel1[10] = "selected"; break;
-    case 9: $sellevel1[9] = "selected"; break;
-    case 8: $sellevel1[8] = "selected"; break;
-    case 7: $sellevel1[7] = "selected"; break;
-    case 6: $sellevel1[6] = "selected"; break;
-    case 5: $sellevel1[5] = "selected"; break;
-    case 1: $sellevel1[1] = "selected"; break;
-}
-switch($level2) {
-    case 12: $sellevel2[12] = "selected"; break;
-    case 11: $sellevel2[11] = "selected"; break;
-    case 10: $sellevel2[10] = "selected"; break;
-    case 9: $sellevel2[9] = "selected"; break;
-    case 8: $sellevel2[8] = "selected"; break;
-    case 7: $sellevel2[7] = "selected"; break;
-    case 6: $sellevel2[6] = "selected"; break;
-    case 5: $sellevel2[5] = "selected"; break;
-    case 1: $sellevel2[1] = "selected"; break;
-}
-
-switch($type1) {
-    case 0: $sel1[0] = "selected"; break;
-    case 1: $sel1[1] = "selected"; break;
-    case 2: $sel1[2] = "selected"; break;
-    case 3: $sel1[3] = "selected"; break;
-    case 4: $sel1[4] = "selected"; break;
-    case 5: $sel1[5] = "selected"; break;
-    case 10: $sel1[10] = "selected"; break;
-    case 11: $sel1[11] = "selected"; break;
-    case 12: $sel1[12] = "selected"; break;
-    case 13: $sel1[13] = "selected"; break;
-    case 14: $sel1[14] = "selected"; break;
-    case 20: $sel1[20] = "selected"; break;
-    case 21: $sel1[21] = "selected"; break;
-    case 22: $sel1[22] = "selected"; break;
-    case 23: $sel1[23] = "selected"; break;
-    case 24: $sel1[24] = "selected"; break;
-    case 25: $sel1[25] = "selected"; break;
-    case 26: $sel1[26] = "selected"; break;
-    case 27: $sel1[27] = "selected"; break;
-    case 30: $sel1[30] = "selected"; break;
-    case 31: $sel1[31] = "selected"; break;
-    case 32: $sel1[32] = "selected"; break;
-    case 33: $sel1[33] = "selected"; break;
-    case 34: $sel1[34] = "selected"; break;
-    case 35: $sel1[35] = "selected"; break;
-    case 36: $sel1[36] = "selected"; break;
-    case 37: $sel1[37] = "selected"; break;
-    case 38: $sel1[38] = "selected"; break;
-    case 40: $sel1[40] = "selected"; break;
-    case 41: $sel1[41] = "selected"; break;
-    case 42: $sel1[42] = "selected"; break;
-    case 43: $sel1[43] = "selected"; break;
-}
-switch($type2) {
-    case 0: $sel2[0] = "selected"; break;
-    case 1: $sel2[1] = "selected"; break;
-    case 2: $sel2[2] = "selected"; break;
-    case 3: $sel2[3] = "selected"; break;
-    case 4: $sel2[4] = "selected"; break;
-    case 5: $sel2[5] = "selected"; break;
-    case 10: $sel2[10] = "selected"; break;
-    case 11: $sel2[11] = "selected"; break;
-    case 12: $sel2[12] = "selected"; break;
-    case 13: $sel2[13] = "selected"; break;
-    case 14: $sel2[14] = "selected"; break;
-    case 20: $sel2[20] = "selected"; break;
-    case 21: $sel2[21] = "selected"; break;
-    case 22: $sel2[22] = "selected"; break;
-    case 23: $sel2[23] = "selected"; break;
-    case 24: $sel2[24] = "selected"; break;
-    case 25: $sel2[25] = "selected"; break;
-    case 26: $sel2[26] = "selected"; break;
-    case 27: $sel2[27] = "selected"; break;
-    case 30: $sel2[30] = "selected"; break;
-    case 31: $sel2[31] = "selected"; break;
-    case 32: $sel2[32] = "selected"; break;
-    case 33: $sel2[33] = "selected"; break;
-    case 34: $sel2[34] = "selected"; break;
-    case 35: $sel2[35] = "selected"; break;
-    case 36: $sel2[36] = "selected"; break;
-    case 37: $sel2[37] = "selected"; break;
-    case 38: $sel2[38] = "selected"; break;
-    case 40: $sel2[40] = "selected"; break;
-    case 41: $sel2[41] = "selected"; break;
-    case 42: $sel2[42] = "selected"; break;
-    case 43: $sel2[43] = "selected"; break;
-}
-switch($tech1) {
-    case     0: $tch1[0]  = "selected"; break;
-    case  1000: $tch1[1]  = "selected"; break;
-    case  2000: $tch1[2]  = "selected"; break;
-    case  3000: $tch1[3]  = "selected"; break;
-    case  4000: $tch1[4]  = "selected"; break;
-    case  5000: $tch1[5]  = "selected"; break;
-    case  6000: $tch1[6]  = "selected"; break;
-    case  7000: $tch1[7]  = "selected"; break;
-    case  8000: $tch1[8]  = "selected"; break;
-    case  9000: $tch1[9]  = "selected"; break;
-    case 10000: $tch1[10]  = "selected"; break;
-}
-switch($tech2) {
-    case     0: $tch2[0]  = "selected"; break;
-    case  1000: $tch2[1]  = "selected"; break;
-    case  2000: $tch2[2]  = "selected"; break;
-    case  3000: $tch2[3]  = "selected"; break;
-    case  4000: $tch2[4]  = "selected"; break;
-    case  5000: $tch2[5]  = "selected"; break;
-    case  6000: $tch2[6]  = "selected"; break;
-    case  7000: $tch2[7]  = "selected"; break;
-    case  8000: $tch2[8]  = "selected"; break;
-    case  9000: $tch2[9]  = "selected"; break;
-    case 10000: $tch2[10]  = "selected"; break;
-}
-switch($dex10) {
-    case      0: $dx10[0]  = "selected"; break;
-    case   2500: $dx10[1]  = "selected"; break;
-    case   7500: $dx10[2]  = "selected"; break;
-    case  15000: $dx10[3]  = "selected"; break;
-    case  25000: $dx10[4]  = "selected"; break;
-    case  37500: $dx10[5]  = "selected"; break;
-    case  52500: $dx10[6]  = "selected"; break;
-    case  70000: $dx10[7]  = "selected"; break;
-    case  90000: $dx10[8]  = "selected"; break;
-    case 112500: $dx10[9]  = "selected"; break;
-    case 137500: $dx10[10] = "selected"; break;
-    case 165000: $dx10[11] = "selected"; break;
-    case 195000: $dx10[12] = "selected"; break;
-    case 227500: $dx10[13] = "selected"; break;
-    case 262500: $dx10[14] = "selected"; break;
-    case 300000: $dx10[15] = "selected"; break;
-    case 340000: $dx10[16] = "selected"; break;
-    case 382500: $dx10[17] = "selected"; break;
-    case 427500: $dx10[18] = "selected"; break;
-}
-switch($dex110) {
-    case      0: $dx110[0]  = "selected"; break;
-    case   2500: $dx110[1]  = "selected"; break;
-    case   7500: $dx110[2]  = "selected"; break;
-    case  15000: $dx110[3]  = "selected"; break;
-    case  25000: $dx110[4]  = "selected"; break;
-    case  37500: $dx110[5]  = "selected"; break;
-    case  52500: $dx110[6]  = "selected"; break;
-    case  70000: $dx110[7]  = "selected"; break;
-    case  90000: $dx110[8]  = "selected"; break;
-    case 112500: $dx110[9]  = "selected"; break;
-    case 137500: $dx110[10] = "selected"; break;
-    case 165000: $dx110[11] = "selected"; break;
-    case 195000: $dx110[12] = "selected"; break;
-    case 227500: $dx110[13] = "selected"; break;
-    case 262500: $dx110[14] = "selected"; break;
-    case 300000: $dx110[15] = "selected"; break;
-    case 340000: $dx110[16] = "selected"; break;
-    case 382500: $dx110[17] = "selected"; break;
-    case 427500: $dx110[18] = "selected"; break;
-}
-switch($dex120) {
-    case      0: $dx120[0]  = "selected"; break;
-    case   2500: $dx120[1]  = "selected"; break;
-    case   7500: $dx120[2]  = "selected"; break;
-    case  15000: $dx120[3]  = "selected"; break;
-    case  25000: $dx120[4]  = "selected"; break;
-    case  37500: $dx120[5]  = "selected"; break;
-    case  52500: $dx120[6]  = "selected"; break;
-    case  70000: $dx120[7]  = "selected"; break;
-    case  90000: $dx120[8]  = "selected"; break;
-    case 112500: $dx120[9]  = "selected"; break;
-    case 137500: $dx120[10] = "selected"; break;
-    case 165000: $dx120[11] = "selected"; break;
-    case 195000: $dx120[12] = "selected"; break;
-    case 227500: $dx120[13] = "selected"; break;
-    case 262500: $dx120[14] = "selected"; break;
-    case 300000: $dx120[15] = "selected"; break;
-    case 340000: $dx120[16] = "selected"; break;
-    case 382500: $dx120[17] = "selected"; break;
-    case 427500: $dx120[18] = "selected"; break;
-}
-switch($dex130) {
-    case      0: $dx130[0]  = "selected"; break;
-    case   2500: $dx130[1]  = "selected"; break;
-    case   7500: $dx130[2]  = "selected"; break;
-    case  15000: $dx130[3]  = "selected"; break;
-    case  25000: $dx130[4]  = "selected"; break;
-    case  37500: $dx130[5]  = "selected"; break;
-    case  52500: $dx130[6]  = "selected"; break;
-    case  70000: $dx130[7]  = "selected"; break;
-    case  90000: $dx130[8]  = "selected"; break;
-    case 112500: $dx130[9]  = "selected"; break;
-    case 137500: $dx130[10] = "selected"; break;
-    case 165000: $dx130[11] = "selected"; break;
-    case 195000: $dx130[12] = "selected"; break;
-    case 227500: $dx130[13] = "selected"; break;
-    case 262500: $dx130[14] = "selected"; break;
-    case 300000: $dx130[15] = "selected"; break;
-    case 340000: $dx130[16] = "selected"; break;
-    case 382500: $dx130[17] = "selected"; break;
-    case 427500: $dx130[18] = "selected"; break;
-}
-switch($dex140) {
-    case      0: $dx140[0]  = "selected"; break;
-    case   2500: $dx140[1]  = "selected"; break;
-    case   7500: $dx140[2]  = "selected"; break;
-    case  15000: $dx140[3]  = "selected"; break;
-    case  25000: $dx140[4]  = "selected"; break;
-    case  37500: $dx140[5]  = "selected"; break;
-    case  52500: $dx140[6]  = "selected"; break;
-    case  70000: $dx140[7]  = "selected"; break;
-    case  90000: $dx140[8]  = "selected"; break;
-    case 112500: $dx140[9]  = "selected"; break;
-    case 137500: $dx140[10] = "selected"; break;
-    case 165000: $dx140[11] = "selected"; break;
-    case 195000: $dx140[12] = "selected"; break;
-    case 227500: $dx140[13] = "selected"; break;
-    case 262500: $dx140[14] = "selected"; break;
-    case 300000: $dx140[15] = "selected"; break;
-    case 340000: $dx140[16] = "selected"; break;
-    case 382500: $dx140[17] = "selected"; break;
-    case 427500: $dx140[18] = "selected"; break;
-}
-switch($dex20) {
-    case      0: $dx20[0]  = "selected"; break;
-    case   2500: $dx20[1]  = "selected"; break;
-    case   7500: $dx20[2]  = "selected"; break;
-    case  15000: $dx20[3]  = "selected"; break;
-    case  25000: $dx20[4]  = "selected"; break;
-    case  37500: $dx20[5]  = "selected"; break;
-    case  52500: $dx20[6]  = "selected"; break;
-    case  70000: $dx20[7]  = "selected"; break;
-    case  90000: $dx20[8]  = "selected"; break;
-    case 112500: $dx20[9]  = "selected"; break;
-    case 137500: $dx20[10] = "selected"; break;
-    case 165000: $dx20[11] = "selected"; break;
-    case 195000: $dx20[12] = "selected"; break;
-    case 227500: $dx20[13] = "selected"; break;
-    case 262500: $dx20[14] = "selected"; break;
-    case 300000: $dx20[15] = "selected"; break;
-    case 340000: $dx20[16] = "selected"; break;
-    case 382500: $dx20[17] = "selected"; break;
-    case 427500: $dx20[18] = "selected"; break;
-}
-switch($dex210) {
-    case      0: $dx210[0]  = "selected"; break;
-    case   2500: $dx210[1]  = "selected"; break;
-    case   7500: $dx210[2]  = "selected"; break;
-    case  15000: $dx210[3]  = "selected"; break;
-    case  25000: $dx210[4]  = "selected"; break;
-    case  37500: $dx210[5]  = "selected"; break;
-    case  52500: $dx210[6]  = "selected"; break;
-    case  70000: $dx210[7]  = "selected"; break;
-    case  90000: $dx210[8]  = "selected"; break;
-    case 112500: $dx210[9]  = "selected"; break;
-    case 137500: $dx210[10] = "selected"; break;
-    case 165000: $dx210[11] = "selected"; break;
-    case 195000: $dx210[12] = "selected"; break;
-    case 227500: $dx210[13] = "selected"; break;
-    case 262500: $dx210[14] = "selected"; break;
-    case 300000: $dx210[15] = "selected"; break;
-    case 340000: $dx210[16] = "selected"; break;
-    case 382500: $dx210[17] = "selected"; break;
-    case 427500: $dx210[18] = "selected"; break;
-}
-switch($dex220) {
-    case      0: $dx220[0]  = "selected"; break;
-    case   2500: $dx220[1]  = "selected"; break;
-    case   7500: $dx220[2]  = "selected"; break;
-    case  15000: $dx220[3]  = "selected"; break;
-    case  25000: $dx220[4]  = "selected"; break;
-    case  37500: $dx220[5]  = "selected"; break;
-    case  52500: $dx220[6]  = "selected"; break;
-    case  70000: $dx220[7]  = "selected"; break;
-    case  90000: $dx220[8]  = "selected"; break;
-    case 112500: $dx220[9]  = "selected"; break;
-    case 137500: $dx220[10] = "selected"; break;
-    case 165000: $dx220[11] = "selected"; break;
-    case 195000: $dx220[12] = "selected"; break;
-    case 227500: $dx220[13] = "selected"; break;
-    case 262500: $dx220[14] = "selected"; break;
-    case 300000: $dx220[15] = "selected"; break;
-    case 340000: $dx220[16] = "selected"; break;
-    case 382500: $dx220[17] = "selected"; break;
-    case 427500: $dx220[18] = "selected"; break;
-}
-switch($dex230) {
-    case      0: $dx230[0]  = "selected"; break;
-    case   2500: $dx230[1]  = "selected"; break;
-    case   7500: $dx230[2]  = "selected"; break;
-    case  15000: $dx230[3]  = "selected"; break;
-    case  25000: $dx230[4]  = "selected"; break;
-    case  37500: $dx230[5]  = "selected"; break;
-    case  52500: $dx230[6]  = "selected"; break;
-    case  70000: $dx230[7]  = "selected"; break;
-    case  90000: $dx230[8]  = "selected"; break;
-    case 112500: $dx230[9]  = "selected"; break;
-    case 137500: $dx230[10] = "selected"; break;
-    case 165000: $dx230[11] = "selected"; break;
-    case 195000: $dx230[12] = "selected"; break;
-    case 227500: $dx230[13] = "selected"; break;
-    case 262500: $dx230[14] = "selected"; break;
-    case 300000: $dx230[15] = "selected"; break;
-    case 340000: $dx230[16] = "selected"; break;
-    case 382500: $dx230[17] = "selected"; break;
-    case 427500: $dx230[18] = "selected"; break;
-}
-switch($dex240) {
-    case      0: $dx240[0]  = "selected"; break;
-    case   2500: $dx240[1]  = "selected"; break;
-    case   7500: $dx240[2]  = "selected"; break;
-    case  15000: $dx240[3]  = "selected"; break;
-    case  25000: $dx240[4]  = "selected"; break;
-    case  37500: $dx240[5]  = "selected"; break;
-    case  52500: $dx240[6]  = "selected"; break;
-    case  70000: $dx240[7]  = "selected"; break;
-    case  90000: $dx240[8]  = "selected"; break;
-    case 112500: $dx240[9]  = "selected"; break;
-    case 137500: $dx240[10] = "selected"; break;
-    case 165000: $dx240[11] = "selected"; break;
-    case 195000: $dx240[12] = "selected"; break;
-    case 227500: $dx240[13] = "selected"; break;
-    case 262500: $dx240[14] = "selected"; break;
-    case 300000: $dx240[15] = "selected"; break;
-    case 340000: $dx240[16] = "selected"; break;
-    case 382500: $dx240[17] = "selected"; break;
-    case 427500: $dx240[18] = "selected"; break;
-}
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<title>전투시뮬레이션</title>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-<style type="text/css">
-select { background-color:black;color:white; }
-input { background-color:black;color:white; }
-</style>
-
-</head>
-
-<body>
-<form method=post action=_simul.php>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr id=bg1>
-        <td>공격장수</td>
-        <td>상대장수</td>
-        <td>상대성벽</td>
-    </tr>
-    <tr>
-        <td>관직
-            <select name=level1 size=1>
-                <option <?=$sellevel1[1]?> value=1>일반</option>
-                <option <?=$sellevel1[5]?> value=5>제3모사</option>
-                <option <?=$sellevel1[6]?> value=6>제3장군</option>
-                <option <?=$sellevel1[7]?> value=7>제2모사</option>
-                <option <?=$sellevel1[8]?> value=8>제2장군</option>
-                <option <?=$sellevel1[9]?> value=9>제1모사</option>
-                <option <?=$sellevel1[10]?> value=10>제1장군</option>
-                <option <?=$sellevel1[11]?> value=11>참모</option>
-                <option <?=$sellevel1[12]?> value=12>군주</option>
-            </select>
-        </td>
-        <td>관직
-            <select name=level2 size=1>
-                <option <?=$sellevel2[1]?> value=1>일반</option>
-                <option <?=$sellevel2[5]?> value=5>제3모사</option>
-                <option <?=$sellevel2[6]?> value=6>제3장군</option>
-                <option <?=$sellevel2[7]?> value=7>제2모사</option>
-                <option <?=$sellevel2[8]?> value=8>제2장군</option>
-                <option <?=$sellevel2[9]?> value=9>제1모사</option>
-                <option <?=$sellevel2[10]?> value=10>제1장군</option>
-                <option <?=$sellevel2[11]?> value=11>참모</option>
-                <option <?=$sellevel2[12]?> value=12>군주</option>
-            </select>
-        </td>
-        <td>-</td>
-    <tr>
-        <td>Lv <input size=2 maxlength=2 name=explevel1 value=<?=$explevel1?>></td>
-        <td>Lv <input size=2 maxlength=2 name=explevel2 value=<?=$explevel2?>></td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td>통솔 <input size=3 maxlength=3 name=leader1 value=<?=$leader1?>></td>
-        <td>통솔 <input size=3 maxlength=3 name=leader2 value=<?=$leader2?>></td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td>무력 <input size=3 maxlength=3 name=power1 value=<?=$power1?>></td>
-        <td>무력 <input size=3 maxlength=3 name=power2 value=<?=$power2?>></td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td>지력 <input size=3 maxlength=3 name=intel1 value=<?=$intel1?>></td>
-        <td>지력 <input size=3 maxlength=3 name=intel2 value=<?=$intel2?>></td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td>병종
-            <select name=type1 size=1>
-                <option value=0>--------</option>
-                <option <?=$sel1[0]?> value=0>보병</option>
-                <option <?=$sel1[1]?> value=1>청주병</option>
-                <option <?=$sel1[2]?> value=2>수병</option>
-                <option <?=$sel1[3]?> value=3>자객병</option>
-                <option <?=$sel1[4]?> value=4>근위병</option>
-                <option <?=$sel1[5]?> value=5>등갑병</option>
-                <option value=0>--------</option>
-                <option <?=$sel1[10]?> value=10>궁병</option>
-                <option <?=$sel1[11]?> value=11>궁기병</option>
-                <option <?=$sel1[12]?> value=12>연노병</option>
-                <option <?=$sel1[13]?> value=13>강궁병</option>
-                <option <?=$sel1[14]?> value=14>석궁병</option>
-                <option value=0>--------</option>
-                <option <?=$sel1[20]?> value=20>기병</option>
-                <option <?=$sel1[21]?> value=21>백마병</option>
-                <option <?=$sel1[22]?> value=22>중장기병</option>
-                <option <?=$sel1[23]?> value=23>돌격기병</option>
-                <option <?=$sel1[24]?> value=24>철기병</option>
-                <option <?=$sel1[25]?> value=25>수렵기병</option>
-                <option <?=$sel1[26]?> value=26>맹수병</option>
-                <option <?=$sel1[27]?> value=27>호표기병</option>
-                <option value=0>--------</option>
-                <option <?=$sel1[30]?> value=30>귀병</option>
-                <option <?=$sel1[31]?> value=31>신귀병</option>
-                <option <?=$sel1[32]?> value=32>백귀병</option>
-                <option <?=$sel1[33]?> value=33>흑귀병</option>
-                <option <?=$sel1[34]?> value=34>악귀병</option>
-                <option <?=$sel1[35]?> value=35>남귀병</option>
-                <option <?=$sel1[36]?> value=36>황귀병</option>
-                <option <?=$sel1[37]?> value=37>천귀병</option>
-                <option <?=$sel1[38]?> value=38>마귀병</option>
-                <option value=0>--------</option>
-                <option <?=$sel1[40]?> value=40>정란</option>
-                <option <?=$sel1[41]?> value=41>충차</option>
-                <option <?=$sel1[42]?> value=42>벽력거</option>
-                <option <?=$sel1[43]?> value=43>목우</option>
-            </select>
-        </td>
-        <td>병종
-            <select name=type2 size=1>
-                <option value=0>--------</option>
-                <option <?=$sel2[0]?> value=0>보병</option>
-                <option <?=$sel2[1]?> value=1>청주병</option>
-                <option <?=$sel2[2]?> value=2>수병</option>
-                <option <?=$sel2[3]?> value=3>자객병</option>
-                <option <?=$sel2[4]?> value=4>근위병</option>
-                <option <?=$sel2[5]?> value=5>등갑병</option>
-                <option value=0>--------</option>
-                <option <?=$sel2[10]?> value=10>궁병</option>
-                <option <?=$sel2[11]?> value=11>궁기병</option>
-                <option <?=$sel2[12]?> value=12>연노병</option>
-                <option <?=$sel2[13]?> value=13>강궁병</option>
-                <option <?=$sel2[14]?> value=14>석궁병</option>
-                <option value=0>--------</option>
-                <option <?=$sel2[20]?> value=20>기병</option>
-                <option <?=$sel2[21]?> value=21>백마병</option>
-                <option <?=$sel2[22]?> value=22>중장기병</option>
-                <option <?=$sel2[23]?> value=23>돌격기병</option>
-                <option <?=$sel2[24]?> value=24>철기병</option>
-                <option <?=$sel2[25]?> value=25>수렵기병</option>
-                <option <?=$sel2[26]?> value=26>맹수병</option>
-                <option <?=$sel2[27]?> value=27>호표기병</option>
-                <option value=0>--------</option>
-                <option <?=$sel2[30]?> value=30>귀병</option>
-                <option <?=$sel2[31]?> value=31>신귀병</option>
-                <option <?=$sel2[32]?> value=32>백귀병</option>
-                <option <?=$sel2[33]?> value=33>흑귀병</option>
-                <option <?=$sel2[34]?> value=34>악귀병</option>
-                <option <?=$sel2[35]?> value=35>남귀병</option>
-                <option <?=$sel2[36]?> value=36>황귀병</option>
-                <option <?=$sel2[37]?> value=37>천귀병</option>
-                <option <?=$sel2[38]?> value=38>마귀병</option>
-                <option value=0>--------</option>
-                <option <?=$sel2[40]?> value=40>정란</option>
-                <option <?=$sel2[41]?> value=41>충차</option>
-                <option <?=$sel2[42]?> value=42>벽력거</option>
-                <option <?=$sel2[43]?> value=43>목우</option>
-            </select>
-        </td>
-        <td>성벽 <input size=4 maxlength=4 name=wall value=<?=$wall?>></td>
-    </tr>
-    <tr>
-        <td>병력 <input size=5 maxlength=5 name=crew1 value=<?=$crew1?>></td>
-        <td>병력 <input size=5 maxlength=5 name=crew2 value=<?=$crew2?>></td>
-        <td>수비 <input size=4 maxlength=4 name=def value=<?=$def?>></td>
-    </tr>
-    <tr>
-        <td>훈련 <input size=3 maxlength=3 name=train1 value=<?=$train1?>></td>
-        <td>훈련 <input size=3 maxlength=3 name=train2 value=<?=$train2?>></td>
-        <td>훈련 <input size=3 maxlength=3 name=train3 value=<?=$train3?>></td>
-    </tr>
-    <tr>
-        <td>사기 <input size=3 maxlength=3 name=atmos1 value=<?=$atmos1?>></td>
-        <td>사기 <input size=3 maxlength=3 name=atmos2 value=<?=$atmos2?>></td>
-        <td>사기 <input size=3 maxlength=3 name=atmos3 value=<?=$atmos3?>></td>
-    </tr>
-    <tr>
-        <td>기술
-            <select name=tech1 size=1>
-                <option <?=$tch1[0]?>     value=0>0등급</option>
-                <option <?=$tch1[1]?>  value=1000>1등급</option>
-                <option <?=$tch1[2]?>  value=2000>2등급</option>
-                <option <?=$tch1[3]?>  value=3000>3등급</option>
-                <option <?=$tch1[4]?>  value=4000>4등급</option>
-                <option <?=$tch1[5]?>  value=5000>5등급</option>
-                <option <?=$tch1[6]?>  value=6000>6등급</option>
-                <option <?=$tch1[7]?>  value=7000>7등급</option>
-                <option <?=$tch1[8]?>  value=8000>8등급</option>
-                <option <?=$tch1[9]?>  value=9000>9등급</option>
-                <option <?=$tch1[10]?> value=10000>10등급</option>
-            </select>
-        </td>
-        <td>기술
-            <select name=tech2 size=1>
-                <option <?=$tch2[0]?>     value=0>0등급</option>
-                <option <?=$tch2[1]?>  value=1000>1등급</option>
-                <option <?=$tch2[2]?>  value=2000>2등급</option>
-                <option <?=$tch2[3]?>  value=3000>3등급</option>
-                <option <?=$tch2[4]?>  value=4000>4등급</option>
-                <option <?=$tch2[5]?>  value=5000>5등급</option>
-                <option <?=$tch2[6]?>  value=6000>6등급</option>
-                <option <?=$tch2[7]?>  value=7000>7등급</option>
-                <option <?=$tch2[8]?>  value=8000>8등급</option>
-                <option <?=$tch2[9]?>  value=9000>9등급</option>
-                <option <?=$tch2[10]?> value=10000>10등급</option>
-            </select>
-        </td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td>보
-            <select name=dex10 size=1>
-                <option <?=$dx10[0]?>       value=0>F</option>
-                <option <?=$dx10[1]?>    value=2500>E-</option>
-                <option <?=$dx10[2]?>    value=7500>E</option>
-                <option <?=$dx10[3]?>   value=15000>E+</option>
-                <option <?=$dx10[4]?>   value=25000>D-</option>
-                <option <?=$dx10[5]?>   value=37500>D</option>
-                <option <?=$dx10[6]?>   value=52500>D+</option>
-                <option <?=$dx10[7]?>   value=70000>C-</option>
-                <option <?=$dx10[8]?>   value=90000>C</option>
-                <option <?=$dx10[9]?>  value=112500>C+</option>
-                <option <?=$dx10[10]?> value=137500>B-</option>
-                <option <?=$dx10[11]?> value=165000>B</option>
-                <option <?=$dx10[12]?> value=195000>B+</option>
-                <option <?=$dx10[13]?> value=227500>A-</option>
-                <option <?=$dx10[14]?> value=262500>A</option>
-                <option <?=$dx10[15]?> value=300000>A+</option>
-                <option <?=$dx10[16]?> value=340000>S</option>
-                <option <?=$dx10[17]?> value=382500>SS</option>
-                <option <?=$dx10[18]?> value=427500>SSS</option>
-            </select>
-            궁
-            <select name=dex110 size=1>
-                <option <?=$dx110[0]?>       value=0>F</option>
-                <option <?=$dx110[1]?>    value=2500>E-</option>
-                <option <?=$dx110[2]?>    value=7500>E</option>
-                <option <?=$dx110[3]?>   value=15000>E+</option>
-                <option <?=$dx110[4]?>   value=25000>D-</option>
-                <option <?=$dx110[5]?>   value=37500>D</option>
-                <option <?=$dx110[6]?>   value=52500>D+</option>
-                <option <?=$dx110[7]?>   value=70000>C-</option>
-                <option <?=$dx110[8]?>   value=90000>C</option>
-                <option <?=$dx110[9]?>  value=112500>C+</option>
-                <option <?=$dx110[10]?> value=137500>B-</option>
-                <option <?=$dx110[11]?> value=165000>B</option>
-                <option <?=$dx110[12]?> value=195000>B+</option>
-                <option <?=$dx110[13]?> value=227500>A-</option>
-                <option <?=$dx110[14]?> value=262500>A</option>
-                <option <?=$dx110[15]?> value=300000>A+</option>
-                <option <?=$dx110[16]?> value=340000>S</option>
-                <option <?=$dx110[17]?> value=382500>SS</option>
-                <option <?=$dx110[18]?> value=427500>SSS</option>
-            </select>
-            기
-            <select name=dex120 size=1>
-                <option <?=$dx120[0]?>       value=0>F</option>
-                <option <?=$dx120[1]?>    value=2500>E-</option>
-                <option <?=$dx120[2]?>    value=7500>E</option>
-                <option <?=$dx120[3]?>   value=15000>E+</option>
-                <option <?=$dx120[4]?>   value=25000>D-</option>
-                <option <?=$dx120[5]?>   value=37500>D</option>
-                <option <?=$dx120[6]?>   value=52500>D+</option>
-                <option <?=$dx120[7]?>   value=70000>C-</option>
-                <option <?=$dx120[8]?>   value=90000>C</option>
-                <option <?=$dx120[9]?>  value=112500>C+</option>
-                <option <?=$dx120[10]?> value=137500>B-</option>
-                <option <?=$dx120[11]?> value=165000>B</option>
-                <option <?=$dx120[12]?> value=195000>B+</option>
-                <option <?=$dx120[13]?> value=227500>A-</option>
-                <option <?=$dx120[14]?> value=262500>A</option>
-                <option <?=$dx120[15]?> value=300000>A+</option>
-                <option <?=$dx120[16]?> value=340000>S</option>
-                <option <?=$dx120[17]?> value=382500>SS</option>
-                <option <?=$dx120[18]?> value=427500>SSS</option>
-            </select>
-            귀
-            <select name=dex130 size=1>
-                <option <?=$dx130[0]?>       value=0>F</option>
-                <option <?=$dx130[1]?>    value=2500>E-</option>
-                <option <?=$dx130[2]?>    value=7500>E</option>
-                <option <?=$dx130[3]?>   value=15000>E+</option>
-                <option <?=$dx130[4]?>   value=25000>D-</option>
-                <option <?=$dx130[5]?>   value=37500>D</option>
-                <option <?=$dx130[6]?>   value=52500>D+</option>
-                <option <?=$dx130[7]?>   value=70000>C-</option>
-                <option <?=$dx130[8]?>   value=90000>C</option>
-                <option <?=$dx130[9]?>  value=112500>C+</option>
-                <option <?=$dx130[10]?> value=137500>B-</option>
-                <option <?=$dx130[11]?> value=165000>B</option>
-                <option <?=$dx130[12]?> value=195000>B+</option>
-                <option <?=$dx130[13]?> value=227500>A-</option>
-                <option <?=$dx130[14]?> value=262500>A</option>
-                <option <?=$dx130[15]?> value=300000>A+</option>
-                <option <?=$dx130[16]?> value=340000>S</option>
-                <option <?=$dx130[17]?> value=382500>SS</option>
-                <option <?=$dx130[18]?> value=427500>SSS</option>
-            </select>
-            차
-            <select name=dex140 size=1>
-                <option <?=$dx140[0]?>       value=0>F</option>
-                <option <?=$dx140[1]?>    value=2500>E-</option>
-                <option <?=$dx140[2]?>    value=7500>E</option>
-                <option <?=$dx140[3]?>   value=15000>E+</option>
-                <option <?=$dx140[4]?>   value=25000>D-</option>
-                <option <?=$dx140[5]?>   value=37500>D</option>
-                <option <?=$dx140[6]?>   value=52500>D+</option>
-                <option <?=$dx140[7]?>   value=70000>C-</option>
-                <option <?=$dx140[8]?>   value=90000>C</option>
-                <option <?=$dx140[9]?>  value=112500>C+</option>
-                <option <?=$dx140[10]?> value=137500>B-</option>
-                <option <?=$dx140[11]?> value=165000>B</option>
-                <option <?=$dx140[12]?> value=195000>B+</option>
-                <option <?=$dx140[13]?> value=227500>A-</option>
-                <option <?=$dx140[14]?> value=262500>A</option>
-                <option <?=$dx140[15]?> value=300000>A+</option>
-                <option <?=$dx140[16]?> value=340000>S</option>
-                <option <?=$dx140[17]?> value=382500>SS</option>
-                <option <?=$dx140[18]?> value=427500>SSS</option>
-            </select>
-        </td>
-        <td>보
-            <select name=dex20 size=1>
-                <option <?=$dx20[0]?>       value=0>F</option>
-                <option <?=$dx20[1]?>    value=2500>E-</option>
-                <option <?=$dx20[2]?>    value=7500>E</option>
-                <option <?=$dx20[3]?>   value=15000>E+</option>
-                <option <?=$dx20[4]?>   value=25000>D-</option>
-                <option <?=$dx20[5]?>   value=37500>D</option>
-                <option <?=$dx20[6]?>   value=52500>D+</option>
-                <option <?=$dx20[7]?>   value=70000>C-</option>
-                <option <?=$dx20[8]?>   value=90000>C</option>
-                <option <?=$dx20[9]?>  value=112500>C+</option>
-                <option <?=$dx20[10]?> value=137500>B-</option>
-                <option <?=$dx20[11]?> value=165000>B</option>
-                <option <?=$dx20[12]?> value=195000>B+</option>
-                <option <?=$dx20[13]?> value=227500>A-</option>
-                <option <?=$dx20[14]?> value=262500>A</option>
-                <option <?=$dx20[15]?> value=300000>A+</option>
-                <option <?=$dx20[16]?> value=340000>S</option>
-                <option <?=$dx20[17]?> value=382500>SS</option>
-                <option <?=$dx20[18]?> value=427500>SSS</option>
-            </select>
-            궁
-            <select name=dex210 size=1>
-                <option <?=$dx210[0]?>       value=0>F</option>
-                <option <?=$dx210[1]?>    value=2500>E-</option>
-                <option <?=$dx210[2]?>    value=7500>E</option>
-                <option <?=$dx210[3]?>   value=15000>E+</option>
-                <option <?=$dx210[4]?>   value=25000>D-</option>
-                <option <?=$dx210[5]?>   value=37500>D</option>
-                <option <?=$dx210[6]?>   value=52500>D+</option>
-                <option <?=$dx210[7]?>   value=70000>C-</option>
-                <option <?=$dx210[8]?>   value=90000>C</option>
-                <option <?=$dx210[9]?>  value=112500>C+</option>
-                <option <?=$dx210[10]?> value=137500>B-</option>
-                <option <?=$dx210[11]?> value=165000>B</option>
-                <option <?=$dx210[12]?> value=195000>B+</option>
-                <option <?=$dx210[13]?> value=227500>A-</option>
-                <option <?=$dx210[14]?> value=262500>A</option>
-                <option <?=$dx210[15]?> value=300000>A+</option>
-                <option <?=$dx210[16]?> value=340000>S</option>
-                <option <?=$dx210[17]?> value=382500>SS</option>
-                <option <?=$dx210[18]?> value=427500>SSS</option>
-            </select>
-            기
-            <select name=dex220 size=1>
-                <option <?=$dx220[0]?>       value=0>F</option>
-                <option <?=$dx220[1]?>    value=2500>E-</option>
-                <option <?=$dx220[2]?>    value=7500>E</option>
-                <option <?=$dx220[3]?>   value=15000>E+</option>
-                <option <?=$dx220[4]?>   value=25000>D-</option>
-                <option <?=$dx220[5]?>   value=37500>D</option>
-                <option <?=$dx220[6]?>   value=52500>D+</option>
-                <option <?=$dx220[7]?>   value=70000>C-</option>
-                <option <?=$dx220[8]?>   value=90000>C</option>
-                <option <?=$dx220[9]?>  value=112500>C+</option>
-                <option <?=$dx220[10]?> value=137500>B-</option>
-                <option <?=$dx220[11]?> value=165000>B</option>
-                <option <?=$dx220[12]?> value=195000>B+</option>
-                <option <?=$dx220[13]?> value=227500>A-</option>
-                <option <?=$dx220[14]?> value=262500>A</option>
-                <option <?=$dx220[15]?> value=300000>A+</option>
-                <option <?=$dx220[16]?> value=340000>S</option>
-                <option <?=$dx220[17]?> value=382500>SS</option>
-                <option <?=$dx220[18]?> value=427500>SSS</option>
-            </select>
-            귀
-            <select name=dex230 size=1>
-                <option <?=$dx230[0]?>       value=0>F</option>
-                <option <?=$dx230[1]?>    value=2500>E-</option>
-                <option <?=$dx230[2]?>    value=7500>E</option>
-                <option <?=$dx230[3]?>   value=15000>E+</option>
-                <option <?=$dx230[4]?>   value=25000>D-</option>
-                <option <?=$dx230[5]?>   value=37500>D</option>
-                <option <?=$dx230[6]?>   value=52500>D+</option>
-                <option <?=$dx230[7]?>   value=70000>C-</option>
-                <option <?=$dx230[8]?>   value=90000>C</option>
-                <option <?=$dx230[9]?>  value=112500>C+</option>
-                <option <?=$dx230[10]?> value=137500>B-</option>
-                <option <?=$dx230[11]?> value=165000>B</option>
-                <option <?=$dx230[12]?> value=195000>B+</option>
-                <option <?=$dx230[13]?> value=227500>A-</option>
-                <option <?=$dx230[14]?> value=262500>A</option>
-                <option <?=$dx230[15]?> value=300000>A+</option>
-                <option <?=$dx230[16]?> value=340000>S</option>
-                <option <?=$dx230[17]?> value=382500>SS</option>
-                <option <?=$dx230[18]?> value=427500>SSS</option>
-            </select>
-            차
-            <select name=dex240 size=1>
-                <option <?=$dx240[0]?>       value=0>F</option>
-                <option <?=$dx240[1]?>    value=2500>E-</option>
-                <option <?=$dx240[2]?>    value=7500>E</option>
-                <option <?=$dx240[3]?>   value=15000>E+</option>
-                <option <?=$dx240[4]?>   value=25000>D-</option>
-                <option <?=$dx240[5]?>   value=37500>D</option>
-                <option <?=$dx240[6]?>   value=52500>D+</option>
-                <option <?=$dx240[7]?>   value=70000>C-</option>
-                <option <?=$dx240[8]?>   value=90000>C</option>
-                <option <?=$dx240[9]?>  value=112500>C+</option>
-                <option <?=$dx240[10]?> value=137500>B-</option>
-                <option <?=$dx240[11]?> value=165000>B</option>
-                <option <?=$dx240[12]?> value=195000>B+</option>
-                <option <?=$dx240[13]?> value=227500>A-</option>
-                <option <?=$dx240[14]?> value=262500>A</option>
-                <option <?=$dx240[15]?> value=300000>A+</option>
-                <option <?=$dx240[16]?> value=340000>S</option>
-                <option <?=$dx240[17]?> value=382500>SS</option>
-                <option <?=$dx240[18]?> value=427500>SSS</option>
-            </select>
-        </td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td>-</td>
-        <td>
-            <input type=submit name=isgen value=장수공격>
-            <?='<input type=submit name=isgen value=장수평균>'?>
-        </td>
-        <td>
-            <input type=submit name=isgen value=성벽공격>
-            <?='<input type=submit name=isgen value=성벽평균>'?>
-        </td>
-    </tr>
-    <tr><td colspan=3>
-<?php
-if($isgen == "장수공격" || $isgen == "성벽공격") {
-    echo $msg;
-} elseif($isgen == "장수평균" || $isgen == "성벽평균") {
-    echo $msg2;
-}
-?>
-    </td></tr>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr id=bg1>
-        <td align=right></td>
-        <td align=center>공격</td>
-        <td align=center>방어</td>
-        <td align=center>기동</td>
-        <td align=center>회피</td>
-        <td align=center>가격</td>
-        <td align=center>군량</td>
-        <td width=500 align=center>-</td>
-    </tr>
-
-<?php
-    for($i=0; $i <= 5; $i++) {
-        printSimul($admin, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-
-    for($i=10; $i <= 14; $i++) {
-        printSimul($admin, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-
-    for($i=20; $i <= 27; $i++) {
-        printSimul($admin, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-
-    for($i=30; $i <= 38; $i++) {
-        printSimul($admin, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-
-    for($i=40; $i <= 43; $i++) {
-        printSimul($admin, $i);
-    }
-    echo "
-    <tr><td height=5 colspan=8 id=bg1></td></tr>";
-?>
-</table>
-</form>
-</body>
-</html>
-<?php
-
-function printSimul($admin, $i) {
-    $att = $admin["att{$i}"];
-    $def = $admin["def{$i}"];
-    $spd = $admin["spd{$i}"];
-    $avd = $admin["avd{$i}"];
-    $cst = $admin["cst{$i}"];
-    $ric = $admin["ric{$i}"];
-    echo "
-    <tr>
-        <td align=right>".GameUnitConst::byId($i)->name."</td>
-        <td align=center>$att</td>
-        <td align=center>$def</td>
-        <td align=center>$spd</td>
-        <td align=center>$avd</td>
-        <td align=center>$cst</td>
-        <td align=center>$ric</td>
-        <td align=center>-</td>
-    </tr>";
-}
-
-

hwe/a_emperior.php

@@ -16,6 +16,10 @@ increaseRefresh("왕조일람", 1);
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 왕조일람</title>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../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')?>
 
@@ -50,9 +54,6 @@ if ($showCurrentNation) {
     <tr>
         <td style="background-color:#333333;" align=center colspan=8>
             <font size=5>현재 (<?=$year?>年 <?=$month?>月)</font>
-            
-            <a href="a_emperior_detail.php"><button>자세히</button></a>
-            
             <a href="a_history.php"><button>역사 보기</button></a>
         </td>
     </tr>

hwe/a_emperior2.php

@@ -21,6 +21,10 @@ increaseRefresh("왕조일람", 2);
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 왕조일람</title>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../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')?>
 

hwe/a_emperior_detail.php

@@ -26,6 +26,10 @@ $serverID = $emperior['server_id']??($emperior['serverID']??null);
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 왕조일람</title>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../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')?>
 
@@ -33,7 +37,7 @@ $serverID = $emperior['server_id']??($emperior['serverID']??null);
 
 <body>
 <table align=center width=1000 class="tb_layout bg0">
-    <tr><td><?=$emperior?'역 대 왕 조':'현 재 왕 조'?><br>
+    <tr><td>역 대 왕 조<br>
         <button onclick=window.close()>창 닫기</button>
         <div style="float:right;"><a href="a_emperior.php"><button>전체보기</button></a><div>
     </td></tr>
@@ -156,7 +160,7 @@ if($emperior):
 <?php
 endif;
 
-$showServers = $serverID || (!$emperior);
+$showServers = $emperior;
 
 if(!$serverID){
     $serverID = UniqueConst::$serverID;

hwe/a_genList.php

@@ -174,7 +174,7 @@ for ($j=0; $j < $gencount; $j++) {
         data-general-intel='{$general['intel']}'
         data-is-npc='".($general['npc']>=2?'true':'false')."'
     >
-        <td align=center><img width='64' height='64' src={$imageTemp}/{$general['picture']}></img></td>
+        <td align=center><img class='generalIcon' width='64' height='64' src='{$imageTemp}/{$general['picture']}'></img></td>
         <td align=center>$name</td>
         <td align=center>{$general['age']}세</td>
         <td align=center>".displayCharInfo($general['personal'])."</td>

hwe/a_kingdomList.php

@@ -28,10 +28,13 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 세력일람</title>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/ext.kingdoms.js')?>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('js/ext.kingdoms.js')?>
 
 </head>
 

hwe/a_npcList.php

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

hwe/a_traffic.php

@@ -53,6 +53,10 @@ if ($admin['maxonline'] < $curonline) {
 <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')?>
 <style>
@@ -166,7 +170,7 @@ $max_refresh['name'] = '접속자 총합';
 $refresh_result = array_merge([$max_refresh], $db->query('SELECT `name`,refresh,`connect` FROM general ORDER BY refresh DESC LIMIT 5'));
 
 foreach ($refresh_result as $i=>$user) {
-    $w = round($user['refresh'] / $max_refresh['refresh'] * 100, 1);
+    $w = round($user['refresh'] / max(1, $max_refresh['refresh']) * 100, 1);
     $w2 = round(100 - $w, 1);
     $color = getTrafficColor($w);
 ?>

hwe/a_vote.php

@@ -31,6 +31,10 @@ $vote = $admin['vote']?:['-'];
 <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')?>
 <style>

hwe/b_auction.php

@@ -59,6 +59,10 @@ if ($msg2 == "") {
 <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>

hwe/b_battleCenter.php

@@ -77,6 +77,10 @@ $sel[$type] = "selected";
 <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')?>
 
@@ -156,7 +160,7 @@ for ($i=0; $i < $gencount; $i++) {
             <?=getBatResRecent($gen, 24)?>
         </td>
     </tr>
-<?php if($npc > 1): ?>
+<?php if($npc > 1 || $meLevel >= 5): ?>
     <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_betting.php

@@ -59,6 +59,10 @@ if($str3){
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 베팅장</title>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../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>

hwe/b_chiefboard.php

@@ -29,6 +29,10 @@ if($me['level'] < 5) {
 <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')?>
 

hwe/b_chiefcenter.php

@@ -81,6 +81,10 @@ for($i= $lv - 1; $i>=5; $i--){
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 사령부</title>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../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')?>
 <script type="text/javascript">

hwe/b_currentCity.php

@@ -11,6 +11,7 @@ extractMissingPostToGlobals();
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
+$userGrade = Session::getUserGrade();
 
 $db = DB::db();
 $connect=$db->get();
@@ -34,6 +35,10 @@ $templates = new \League\Plates\Engine('templates');
 <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')?>
 <style>
@@ -164,7 +169,7 @@ echo "
 unset($city);
 
 // 첩보된 도시까지만 허용
-if($valid == 0 && $session->userGrade < 5) {
+if($valid == 0 && $userGrade < 5) {
     $citylist = $me['city'];
 }
 
@@ -208,6 +213,10 @@ for($j=0; $j < $gencount; $j++) {
         $ourGeneral = false;
     }
 
+    if($userGrade == 6){
+        $ourGeneral = true;
+    }
+
     $isNPC = $general['npc']>1;
     $wounded = $general['injury'];
     

hwe/b_dipcenter.php

@@ -48,13 +48,23 @@ if ($me['level'] >= 5) {
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 내무부</title>
+<script>
+var editable = <?=($me['level']>=5?'true':'false')?>;
+</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('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/dipcenter.js')?>
 
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+<?=WebUtil::printCSS('../e_lib/summernote/summernote-bs4.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
-
+<?=WebUtil::printCSS('css/dipcenter.css')?>
+<link href="https://fonts.googleapis.com/css?family=Nanum+Gothic|Nanum+Myeongjo|Nanum+Pen+Script" rel="stylesheet">
 </head>
 
 <body>
@@ -223,10 +233,35 @@ if ($budgetricediff > 0) {
 <form name=form1 method=post action=c_dipcenter.php>
     <tr><td colspan=2 height=10></td></tr>
     <tr><td colspan=2 align=center bgcolor=orange>국 가 방 침 &amp; 임관 권유 메시지</td></tr>
-    <tr><td colspan=2 class=bg1>국가 방침 <textarea <?=$read?> maxlength=16000 rows="5" style="color:white;background-color:black;width:830px;" name=msg><?=$nation['msg']?></textarea><input type=<?=$btn?> name=btn value=국가방침></td></tr>
-    <tr><td colspan=2 class=bg1>임관 권유 <input type=text <?=$read?> maxlength=1000 style=color:white;background-color:black;width:830px; name=scoutmsg value='<?=$nation['scoutmsg']?>'><input type=<?=$btn?> name=btn value=임관권유></td></tr>
-    <tr><td colspan=2>870px x 200px를 넘어서는 내용은 표시되지 않습니다.</td></tr>
-    <tr><td colspan=2 height=10></td></tr>
+    <tr><td colspan='2'><div id='noticeForm'>
+        <div class='bg1' style="display: flex; justify-content: space-around">
+            <div style='flex: 1 1 auto;'>
+                국가 방침
+            </div>
+            <div>
+                <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>
+        <div class='edit_form viewer'></div>
+    </div></td></tr>
+    <tr><td colspan='2'><div id='scoutMsgForm'>
+        <div class='bg1' style="display: flex; justify-content: space-around">
+            <div style='flex: 1 1 auto;'>
+                임관 권유
+            </div>
+            <div>
+                <input type='submit' class='submit' name=btn value='임관 권유문 수정'><input type='button' class='cancel_edit' value='취소'>
+            </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>
+        <div style="width:870px;margin-left:auto;">
+            <div class='edit_form viewer'></div>
+        </div>
+        </div>
+        
+    </div></td></tr>
     <tr><td colspan=2 align=center bgcolor=green>예 산 &amp; 정 책</td></tr>
     <tr>
         <td colspan=2>

hwe/b_diplomacy.php

@@ -177,7 +177,7 @@ for($i=0; $i < $nationcount; $i++) {
 ";
 }
 ?>
-    <tr><td colspan=<?=$nationcount+1?> align=center>불가침 : <font color=limegreen>@</font>, 통합 : <font color=cyan>○</font>, 합병 : <font color=skyblue>◎</font>, 통상 : ㆍ, 선포 : <font color=magenta>▲</font>, 교전 : <font color=red>★</font></td></tr>
+    <tr><td colspan=<?=$nationcount+1?> align=center>불가침 : <font color=limegreen>@</font>, <!--통합 : <font color=cyan>○</font>, -->합병 : <font color=skyblue>◎</font>, 통상 : ㆍ, 선포 : <font color=magenta>▲</font>, 교전 : <font color=red>★</font></td></tr>
 </table>
 
 <?php if ($realConflict) : ?>

hwe/b_genList.php

@@ -153,7 +153,7 @@ foreach ($generals as &$general) {
         case 2: $mode = "◎"; break;
     }
     $general['modeText'] = $mode;
-    $general['crewtypeText'] = GameUnitConst::byId($general['crewtype'])->name;
+    $general['crewtypeText'] = GameUnitConst::byId($general['crewtype'])->name??'-';
 
     
     if ($general['npc'] < 2) {

hwe/b_myBossInfo.php

@@ -33,6 +33,10 @@ if($meLevel == 0) {
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 인사부</title>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../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')?>
 <script type="text/javascript">
@@ -88,10 +92,10 @@ for($i=12; $i >= $lv; $i-=2) {
     ?>
     <tr>
         <td width=98 align=center id=bg1><font size=4><?=getLevel($i1, $nation['level'])?></font></td>
-        <td width=64 height=64 style='background:no-repeat center url("<?=$imageTemp1?>/<?=$level[$i1]['picture']??'default.jpg'?>");background-size:64px;'></td>
+        <td width=64 class='generalIcon' height=64 style='background:no-repeat center url("<?=$imageTemp1?>/<?=$level[$i1]['picture']??'default.jpg'?>");background-size:64px;'></td>
         <td width=332><font size=4><?=$level[$i1]['name']??'-'?>(<?=$level[$i1]['belong']??'-'?>년)</font></td>
         <td width=98 align=center id=bg1><font size=4><?=getLevel($i2, $nation['level'])?></font></td>
-        <td width=64 height=64 style='background:no-repeat center url("<?=$imageTemp2?>/<?=$level[$i2]['picture']??'default.jpg'?>");background-size:64px;'></td>
+        <td width=64 class='generalIcon' height=64 style='background:no-repeat center url("<?=$imageTemp2?>/<?=$level[$i2]['picture']??'default.jpg'?>");background-size:64px;'></td>
         <td width=332><font size=4><?=$level[$i2]['name']??'-'?>(<?=$level[$i2]['belong']??'-'?>년)</font></td>
     </tr>
     <?php
@@ -146,12 +150,15 @@ if($meLevel >= 5 && $nation["l{$meLevel}set"] == 0) {
     echo "
             <select name=outlist size=1 style=color:white;background-color:black;>";
 
-    $query = "select no,name,level,leader,power,intel,killturn from general where nation='{$me['nation']}' and level!='12' and no!='{$me['no']}' order by npc,binary(name)";
+    $query = "select no,npc,name,level,leader,power,intel,killturn from general where nation='{$me['nation']}' and level!='12' and no!='{$me['no']}' order by npc,binary(name)";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $gencount = MYDB_num_rows($result);
 
     for($i=0; $i < $gencount; $i++) {
         $general = MYDB_fetch_array($result);
+        if($general['npc'] == 5){
+            continue;
+        }
         echo "
                 <option value={$general['no']}>{$general['name']} <small>({$general['leader']}/{$general['power']}/{$general['intel']}, {$general['killturn']}턴)</small></option>";
     }
@@ -452,15 +459,7 @@ echo "
     </tr>
 ";
 
-$citylevel = [];
-$citylevel[1] = "수";
-$citylevel[2] = "진";
-$citylevel[3] = "관";
-$citylevel[4] = "이";
-$citylevel[5] = "소";
-$citylevel[6] = "중";
-$citylevel[7] = "대";
-$citylevel[8] = "특";
+$citylevel = getCityLevelList();
 
 $query = "select city,name,gen1,gen2,gen3,level,region,gen1set,gen2set,gen3set from city where nation='{$nation['nation']}' order by region,level desc,binary(name)"; // 도시 이름 목록
 $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

hwe/b_myCityInfo.php

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

hwe/b_myGenInfo.php

@@ -174,7 +174,7 @@ for($j=0; $j < $gencount; $j++) {
     $imageTemp = GetImageURL($general['imgsvr']);
     echo "
     <tr>
-        <td align=center style='background:no-repeat center url(\"{$imageTemp}/{$general['picture']}\");background-size:64px;' height=64></td>
+        <td align=center class='generalIcon' style='background:no-repeat center url(\"{$imageTemp}/{$general['picture']}\");background-size:64px;' height=64></td>
         <td align=center>$name</td>
         <td align=center>"; echo getLevel($general['level'], $nationLevel); echo "</td>
         <td align=center>".getDed($general['dedication'])."</td>

hwe/b_myKingdomInfo.php

@@ -30,6 +30,10 @@ if($me['level'] == 0) {
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 세력정보</title>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../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')?>
 

hwe/b_myPage.php

@@ -56,6 +56,9 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
         'tnmt'=>$tnmt
     ], 'owner=%i', $userID);
 
+    $me['mode'] = $mode;
+    $me['tnmt'] = $tnmt;
+
     if($me['npc'] == 1 && $detachNPC){
         $turnterm = $gameStor->turnterm;
 
@@ -84,6 +87,7 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
 <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/myPage.js')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
@@ -119,6 +123,8 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
             <a href="c_vacation.php"><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>휴가 신청</button></a><br><br>
             <!--빙의 해제용 삭턴 조절<br>
             <a href="b_myPage.php?detachNPC=1"><button type="button" style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px;>빙의 해체 요청</button></a>-->
+            개인용 CSS<br>
+            <textarea id='custom_css' style='color:white;background-color:black;width:420px;height:150px;'></textarea>
         </td>
     </tr>
     <tr>

hwe/b_nationboard.php

@@ -24,6 +24,10 @@ $me = MYDB_fetch_array($result);
 <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')?>
 

hwe/b_nationrule.php

@@ -19,6 +19,10 @@ increaseRefresh("국법", 1);
 <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')?>
 

hwe/b_troop.php

@@ -12,13 +12,58 @@ $connect=$db->get();
 
 increaseRefresh("부대편성", 1);
 
-$query = "select no,nation,troop 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,troop FROM general WHERE owner=%i', $userID);
 
-$query = "select * from troop where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$troopcount = MYDB_num_rows($result);
+$troops = [];
+foreach($db->query('SELECT troop,name,no FROM troop WHERE nation = %i', $me['nation']) as $rawTroop){
+    $troops[$rawTroop['troop']] = [
+        'troop'=>$rawTroop['troop'],
+        'name'=>$rawTroop['name'],
+        'no'=>$rawTroop['no'],
+        'users'=>[]
+    ];
+}
+
+foreach($db->query(
+    'SELECT no,name,turntime,troop,city FROM general WHERE troop!=0 AND nation = %i ORDER BY turntime ASC',
+    $me['nation']
+) as $general
+){
+    if(!key_exists($general['troop'], $troops)){
+        trigger_error("올바르지 않은 부대 소속 {$general['no']}, {$general['name']} : {$general['troop']}");
+        continue;
+    }
+
+    $general['cityText'] = CityConst::byID($general['city'])->name;
+
+    $troops[$general['troop']]['users'][] = $general;
+}
+
+if($troops){
+    foreach($db->query(
+        'SELECT no,name,picture,imgsvr,turntime,city,turn0,turn1,turn2,turn3,turn4,turn5,troop FROM general WHERE no IN %li',
+        array_column($troops, 'no')
+    ) as $troopLeader
+    ){
+        $imageTemp = GetImageURL($troopLeader['imgsvr']);
+        
+        $troopLeader['pictureFullPath'] = "$imageTemp/{$troopLeader['picture']}";
+        $troopLeader['cityText'] = CityConst::byID($troopLeader['city'])->name;
+
+        $troopLeader['turnText'] = join('<br>', [
+            '1 : '.((DecodeCommand($troopLeader['turn0'])[0] == 26)?'집합':'~'),
+            '2 : '.((DecodeCommand($troopLeader['turn1'])[0] == 26)?'집합':'~'),
+            '3 : '.((DecodeCommand($troopLeader['turn2'])[0] == 26)?'집합':'~'),
+            '4 : '.((DecodeCommand($troopLeader['turn3'])[0] == 26)?'집합':'~'),
+            '5 : '.((DecodeCommand($troopLeader['turn4'])[0] == 26)?'집합':'~'),
+        ]);
+        $troops[$troopLeader['troop']]['leader'] = $troopLeader;
+    }
+}
+
+uasort($troops, function($lhs, $rhs){
+    return $lhs['leader']['turntime']<=>$rhs['leader']['turntime'];
+})
 
 ?>
 <!DOCTYPE html>
@@ -28,10 +73,14 @@ $troopcount = MYDB_num_rows($result);
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <title><?=UniqueConst::$serverName?>: 부대편성</title>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/ext.plugin_troop.js')?>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('js/ext.plugin_troop.js')?>
+<?=WebUtil::printCSS('css/troops.css')?>
 </head>
 
 <body>
@@ -50,121 +99,97 @@ $troopcount = MYDB_num_rows($result);
         <td width=130  class='bg1 center' style=table-layout:fixed;word-break:break-all;>부대장행동</td>
     </tr>
     </thead>
+    <tfoot><tr><td colspan='5'>
+    <?php if(!$troops): ?>
+    <?php elseif($me['troop'] == 0): ?>
+        <input type=submit name=btn value='부 대 가 입'>
+    <?php else: ?>
+        <input type=submit name=btn value='부 대 탈 퇴' onclick='return confirm("정말 부대를 탈퇴하시겠습니까?")'>
+    <?php endif;?>
+    </td></tr></tfoot>
     <tbody>
 <?php
-for($i=0; $i < $troopcount; $i++) {
-    $troop = MYDB_fetch_array($result);
+foreach ($troops as $troopNo=>$troop) {
+    $troopLeader = $troop['leader'];
+    $genlistText = [];
+    $cityText = $troopLeader['cityText'];
+    $cityID = $troopLeader['city'];
+    $leaderID = $troopLeader['no'];
 
-    $genlist = "";
-    $query = "select no,name,picture,imgsvr,turntime,city,turn0,turn1,turn2,turn3,turn4,turn5 from general where troop='{$troop['troop']}'";
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gencount = MYDB_num_rows($genresult);
-    for($j=0; $j < $gencount; $j++) {
-        $general = MYDB_fetch_array($genresult);
-        $genlist .= $general['name'].", ";
-        if($troop['no'] == $general['no']) {
-            $picture = $general['picture'];
-            $imageTemp = GetImageURL($general['imgsvr']);
-            $name = $general['name'];
-            $turntime = $general['turntime'];
-            $query = "select name from city where city='{$general['city']}'";
-            $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $city = MYDB_fetch_array($cityresult);
-            $cityname = $city['name'];
-            $turn = "";
-            for($k=0; $k < 5; $k++) {
-                $m = $k+1;
-                $turnK = DecodeCommand($general["turn{$k}"]);
-                if($turnK[0] == 26) {
-                    $turn .= "&nbsp;$m : 집합<br>";
-                } else {
-                    $turn .= "&nbsp;$m : ∼<br>";
+    foreach ($troop['users'] as $troopUser) {
+        $spanClass = 'troopUser';
+        if ($troopUser['city'] !== $cityID) {
+            $spanClass.= ' diffCity';
         }
+        if ($troopUser['no'] == $leaderID) {
+            $spanClass.= ' leader';
         }
+        $genlistText[] = "<span class='$spanClass' data-general-id='{$troopUser['no']}'
+            ><span class='generalName'>{$troopUser['name']}</span><span class='cityText'>【{$troopUser['cityText']}】</span
+            ></span>";
     }
-    }
-    $genlist .= "({$gencount}명)";
 
-    if($me['troop'] == 0) {
-        echo "
+    $genlistText = sprintf('%s (%d명)', join(', ', $genlistText), count($genlistText)); ?>
+
+<?php if ($me['troop'] == 0): ?>
     <tr>
-        <td align=center rowspan=2><input "; echo $i==0?"checked ":""; echo "type=radio name=troop value='{$troop['troop']}'></td>
-        <td align=center >{$troop['name']}<br>【 $cityname 】</td>
-        <td height=64 style='background:no-repeat center url(\"{$imageTemp}/{$picture}\");background-size:64px;'>&nbsp;</td>
-        <td rowspan=2 width=62>$genlist</td>
-        <td rowspan=2>$turn</td>
+        <td align=center rowspan=2><input type='radio' name='troop' value='<?=$troop['troop']?>'></td>
+        <td align=center><?=$troop['name']?><br>【 <?=$cityText?> 】</td>
+        <td height=64 class='generalIcon' style='background:no-repeat center url("<?=$troopLeader['pictureFullPath']?>");background-size:64px;'>&nbsp;</td>
+        <td rowspan=2 width=62><?=$genlistText?></td>
+        <td rowspan=2><?=$troopLeader['turnText']?></td>
     </tr>
-    <tr><td align=center><font size=2>【턴】".substr($turntime, 14)."</font></td><td align=center><font size=1>$name</font></td></tr>
-    <tr><td colspan=5>";
-    } else {
-        echo "
+    <tr>
+        <td align=center><font size=2>【턴】 <?=substr($troopLeader['turntime'], 14)?></font></td>
+        <td align=center><font size=1><?=$troopLeader['name']?></font></td></tr>
+    <tr><td colspan=5>
+
+<?php else: ?>
     <tr>
         <td align=center rowspan=2>&nbsp;</td>
-        <td align=center >{$troop['name']}<br>【 $cityname 】</td>
-        <td height=64 style='background:no-repeat center url(\"{$imageTemp}/{$picture}\");background-size:64px;'>&nbsp;</td>
-        <td rowspan=2 width=576>$genlist</td>
-        <td rowspan=2>";
-
-        if($troop['no'] == $me['no']) {
-            $query = "select no,name from general where troop='{$troop['troop']}' and no!='{$me['no']}' order by binary(name)";
-            $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $genCount = MYDB_num_rows($genresult);
-                echo "
+        <td align=center ><?=$troop['name']?><br>【 <?=$cityText?> 】</td>
+        <td height=64 class='generalIcon' style='background:no-repeat center url("<?=$troopLeader['pictureFullPath']?>");background-size:64px;'>&nbsp;</td>
+        <td rowspan=2 width=62><?=$genlistText?></td>
+        <td rowspan=2>
+        <?php if ($me['no'] == $troopLeader['no']): ?>
             <select name=gen size=3 style=color:white;background-color:black;font-size:13px;width:128px;>";
-            for($k=0; $k < $genCount; $k++) {
-                $general = MYDB_fetch_array($genresult);
-                echo "
-                <option value={$general['no']}>{$general['name']}</option>";
-            }
-            echo "
+                <?php foreach ($troop['users'] as $troopUser): ?>
+                    <?php if ($troopUser['no'] == $me['no']) {
+        continue;
+    } ?>
+                    <option value='<?=$troopUser['no']?>'><?=$troopUser['name']?></option>
+                <?php endforeach; ?>
             </select><br>
-            <input type=submit name=btn value='부 대 추 방' style=width:130px;height:25px;>";
-        } else {
-            echo $turn;
-        }
-
-        echo "
+            <input type=submit name=btn value='부 대 추 방' style=width:130px;height:25px;>
+        <?php else: ?>
+            <?=$troopLeader['turnText']?>
+        <?php endif; ?>
         </td>
     </tr>
-    <tr><td align=center><font size=2>【턴】".substr($turntime, 14)."</font></td><td align=center><font size=1>$name</font></td></tr>
-    <tr><td colspan=5></td></tr>";
-    }
-}
-echo "</tbody>
-<tfoot><tr><td>";
-if ($troopcount == 0) {
-}
-else if($me['troop'] == 0) {
-    echo"
-<input type=submit name=btn value='부 대 가 입'>";
-} else {
-    echo"
-<input type=submit name=btn value='부 대 탈 퇴' onclick='return confirm(\"정말 부대를 탈퇴하시겠습니까?\")'>";
-}
+    <tr><td align=center><font size=2>【턴】 <?=substr($troopLeader['turntime'], 14)?></font></td>
+    <td align=center><font size=1><?=$troopLeader['name']?></font></td></tr>
+    <tr><td colspan=5></td></tr>
+<?php endif;
+
+} //foreach ($troops as $troopNo=>$troop) {
+?>
+
+</tbody>
 
-echo "
-</td></tr>
-</tfoot>
 </table>
-<br>";
-
-echo "
+<br>
 <table width=1000 class='tb_layout bg0'>
     <tr>
         <td width=80 id=bg1>부 대 명</td>
-        <td width=130><input type=text style=color:white;background-color:black; size=18 maxlength=9 name=name></td>";
-if($me['troop'] == 0) {
-    echo "
-        <td><input type=submit name=btn value='부 대 창 설'></td>";
-} else {
-    echo "
-        <td><input type=submit name=btn value='부 대 변 경'></td>";
-}
-echo "
+        <td width=130><input type=text style=color:white;background-color:black; size=18 maxlength=9 name=name></td>
+    <?php if($me['troop'] == 0): ?>
+        <td><input type=submit name=btn value='부 대 창 설'></td>
+    <?php else: ?>
+        <td><input type=submit name=btn value='부 대 변 경'></td>
+    <?php endif; ?>
     </tr>
-</table>";
+</table>
 
-?>
 <table width=1000 class='tb_layout bg0'>
     <tr><td><?=backButton()?></td></tr>
     <tr><td><?=banner()?> </td></tr>

hwe/battle_simulator.php

@@ -0,0 +1,473 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+$session = Session::requireLogin()->setReadOnly();
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+$startYear = $gameStor->getValue('startyear');
+
+?>
+<!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=1100" />
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+<?=WebUtil::printCSS('../d_shared/common.css')?>
+<?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printCSS('css/battle_simulator.css')?>
+<?=WebUtil::printJS('../d_shared/common_path.js')?>
+<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
+<?=WebUtil::printJS('../e_lib/moment.min.js')?>
+<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('../e_lib/download2.js')?>
+<?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/battle_simulator.js')?>
+</head>
+<body>
+<div id="container">
+<div class="card mb-3">
+    <div class="card-header">
+        전역 설정
+    </div>
+    <div class="card-body dragpad_battle">
+        <div class="row">
+            <div class="col-sm-6">
+                <div class="input-group">
+                    <input type="number" class="form-control" aria-describedby="text_year" value="<?=$startYear?>" disabled>
+                    <div class="input-group-append">
+                        <span class="input-group-text">년 시작</span>
+                    </div>
+                    <input type="number" class="form-control" id="year" value="<?=$startYear+3?>" min="<?=$startYear?>">
+                    <div class="input-group-append">
+                        <span class="input-group-text">년</span>
+                    </div>
+                    <input type="number" class="form-control" id="month" value="1" min="1" max="12">
+                    <div class="input-group-append">
+                        <span class="input-group-text">월</span>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="btn-toolbar" role="toolbar">
+                    <div class="input-group mr-2" role="group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text">반복 횟수</span>
+                        </div>
+                        <select class="custom-select" id="repeat_cnt">
+                            <option value="1">1회 (로그 표기)</option>
+                            <option value="1000">1000회 (요약 표기)</option>
+                        </select>
+                    </div>
+                    <div class="btn-group mr-2" role="group">
+                        <button type="button" class="btn btn-danger btn-begin_battle">전투</button>
+                    </div>
+                    <div class="btn-group mr-2" role="group">
+                        <button type="button" class="btn btn-info btn-battle-save">모두 저장</button>
+                        <input type="file" class="form_load_battle_file" accept=".json" style="display: none;" />
+                        <button type="button" class="btn btn-primary btn-battle-load">모두 불러오기</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-sm">
+        <div class="card mb-2 attacker_nation">
+            <div class="card-header">
+                출병국 설정
+            </div>
+            <div class="card-body nation_detail dragpad_battle">
+                <div class="input-group mb-1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">국가 성향</span>
+                    </div>
+                    <select class="custom-select form_nation_type" style="width:25ch;">
+                        <?php foreach(getNationTypeList() as $typeID => [$name,$pros,$cons]): ?>
+                            <option value="<?=$typeID?>"><?=$name?> (<?=$pros?>, <?=$cons?>)</option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">기술</span>
+                    </div>
+                    <input type="number" class="form-control form_tech" value="1" min="0" max="12">
+                    <div class="input-group-append">
+                        <span class="input-group-text">등급</span>
+                    </div>
+                </div>
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">국가 규모</span>
+                    </div>
+                    <select class="custom-select form_nation_level">
+                        <?php foreach(getNationLevelList() as $nationLevel => [$name,$chiefCnt,$cityCnt]): ?>
+                            <option value="<?=$nationLevel?>"><?=$name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">도시 규모</span>
+                    </div>
+                    <select class="custom-select form_city_level">
+                        <?php foreach(getCityLevelList() as $levelID => $name): ?>
+                            <option value="<?=$levelID?>"><?=$name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">수도</span>
+                    </div>
+                    <div class="input-group-append btn-group btn-group-toggle" data-toggle="buttons">
+                        <label class="btn btn-secondary">
+                            <input type="radio" name="is_attacker_capital" class="form_is_capital" value="1" autocomplete="off">Y
+                        </label>
+                        <label class="btn btn-secondary active">
+                            <input type="radio" name="is_attacker_capital" class="form_is_capital" value="2" autocomplete="off" checked>N
+                        </label>
+                    </div>
+                    
+                </div>
+                <div class="input-group mb-1">
+                    
+                </div>
+            </div>
+        </div>
+        <div class="card mb-2 attacker_form general_form" data-general_no='1'>
+            <div class="card-header">
+                <div class="float-sm-left" style="line-height:25px;">출병자 설정</div>
+                <div class="float-sm-right btn-toolbar" role="toolbar">
+                    <div class="btn-group btn-group-sm mr-2" role="group">
+                        <button type="button" class="btn btn-info btn-general-save">저장</button>
+                        <input type="file" class="form_load_general_file" accept=".json" style="display: none;" />
+                        <button type="button" class="btn btn-primary btn-general-load">불러오기</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div><!-- <div class="col-sm"> -->
+    <div class="col-sm defender-column">
+        <div class="card mb-2 defender_nation">
+            <div class="card-header">
+                수비국 설정
+            </div>
+            <div class="card-body dragpad_battle">
+                <div class="input-group mb-1">
+                <div class="input-group-prepend">
+                        <span class="input-group-text">국가 성향</span>
+                    </div>
+                    <select class="custom-select form_nation_type" style="width:25ch;">
+                        <?php foreach(getNationTypeList() as $typeID => [$name,$pros,$cons]): ?>
+                            <option value="<?=$typeID?>"><?=$name?> (<?=$pros?>, <?=$cons?>)</option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">기술</span>
+                    </div>
+                    <input type="number" class="form-control form_tech" value="1" min="0" max="12">
+                    <div class="input-group-append">
+                        <span class="input-group-text">등급</span>
+                    </div>
+                </div>
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">국가 규모</span>
+                    </div>
+                    <select class="custom-select form_nation_level">
+                        <?php foreach(getNationLevelList() as $nationLevel => [$name,$chiefCnt,$cityCnt]): ?>
+                            <option value="<?=$nationLevel?>"><?=$name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">도시 규모</span>
+                    </div>
+                    <select class="custom-select form_city_level">
+                        <?php foreach(getCityLevelList() as $levelID => $name): ?>
+                            <option value="<?=$levelID?>"><?=$name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">수도</span>
+                    </div>
+                    <div class="input-group-append btn-group btn-group-toggle" data-toggle="buttons">
+                        <label class="btn btn-secondary">
+                            <input type="radio" name="is_defender_capital" class="form_is_capital" value="1" autocomplete="off">Y
+                        </label>
+                        <label class="btn btn-secondary active">
+                            <input type="radio" name="is_defender_capital" class="form_is_capital" value="0" autocomplete="off" checked>N
+                        </label>
+                    </div>
+                </div>
+                <div class="input-group mb-1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">수비</span>
+                    </div>
+                    <input type="number" class="form-control form_def" id="city_def" value="1000" min="10" step="10">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">성벽</span>
+                    </div>
+                    <input type="number" class="form-control form_wall" id="city_wall" value="1000" min="0" step="10">
+                </div>
+            </div>
+        </div>
+        <div class="card mb-2 defender_add_form">
+            <div class="card-header">
+                <div class="float-sm-left" style="line-height:25px;">수비자 설정</div>
+                <div class="float-sm-right btn-toolbar" role="toolbar">
+                    <div class="btn-group btn-group-sm mr-2" role="group">
+                        <button type="button" class="btn btn-dark btn-reorder_defender">수비 순서대로 정렬</button>
+                    </div>
+                    <div class="btn-group btn-group-sm" role="group">
+                        <button type="button" class="btn btn-success add-defender">추가</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="card mb-2 form_sample">
+            <div class="card-header">
+                <div class="float-sm-left" style="line-height:25px;">수비자 설정</div>
+                <div class="float-sm-right btn-toolbar" role="toolbar">
+                    <div class="btn-group btn-group-sm mr-2" role="group">
+                        <button type="button" class="btn btn-info btn-general-save">저장</button>
+                        <input type="file" class="form_load_general_file" accept=".json" style="display: none;" />
+                        <button type="button" class="btn btn-primary btn-general-load">불러오기</button>
+                    </div>
+                    <div class="btn-group btn-group-sm" role="group">
+                        <button type="button" class="btn btn-warning copy-defender">복제</button>
+                        <button type="button" class="btn btn-danger delete-defender">제거</button>
+                    </div>
+                </div>
+            </div>
+            <div class="card-body general_detail">
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">이름</span>
+                    </div>
+                    <input type="text" class="form-control form_general_name" value="무명" style="width:15ch;">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">직위</span>
+                    </div>
+                    <select class="custom-select form_general_level" style="width:8ch;">
+                        <option value="1">일반</option>
+                        <option value="4">태수</option>
+                        <option value="3">군사</option>
+                        <option value="2">시중</option>
+                        <option value="10">무장 수뇌</option>
+                        <option value="9">지장 수뇌</option>
+                        <option value="11">참모</option>
+                        <option value="12">군주</option>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Level</span>
+                    </div>
+                    <input type="number" class="form-control form_exp_level" value="20" min="0" max="300" step="1">
+                    
+                </div>
+                <div class="input-group mb-1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">통솔</span>
+                    </div>
+                    <input type="number" class="form-control form_leadership" value="50" min="1" max="300" step="1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">무력</span>
+                    </div>
+                    <input type="number" class="form-control form_power" value="50" min="1" max="300" step="1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">지력</span>
+                    </div>
+                    <input type="number" class="form-control form_intel" value="50" min="1" max="300" step="1">
+                </div>
+                <div class="input-group mb-1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">명마</span>
+                    </div>
+                    <select class="custom-select form_general_horse">
+                        <?php foreach(range(0, 26) as $horseID): ?>
+                            <option value="<?=$horseID?>"><?=getHorseName($horseID)?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">무기</span>
+                    </div>
+                    <select class="custom-select form_general_weap">
+                        <?php foreach(range(0, 26) as $weapID): ?>
+                            <option value="<?=$weapID?>"><?=getWeapName($weapID)?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">서적</span>
+                    </div>
+                    <select class="custom-select form_general_book">
+                        <?php foreach(range(0, 26) as $bookID): ?>
+                            <option value="<?=$bookID?>"><?=getBookName($bookID)?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">부상</span>
+                    </div>
+                    <input type="number" class="form-control form_injury" value="0" min="0" max="80" step="1">
+                    <div class="input-group-append">
+                        <span class="input-group-text">%(<span class="injury_helptext">건강</span>)</span>
+                    </div>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">군량</span>
+                    </div>
+                    <input type="number" class="form-control form_rice" value="5000" min="50" max="40000" step="50">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">도구</span>
+                    </div>
+                    <select class="custom-select form_general_item">
+                        <?php foreach(range(0, 26) as $bookID): ?>
+                            <option value="<?=$bookID?>"><?=getItemName($bookID)?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                <div class="input-group mb-1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">병종</span>
+                    </div>
+                    <select class="custom-select form_crewtype">
+                        <?php foreach(GameUnitConst::all() as $crewTypeID => $crewType): ?>
+                            <?php if($crewTypeID < 0){ continue; } ?>
+                            <option value="<?=$crewTypeID?>"><?=$crewType->name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">병사</span>
+                    </div>
+                    <input type="number" class="form-control form_crew" value="7000" min="100" step="100">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">성격</span>
+                    </div>
+                    <select class="custom-select form_general_character">
+                        <?php foreach(getCharacterList() as $characterID => [$name,$info]): ?>
+                            <option value="<?=$characterID?>"><?=$name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                <div class="input-group mb-3">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">훈련</span>
+                    </div>
+                    <input type="number" class="form-control form_train" value="100" min="40" max="<?=GameConst::$maxTrainByWar?>" step="1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">사기</span>
+                    </div>
+                    <input type="number" class="form-control form_atmos" value="100" min="40" max="<?=GameConst::$maxAtmosByWar?>" step="1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">전특</span>
+                    </div>
+                    <select class="custom-select form_general_special_war">
+                        <option value="0">-</option>
+                        <?php foreach(SpecialityConst::WAR as $specialWarID => [$name,$buff,$cond]): ?>
+                            <option value="<?=$specialWarID?>"><?=$name?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                <div class="input-group mb-1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">보병숙련</span>
+                    </div>
+                    <select class="custom-select form_dex0">
+                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
+                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">궁병숙련</span>
+                    </div>
+                    <select class="custom-select form_dex10">
+                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
+                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">기병숙련</span>
+                    </div>
+                    <select class="custom-select form_dex20">
+                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
+                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+                <div class="input-group mb-1">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">귀병숙련</span>
+                    </div>
+                    <select class="custom-select form_dex30">
+                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
+                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">차병숙련</span>
+                    </div>
+                    <select class="custom-select form_dex40">
+                        <?php foreach(getDexLevelList() as $dexLevel => [$dexAmount, $color, $name]): ?>
+                            <option value="<?=$dexAmount?>"><?="{$name} (".number_format($dexAmount).")"?></option>
+                        <?php endforeach; ?>
+                    </select>
+                    <div class="input-group-prepend only_defender">
+                        <span class="input-group-text">수비여부</span>
+                    </div>
+                    <select class="custom-select form_defend_mode only_defender">
+                        <option value="2">훈사 80</option>
+                        <option value="3">훈사 60</option>
+                        <option value="0">안함</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+
+        
+    </div><!-- <div class="col-sm"> -->
+</div>
+<div class="card mb-3">
+    <div class="card-header">
+        전투 요약
+    </div>
+    <table class="table">
+        <tbody id="battle_result_summary">
+            <tr><th style='width:18ch;'>전투 일시</th><td id='result_datetime'></td></tr>
+            <tr><th>전투 횟수</th><td id='result_warcnt'></td></tr>
+            <tr><th>전투 페이즈</th><td id='result_phase'></td></tr>
+            <tr><th>준 피해</th><td><span id='result_killed'>0</span><span id='result_varKilled'> (<span id='result_minKilled'>0</span> ~ <span id='result_maxKilled'>0</span>)</span></td></tr>
+            <tr><th>받은 피해</th><td><span id='result_dead'>0</span><span id='result_varDead'> (<span id='result_minDead'>0</span> ~ <span id='result_maxDead'>0</span>)</span></td></tr>
+            <tr><th>출병자 군량 소모</th><td id='result_attackerRice'></td></tr>
+            <tr><th>수비자 군량 소모</th><td id='result_defenderRice'></td></tr>
+            <tr><th>공격자 스킬</th><td id='result_attackerSkills'></td></tr>
+            <tr class='result_defenderSkills'><th>수비자1 스킬</th><td></td></tr>
+        </tbody>
+    </table>
+</div>
+<div class="row">
+    <div class="col-sm">
+        <div class="card mb-3">
+            <div class="card-header">
+                마지막 전투 로그
+            </div>
+            <div class="card-body" id="generalBattleResultLog">
+
+            </div>
+        </div>
+    </div>
+    <div class="col-sm">
+        <div class="card mb-3">
+            <div class="card-header">
+                마지막 전투 상세 로그
+            </div>
+            <div class="card-body" id="generalBattleDetailLog">
+
+            </div>
+        </div>
+    </div>
+</div>
+</div>
+</body>
+</html>

hwe/c_dipcenter.php

@@ -28,13 +28,13 @@ if($me['level'] < 5) {
     exit();
 }
 
-if($btn == "국가방침") {
+if($btn == "국가방침 수정") {
     $msg = mb_substr($msg, 0, 16384);
     //$msg = StringUtil::
     $db->update('nation', [
         'msg'=>WebUtil::htmlPurify($msg)
     ], 'nation=%i',$me['nation']);
-} elseif($btn == "임관권유") {
+} elseif($btn == "임관 권유문 수정") {
     $scoutmsg = mb_substr($scoutmsg, 0, 1000);
     $db->update('nation', [
         'scoutmsg'=>WebUtil::htmlPurify($scoutmsg)

hwe/c_double.php

@@ -37,7 +37,6 @@ if($third < 0)  { $third = 0; }
 if($fourth < 0) { $fourth = 0; }
 if($command > 99) { $command = 0; }
 if($double > 9999) { $double = 9999; }
-if($third > 9999)  { $third = 9999; }
 if($fourth > 9999) { $fourth = 9999; }
 
 $comStr = EncodeCommand($fourth, $third, $double, $command);

hwe/c_myBossInfo.php

@@ -75,6 +75,12 @@ if($btn == "임명") {
         header('location:b_myBossInfo.php');
         exit();
     }
+
+    //NPC 부대장 추방 불가
+    if($general['npc'] == 5){
+        header('location:b_myBossInfo.php');
+        exit();
+    }
 }
 
 //나와 대상 장수는 국가가 같아야 함

hwe/c_tournament.php

@@ -38,9 +38,13 @@ case 3: $tp = "intel";  $tp2 = "설전";   $tp3 = "intel"; break;
 }
 
 if($btn == '참가') {
-    $query = "select no,name,npc,leader,power,intel,explevel,gold,horse,weap,book from general where no='{$me['no']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
+
+    if($db->queryFirstField('SELECT `no` FROM tournament WHERE `no`=%i', $me['no'])){
+        header('location:b_tournament.php');
+        exit(1); 
+    }
+
+    $general = $db->queryFirstRow('SELECT no,name,npc,leader,power,intel,explevel,gold,horse,weap,book FROM general WHERE `no`=%i', $me['no']);
 
     //{$admin['develcost']}원 참가비
     if($general['gold'] < $admin['develcost']) { 

hwe/commandlist.php

@@ -16,6 +16,10 @@ $db = DB::db();
 <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')?>
 <script type="text/javascript">
@@ -107,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><b>{$year}年 {$month}月</b></td>
+        <td width=71 align=center height=24 id=bg1 style='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/battle_simulator.css

@@ -0,0 +1,17 @@
+#container{
+    width:1024px;
+    margin:auto;
+}
+
+.defender_add_form .general_detail{
+    display:none;
+}
+
+
+.form_sample{
+    display:none;
+}
+
+input[type=number]{
+    text-align:right;
+}

hwe/css/common.css

@@ -201,4 +201,20 @@ div.bar_out div.bar_in{
     font-size  : .875rem;
     line-height  : .5;
     border-radius : .2rem;
-  }
+}
+
+.edit_form.viewer{
+    max-height:200px;
+    overflow-y:auto;
+}
+
+.trumbowyg-box{
+    margin:0;
+    border-left:none;
+    border-right:none;
+}
+
+.edit_form.trumbowyg-editor{
+    margin:0;
+    padding:0;
+}

hwe/css/dipcenter.css

@@ -0,0 +1,23 @@
+#scoutMsgForm .viewer{
+    max-height:200px;
+    overflow: hidden;
+}
+
+.note-editor.card {
+    background:inherit;
+    color:inherit;
+    font-family: inherit;
+    border:none;
+}
+
+.note-editor.note-frame .note-editing-area .note-editable {
+    background:inherit;
+    color:inherit;
+    font-family: inherit;
+    padding:0;
+}
+
+.note-editor.note-frame .note-statusbar{
+    background-color:#444444;
+    border-top: 1px solid rgba(0,0,0,0.125);
+}

hwe/css/map.css

@@ -69,8 +69,9 @@
     position: absolute;
     z-index:6;
     display:none;
-    width:120px;
+    min-width:120px;
     border: 0.02em gray solid;
+    white-space: nowrap;
 }
 .world_map .city_name{
     background-color: rgb(30, 164, 255);

hwe/css/troops.css

@@ -0,0 +1,23 @@
+#troop_list .cityText{
+    display:none;
+}
+
+#troop_list .diffCity .cityText{
+    display:inline;
+}
+
+#troop_list .diffCity {
+    color:red;
+}
+
+#troop_list .leader{
+    color:lightgreen;
+}
+
+#troop_list .leader::before{
+    content:'*';
+}
+
+#troop_list .leader::after{
+    content:'*';
+}

hwe/func.php

@@ -417,7 +417,7 @@ function addCommand($typename, $value, $valid = 1, $color=0) {
         }
     } else {
         echo "
-    <option style=color:white;background-color:red; value={$value}>{$typename}</option>";
+    <option style=color:white;background-color:red; value={$value}>{$typename}(불가)</option>";
     }
 }
 
@@ -709,7 +709,7 @@ function CoreCommandTable() {
     addCommand("몰수", 24, $valid);
     commandGroup("", 1);
     commandGroup("====== 외 교 ======");
-    addCommand("통합 제의", 53, $valid);
+    //addCommand("통합 제의", 53, $valid);
 
     addCommand("항복 권고", 51, $valid);
     if($nation['level'] >= 2) {
@@ -877,7 +877,7 @@ function generalInfo($no) {
     $imageTemp = GetImageURL($general['imgsvr']);
     echo "<table width=498 class='tb_layout bg2'>
     <tr>
-        <td width=64 height=64 rowspan=3 style='text-align:center;background:no-repeat center url(\"{$imageTemp}/{$general['picture']}\");background-size:64px;'>&nbsp;</td>
+        <td width=64 height=64 rowspan=3 class='generalIcon' style='text-align:center;background:no-repeat center url(\"{$imageTemp}/{$general['picture']}\");background-size:64px;'>&nbsp;</td>
         <td colspan=9 height=16 style=text-align:center;color:".newColor($nation['color']).";background-color:{$nation['color']};font-weight:bold;font-size:13px;>{$general['name']} 【 {$level} | {$call} | {$color}{$injury}</font> 】 ".substr($general['turntime'], 11)."</td>
     </tr>
     <tr height=16>
@@ -1148,7 +1148,7 @@ function msgprint($msg, $name, $picture, $imgsvr, $when, $num, $type) {
         <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' src={$imageTemp}/{$picture} border='0'></td>
+        <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++) {
@@ -1245,14 +1245,16 @@ function increaseRefresh($type="", $cnt=1) {
     $session = Session::getInstance();
     $userID = $session->userID;
     $generalID = $session->generalID;
+    $userGrade = $session->userGrade;
 
     $date = date('Y-m-d H:i:s');
 
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $gameStor->refresh = $gameStor->refresh+$cnt; //TODO: +로 증가하는 값은 별도로 분리
+    $isunited = $gameStor->isunited;
 
-    if($generalID) {
+    if($isunited != 2 && $generalID && $userGrade < 6) {
         $db->update('general', [
             'lastrefresh'=>$date,
             'con'=>$db->sqleval('con + %i', $cnt),
@@ -1813,7 +1815,7 @@ function PreprocessCommand($no) {
     $connect=$db->get();
     $log = [];
 
-    $query = "select no,name,city,injury,special2,item,turn0 from general where no='$no'";
+    $query = "select no,name,city,injury,special2,item,turn0,rice,crew from general where no='$no'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
 
@@ -1888,6 +1890,27 @@ function PreprocessCommand($no) {
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         }
     }
+
+    
+    if($general['crew'] >= 100){
+        $newRice = $general['rice'] - $general['crew'] / 100;
+        if($newRice >= 0){
+            $db->update('general', [
+                'rice'=>Util::round($newRice)
+            ], 'no=%i',$general['no']);
+        }
+        else{
+            $db->update('city', [
+                'pop'=>$db->sqleval('pop + %i', $general['crew'])
+            ], 'city=%i', $general['city']);
+            $db->update('general', [
+                'crew'=>0,
+                'rice'=>0
+            ], 'no=%i',$general['no']);
+            pushGenLog($general, ["<C>●</>군량이 모자라 병사들이 <R>소집해제</>되었습니다!"]);
+        }
+    }
+
 }
 
 
@@ -2017,7 +2040,7 @@ function updateTurntime($no) {
             default: $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <R>사망</>했습니다."; break;
             }
             // 엔피씨,엠피씨,의병 사망로그
-            if($general['npc'] == 2) {
+            if($general['npc'] == 2 || $general['npc'] == 6) {
                 $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <R>사망</>했습니다.";
             } elseif($general['npc'] >= 3) {
                 switch(rand()%10) {
@@ -2706,6 +2729,60 @@ function CharExperience($exp, $personal) {
     return $exp;
 }
 
+function getCharExpMultiplier($personal):float{
+    static $table = [
+        0 => 1.1,
+        1 => 1.1,
+        4 => 0.9,
+        5 => 0.9,
+        6 => 1.1,
+        7 => 0.9,
+        10 => 0.9
+    ];
+    return $table[$personal] ?? 1;
+}
+
+function getNationTechMultiplier($nationType):float{
+    static $table = [
+        3 => 1.1,
+        5 => 0.9,
+        6 => 0.9,
+        7 => 0.9,
+        8 => 0.9,
+        12 => 0.9,
+        13 => 1.1,
+    ];
+    return $table[$nationType] ?? 1;
+}
+
+function getNationWallMultiplier($nationType):float{
+    static $table = [
+        3 => 1.1,
+        5 => 1.1,
+        10 => 1.1,
+        11 => 1.1,
+        4 => 0.9,
+        7 => 0.9,
+        8 => 0.9,
+        13 => 0.9,
+    ];
+    return $table[$nationType] ?? 1;
+}
+
+function getNationPeopleMultiplier($nationType):float{
+    static $table = [
+        1 => 0.9,
+        2 => 1.1,
+        3 => 0.9,
+        4 => 1.1,
+        7 => 1.1,
+        9 => 0.9,
+        10 => 1.1,
+    ];
+    return $table[$nationType] ?? 1;
+}
+
+
 function CharDedication($ded, $personal) {
     switch($personal) {
         case 10:
@@ -2716,6 +2793,13 @@ function CharDedication($ded, $personal) {
     return $ded;
 }
 
+function getCharDedMultiplier($personal):float{
+    static $table = [
+        10 => 0.9
+    ];
+    return $table[$personal] ?? 1;
+}
+
 function CharAtmos($atmos, $personal) {
     switch($personal) {
         case  2:    case  4:
@@ -2764,6 +2848,8 @@ function SabotageInjury($city, $type=0) {
     $connect=$db->get();
     $log = [];
 
+    $injuryCount = 0;
+
     $admin = $gameStor->getValues(['year', 'month']);
 
     $query = "select no,name,nation from general where city='$city'";
@@ -2785,8 +2871,11 @@ function SabotageInjury($city, $type=0) {
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
             pushGenLog($general, $log);
+            $injuryCount += 1;
         }
     }
+
+    return $injuryCount;
 }
 
 function getRandTurn($term) {

hwe/func_command.php

@@ -471,7 +471,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 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 from general where no='$no'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
     
@@ -511,7 +511,7 @@ function processCommand($no) {
                 case 27: process_27($general); break; //발령
                 case 51: process_51($general); break; //항복권고
                 case 52: process_52($general); break; //원조
-                case 53: process_53($general); break; //통합제의
+                //case 53: process_53($general); break; //통합제의
                 case 61: process_61($general); break; //불가침제의
                 case 62: process_62($general); break; //선전 포고
                 case 63: process_63($general); break; //종전 제의
@@ -533,7 +533,7 @@ 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 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 from general where no='$no'";
             $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
             $general = MYDB_fetch_array($result);
         }

hwe/func_converter.php

@@ -8,42 +8,43 @@ namespace sammo;
  * Side effect 없이 값의 변환만을 수행하는 함수들의 모음.
  */
 
-
 function NationCharCall($call) {
-    switch($call) {
-        case '명가':    $type =13; break;
-        case '음양가':  $type =12; break;
-        case '종횡가':  $type =11; break;
-        case '불가':    $type =10; break;
-        case '도적':    $type = 9; break;
-        case '오두미도':$type = 8; break;
-        case '태평도':  $type = 7; break;
-        case '도가':    $type = 6; break;
-        case '묵가':    $type = 5; break;
-        case '덕가':    $type = 4; break;
-        case '병가':    $type = 3; break;
-        case '유가':    $type = 2; break;
-        case '법가':    $type = 1; break;
-        default:        $type = 0; break;
+    static $invTable = [];
+    if(!$invTable){
+        foreach(getNationTypeList() as $typeID => [$name, $pros, $cons]){
+            $invTable[$name] = $typeID;
         }
-    return $type;
+    }
+    return $invTable[$call]??0;
+}
+
+function getCharacterList(){
+    $infoText = [
+        9=>['안전', '사기 -5, 징·모병 비용 -20%'],
+        8=>['유지', '훈련 -5, 징·모병 비용 -20%'],
+        7=>['재간', '명성 -10%, 징·모병 비용 -20%'],
+        6=>['출세', '명성 +10%, 징·모병 비용 +20%'],
+        5=>['할거', '명성 -10%, 훈련 +5'],
+        4=>['정복', '명성 -10%, 사기 +5'],
+        3=>['패권', '훈련 +5, 징·모병 비용 +20%'],
+        2=>['의협', '사기 +5, 징·모병 비용 +20%'],
+        1=>['대의', '명성 +10%, 훈련 -5'],
+        0=>['왕좌', '명성 +10%, 사기 -5'],
+        10=>['은둔', '명성 -10%, 계급 -10%, 사기 -5, 훈련 -5, 단련 성공률 +10%'],
+    ];
+    return $infoText;
 }
 
 function CharCall($call) {
-    switch($call) {
-        case '은둔':    $type =10; break;
-        case '안전';    $type = 9; break;
-        case '유지';    $type = 8; break;
-        case '재간';    $type = 7; break;
-        case '출세';    $type = 6; break;
-        case '할거';    $type = 5; break;
-        case '정복';    $type = 4; break;
-        case '패권';    $type = 3; break;
-        case '의협';    $type = 2; break;
-        case '대의';    $type = 1; break;
-        case '왕좌';    $type = 0; break;
+    static $invTable = [];
+    if(\key_exists($call, $invTable)){
+        return $invTable[$call];
     }
-    return $type;
+
+    foreach(getCharacterList() as $id => [$name, $info]){
+        $invTable[$name] = $id;
+    }
+    return $invTable[$call];
 }
 
 function SpecCall($call) {
@@ -119,42 +120,14 @@ function getNationLevel($level) {
 }
 
 function getGenChar($type) {
-    switch($type) {
-        case 10: $call = '은둔'; break;
-        case  9: $call = '안전'; break;
-        case  8: $call = '유지'; break;
-        case  7: $call = '재간'; break;
-        case  6: $call = '출세'; break;
-        case  5: $call = '할거'; break;
-        case  4: $call = '정복'; break;
-        case  3: $call = '패권'; break;
-        case  2: $call = '의협'; break;
-        case  1: $call = '대의'; break;
-        case  0: $call = '왕좌'; break;
-    }
-    return $call;
+    return getCharacterList()[$type][0];
 }
 
 function getCharInfo(?int $type):?string {
     if($type === null){
         return null;
     }
-
-    $infoText = [
-        10=>['은둔', '명성 -10%, 계급 -10%, 사기 -5, 훈련 -5, 단련 성공률 +10%'],
-        9=>['안전', '사기 -5, 징·모병 비용 -20%'],
-        8=>['유지', '훈련 -5, 징·모병 비용 -20%'],
-        7=>['재간', '명성 -10%, 징·모병 비용 -20%'],
-        6=>['출세', '명성 +10%, 징·모병 비용 +20%'],
-        5=>['할거', '명성 -10%, 훈련 +5'],
-        4=>['정복', '명성 -10%, 사기 +5'],
-        3=>['패권', '훈련 +5, 징·모병 비용 +20%'],
-        2=>['의협', '사기 +5, 징·모병 비용 +20%'],
-        1=>['대의', '명성 +10%, 훈련 -5'],
-        0=>['왕좌', '명성 +10%, 사기 -5'],
-    ];
-
-    return $infoText[$type][1]??null;
+    return getCharacterList()[$type][1]??null;
 }
 
 function getGenSpecial($type) {
@@ -236,12 +209,12 @@ function getSpecialInfo(?int $type):?string{
 
         60 => ['돌격', '[전투] 상대 회피 불가, 공격 시 전투 페이즈 +1, 공격 시 대미지 +10%'],
         61 => ['무쌍', '[전투] 대미지 +10%, 공격 시 필살 확률 +10%p'],
-        62 => ['견고', '[전투] 수비 시 대미지 +10%, 공격 시 아군 피해 -10%'],
+        62 => ['견고', '[전투] 상대 필살, 격노, 위압, 저격 불가, 상대 계략 시도시 성공 확률 -10%p, 부상 없음, 아군 피해 -5%'],
         63 => ['위압', '[전투] 훈련/사기≥90, 병력≥1,000 일 때 첫 페이즈 위압 발동(적 공격 불가)'],
 
         70 => ['저격', '[전투] 전투 개시 시 1/3 확률로 저격 발동'],
         71 => ['필살', '[전투] 필살 확률 +20%p'],
-        72 => ['징병', '[군사] 징·모병비 -50%'],
+        72 => ['징병', '[군사] 징·모병비 -50%, 통솔 순수 능력치 보정 +15%'],
         73 => ['의술', '[군사] 매 턴마다 자신(100%)과 소속 도시 장수(적 포함 50%) 부상 회복<br>[전투] 페이즈마다 20% 확률로 치료 발동(아군 피해 1/3 감소)'],
         74 => ['격노', '[전투] 상대방 필살 및 회피 시도시 일정 확률로 격노(필살) 발동, 공격 시 일정 확률로 진노(1페이즈 추가)'],
         75 => ['척사', '[전투] 지역·도시 병종 상대로 대미지 +10%, 아군 피해 -10%']
@@ -250,24 +223,20 @@ function getSpecialInfo(?int $type):?string{
     return $infoText[$type][1]??null;
 }
 
-function getNationType($type) {
-    switch($type) {
-        case 13: $call = '명 가'; break;
-        case 12: $call = '음 양 가'; break;
-        case 11: $call = '종 횡 가'; break;
-        case 10: $call = '불 가'; break;
-        case 9: $call = '도 적'; break;
-        case 8: $call = '오 두 미 도'; break;
-        case 7: $call = '태 평 도'; break;
-        case 6: $call = '도 가'; break;
-        case 5: $call = '묵 가'; break;
-        case 4: $call = '덕 가'; break;
-        case 3: $call = '병 가'; break;
-        case 2: $call = '유 가'; break;
-        case 1: $call = '법 가'; break;
-        case 0: $call = '-'; break;
+function getNationType(?int $type) {
+    if($type === null){
+        return '-';
     }
-    return $call;
+    static $cache = [];
+    if(\key_exists($type, $cache)){
+        return $cache[$type];
+    }
+
+    $text = getNationTypeList()[$type][0]??'-';
+    $text = join(' ', StringUtil::splitString($text));
+    $cache[$type] = $text;
+
+    return $text;
 }
 
 
@@ -286,24 +255,12 @@ function getConnect($con) {
     return $conname;
 }
 
-function getNationType2($type) {
-    switch($type) {
-        case 13: $call = '<font color=cyan>기술↑ 인구↑</font> <font color=magenta>쌀수입↓ 수성↓</font>'; break;
-        case 12: $call = '<font color=cyan>내정↑ 인구↑</font> <font color=magenta>기술↓ 전략↓</font>'; break;
-        case 11: $call = '<font color=cyan>전략↑ 수성↑</font> <font color=magenta>금수입↓ 내정↓</font>'; break;
-        case 10: $call = '<font color=cyan>민심↑ 수성↑</font> <font color=magenta>금수입↓</font>'; break;
-        case 9: $call = '<font color=cyan>계략↑</font> <font color=magenta>금수입↓ 치안↓ 민심↓</font>'; break;
-        case 8: $call = '<font color=cyan>쌀수입↑ 인구↑</font> <font color=magenta>기술↓ 수성↓ 내정↓</font>'; break;
-        case 7: $call = '<font color=cyan>인구↑ 민심↑</font> <font color=magenta>기술↓ 수성↓</font>'; break;
-        case 6: $call = '<font color=cyan>인구↑</font> <font color=magenta>기술↓ 치안↓</font>'; break;
-        case 5: $call = '<font color=cyan>수성↑</font> <font color=magenta>기술↓</font>'; break;
-        case 4: $call = '<font color=cyan>치안↑인구↑ 민심↑</font> <font color=magenta>쌀수입↓ 수성↓</font>'; break;
-        case 3: $call = '<font color=cyan>기술↑ 수성↑</font> <font color=magenta>인구↓ 민심↓</font>'; break;
-        case 2: $call = '<font color=cyan>내정↑ 민심↑</font> <font color=magenta>쌀수입↓</font>'; break;
-        case 1: $call = '<font color=cyan>금수입↑ 치안↑</font> <font color=magenta>인구↓ 민심↓</font>'; break;
-        case 0: $call = '-'; break;
+function getNationType2(?int $type) {
+    if($type === null){
+        return '-';
     }
-    return $call;
+    [$name, $pros, $cons] = getNationTypeList()[$type]??['-', '', ''];
+    return "<font color=cyan>{$pros}</font> <font color=magenta>{$cons}</font>";
 }
 
 function getLevel($level, $nlevel=8) {
@@ -357,7 +314,7 @@ function getCall($leader, $power, $intel) {
     $call = '평범';
 
     if($leader < 40){
-        if($power + $intel < $leader){
+        if($power + $intel < 40){
             return '아둔';
         }
         if($intel >= GameConst::$chiefStatMin && $power < $intel * 0.8){
@@ -380,45 +337,21 @@ function getCall($leader, $power, $intel) {
     if($intel >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $power < $intel * 0.8){
         return '명장';
     }
+    if($leader >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $power + $intel < $leader){
+        return '차장';
+    }
     return '평범';
 }
 
 function getDed($dedication) {
-    if($dedication < 1 ) $level2 = '무품관';
-    elseif($dedication < 10*10) $level2 = '30품관';
-    elseif($dedication < 20*20) $level2 = '29품관';
-    elseif($dedication < 30*30) $level2 = '28품관';
-    elseif($dedication < 40*40) $level2 = '27품관';
-    elseif($dedication < 50*50) $level2 = '26품관';
-    elseif($dedication < 60*60) $level2 = '25품관';
-    elseif($dedication < 70*70) $level2 = '24품관';
-    elseif($dedication < 80*80) $level2 = '23품관';
-    elseif($dedication < 90*90) $level2 = '22품관';
-    elseif($dedication < 100*100) $level2 = '21품관';
-    elseif($dedication < 110*110) $level2 = '20품관';
-    elseif($dedication < 120*120) $level2 = '19품관';
-    elseif($dedication < 130*130) $level2 = '18품관';
-    elseif($dedication < 140*140) $level2 = '17품관';
-    elseif($dedication < 150*150) $level2 = '16품관';
-    elseif($dedication < 160*160) $level2 = '15품관';
-    elseif($dedication < 170*170) $level2 = '14품관';
-    elseif($dedication < 180*180) $level2 = '13품관';
-    elseif($dedication < 190*190) $level2 = '12품관';
-    elseif($dedication < 200*200) $level2 = '11품관'; // 40000
-    elseif($dedication < 210*210) $level2 = '10품관'; // 44100
-    elseif($dedication < 220*220) $level2 =  '9품관'; // 48400
-    elseif($dedication < 230*230) $level2 =  '8품관'; // 52900
-    elseif($dedication < 240*240) $level2 =  '7품관'; // 57600
-    elseif($dedication < 250*250) $level2 =  '6품관'; // 62500
-    elseif($dedication < 260*260) $level2 =  '5품관'; // 67600
-    elseif($dedication < 270*270) $level2 =  '4품관'; // 72900
-    elseif($dedication < 280*280) $level2 =  '3품관'; // 78400
-    elseif($dedication < 290*290) $level2 =  '2품관'; // 84100
-    else {
-        $level2 = '1품관';
+    $dedLevel = getDedLevel($dedication);
+    if($dedLevel == 0){
+        return '무품관';
     }
 
-    return $level2;
+    //{$maxDedLevel}품관 ~ 1품관
+    $dedInvLevel = GameConst::$maxDedLevel - $dedLevel + 1;
+    return "{$dedInvLevel}품관";
 }
 
 
@@ -445,16 +378,18 @@ function getExpLevel($experience) {
     if($experience < 1000) {
         $level = intdiv($experience, 100);
     } else {
-        for($level = 0; $experience > (($level+1)*($level+1)*10); $level++) {
-        }
+        $level = Util::toInt(sqrt($experience/10));
     }
 
     return $level;
 }
 
 function getDedLevel($dedication) {
-    for($level = 0; $dedication > (($level+1)*($level+1)*100); $level++) {
-    }
+    $level = Util::valueFit(
+        ceil(sqrt($dedication) / 10), 
+        0, 
+        GameConst::$maxDedLevel
+    );
 
     return $level;
 }
@@ -471,9 +406,7 @@ function getLevelPer($exp, $level) {
 }
 
 function getBill(int $dedication) : int{
-    for($level = 0; $dedication > (($level+1)*($level+1)*100); $level++) {
-    }
-
+    $level = getDedLevel($dedication);
     return ($level * 200 + 400);
 }
 
@@ -481,142 +414,109 @@ function getCost(int $armtype) : int {
     return GameUnitConst::byID($armtype)->cost;
 }
 
-function TechLimit($startyear, $year, $tech) : int {
-    $limit = 0;
-    if($year < $startyear+ 5 && $tech >=  1000) { $limit = 1; }
-    if($year < $startyear+10 && $tech >=  2000) { $limit = 1; }
-    if($year < $startyear+15 && $tech >=  3000) { $limit = 1; }
-    if($year < $startyear+20 && $tech >=  4000) { $limit = 1; }
-    if($year < $startyear+25 && $tech >=  5000) { $limit = 1; }
-    if($year < $startyear+30 && $tech >=  6000) { $limit = 1; }
-    if($year < $startyear+35 && $tech >=  7000) { $limit = 1; }
-    if($year < $startyear+40 && $tech >=  8000) { $limit = 1; }
-    if($year < $startyear+45 && $tech >=  9000) { $limit = 1; }
-    if($year < $startyear+50 && $tech >= 10000) { $limit = 1; }
-    if($year < $startyear+55 && $tech >= 11000) { $limit = 1; }
-    if($year < $startyear+60 && $tech >= 12000) { $limit = 1; }
-    return $limit;
+function getTechLevel($tech):int{
+    return Util::valueFit(
+        floor($tech / 1000),
+        0, 
+        GameConst::$maxTechLevel
+    );
+}
+
+function TechLimit($startYear, $year, $tech) : bool {
+
+    $relYear = $year - $startYear;
+
+    $relMaxTech = Util::valueFit(
+        floor($relYear / 5) + 1,
+        1, 
+        GameConst::$maxTechLevel
+    );
+
+    $techLevel = getTechLevel($tech);
+
+    return $techLevel >= $relMaxTech;
 }
 
 function getTechAbil($tech) : int{
-    if($tech < 1000)      { $abil =   0; }
-    elseif($tech < 2000)  { $abil =  25; }
-    elseif($tech < 3000)  { $abil =  50; }
-    elseif($tech < 4000)  { $abil =  75; }
-    elseif($tech < 5000)  { $abil = 100; }
-    elseif($tech < 6000)  { $abil = 125; }
-    elseif($tech < 7000)  { $abil = 150; }
-    elseif($tech < 8000)  { $abil = 175; }
-    elseif($tech < 9000)  { $abil = 200; }
-    elseif($tech < 10000) { $abil = 225; }
-    elseif($tech < 11000) { $abil = 250; }
-    elseif($tech < 12000) { $abil = 275; }
-    else                  { $abil = 300; }
-    return $abil;
+    return getTechLevel($tech) * 25;
 }
 
 function getTechCost($tech) : float{
-    if($tech < 1000)      { $cost = 1.00; }
-    elseif($tech < 2000)  { $cost = 1.15; }
-    elseif($tech < 3000)  { $cost = 1.30; }
-    elseif($tech < 4000)  { $cost = 1.45; }
-    elseif($tech < 5000)  { $cost = 1.60; }
-    elseif($tech < 6000)  { $cost = 1.75; }
-    elseif($tech < 7000)  { $cost = 1.90; }
-    elseif($tech < 8000)  { $cost = 2.05; }
-    elseif($tech < 9000)  { $cost = 2.20; }
-    elseif($tech < 10000) { $cost = 2.35; }
-    elseif($tech < 11000) { $cost = 2.50; }
-    elseif($tech < 12000) { $cost = 2.65; }
-    else                  { $cost = 2.80; }
-    return $cost;
+    return 1 + getTechLevel($tech) * 0.15;
 }
 
 function getTechCall($tech) : string {
-    if($tech < 1000)      { $str = '0등급'; }
-    elseif($tech < 2000)  { $str = '1등급'; }
-    elseif($tech < 3000)  { $str = '2등급'; }
-    elseif($tech < 4000)  { $str = '3등급'; }
-    elseif($tech < 5000)  { $str = '4등급'; }
-    elseif($tech < 6000)  { $str = '5등급'; }
-    elseif($tech < 7000)  { $str = '6등급'; }
-    elseif($tech < 8000)  { $str = '7등급'; }
-    elseif($tech < 9000)  { $str = '8등급'; }
-    elseif($tech < 10000) { $str = '9등급'; }
-    elseif($tech < 11000) { $str = '10등급'; }
-    elseif($tech < 12000) { $str = '11등급'; }
-    else                  { $str = '12등급'; }
-    return $str;
+    $techLevel = getTechLevel($tech);
+    return "{$techLevel}등급";
 }
 
-function getDexCall($dex) : string {
-    if($dex < 2500)        { $str = '<font color="navy">F-</font>'; }
-    elseif($dex <    7500) { $str = '<font color="navy">F</font>'; }
-    elseif($dex <   15000) { $str = '<font color="navy">F+</font>'; }
-    elseif($dex <   25000) { $str = '<font color="skyblue">E-</font>'; }
-    elseif($dex <   37500) { $str = '<font color="skyblue">E</font>'; }
-    elseif($dex <   52500) { $str = '<font color="skyblue">E+</font>'; }
-    elseif($dex <   70000) { $str = '<font color="seagreen">D-</font>'; }
-    elseif($dex <   90000) { $str = '<font color="seagreen">D</font>'; }
-    elseif($dex <  112500) { $str = '<font color="seagreen">D+</font>'; }
-    elseif($dex <  137500) { $str = '<font color="teal">C-</font>'; }
-    elseif($dex <  165000) { $str = '<font color="teal">C</font>'; }
-    elseif($dex <  195000) { $str = '<font color="teal">C+</font>'; }
-    elseif($dex <  227500) { $str = '<font color="limegreen">B-</font>'; }
-    elseif($dex <  262500) { $str = '<font color="limegreen">B</font>'; }
-    elseif($dex <  300000) { $str = '<font color="limegreen">B+</font>'; }
-    elseif($dex <  340000) { $str = '<font color="gold">A-</font>'; }
-    elseif($dex <  382500) { $str = '<font color="gold">A</font>'; }
-    elseif($dex <  427500) { $str = '<font color="gold">A+</font>'; }
-    elseif($dex <  475000) { $str = '<font color="darkorange">S-</font>'; }
-    elseif($dex <  525000) { $str = '<font color="darkorange">S</font>'; }
-    elseif($dex <  577500) { $str = '<font color="darkorange">S+</font>'; }
-    elseif($dex <  632500) { $str = '<font color="tomato">SS-</font>'; }
-    elseif($dex <  690000) { $str = '<font color="tomato">SS</font>'; }
-    elseif($dex <  750000) { $str = '<font color="tomato">SS+</font>'; }
-    elseif($dex <  812500) { $str = '<font color="red">SSS-</font>'; }
-    elseif($dex <  877500) { $str = '<font color="red">SSS</font>'; }
-    elseif($dex <  945000) { $str = '<font color="red">SSS+</font>'; }
-    elseif($dex < 1015000) { $str = '<font color="darkviolet">Z-</font>'; }
-    elseif($dex < 1087500) { $str = '<font color="darkviolet">Z</font>'; }
-    elseif($dex < 1162500) { $str = '<font color="darkviolet">Z+</font>'; }
-    else                   { $str = '<font color="white">?</font>'; }
-    return $str;
+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', '?']
+    ];
 }
 
-function getDexLevel($dex) : int {
-    if($dex < 2500)        { $lvl =  0; }
-    elseif($dex <    7500) { $lvl =  1; }
-    elseif($dex <   15000) { $lvl =  2; }
-    elseif($dex <   25000) { $lvl =  3; }
-    elseif($dex <   37500) { $lvl =  4; }
-    elseif($dex <   52500) { $lvl =  5; }
-    elseif($dex <   70000) { $lvl =  6; }
-    elseif($dex <   90000) { $lvl =  7; }
-    elseif($dex <  112500) { $lvl =  8; }
-    elseif($dex <  137500) { $lvl =  9; }
-    elseif($dex <  165000) { $lvl = 10; }
-    elseif($dex <  195000) { $lvl = 11; }
-    elseif($dex <  227500) { $lvl = 12; }
-    elseif($dex <  262500) { $lvl = 13; }
-    elseif($dex <  300000) { $lvl = 14; }
-    elseif($dex <  340000) { $lvl = 15; }
-    elseif($dex <  382500) { $lvl = 16; }
-    elseif($dex <  427500) { $lvl = 17; }
-    elseif($dex <  475000) { $lvl = 18; }
-    elseif($dex <  525000) { $lvl = 19; }
-    elseif($dex <  577500) { $lvl = 20; }
-    elseif($dex <  632500) { $lvl = 21; }
-    elseif($dex <  690000) { $lvl = 22; }
-    elseif($dex <  750000) { $lvl = 23; }
-    elseif($dex <  812500) { $lvl = 24; }
-    elseif($dex <  877500) { $lvl = 25; }
-    elseif($dex <  945000) { $lvl = 26; }
-    elseif($dex < 1015000) { $lvl = 27; }
-    elseif($dex < 1087500) { $lvl = 28; }
-    elseif($dex < 1162500) { $lvl = 29; }
-    else                   { $lvl = 30; }
-    return $lvl;
+function getDexCall(int $dex) : string {
+    if($dex < 0){
+        throw new \InvalidArgumentException();
+    }
+
+    $color = null;
+    $name = null;
+    foreach(getDexLevelList() as $dexLevel => [$dexKey, $nextColor, $nextName]){
+        if($dex < $dexKey){
+            break;
+        }
+        $color = $nextColor;
+        $name = $nextName;
+    }
+
+    return "<font color='{$color}'>{$name}</font>";
+}
+
+function getDexLevel(int $dex) : int {
+    if($dex < 0){
+        throw new \InvalidArgumentException();
+    }
+
+    $retVal = null;
+    foreach(getDexLevelList() as $dexLevel => [$dexKey, $nextColor, $nextName]){
+        if($dex < $dexKey){
+            break;
+        }
+        $retVal = $dexLevel;
+    }
+    return $dexLevel;
 }
 
 function getDexLog($dex1, $dex2) {

hwe/func_gamerule.php

@@ -5,6 +5,51 @@ namespace sammo;
  * 게임 룰에 해당하는 함수 모음
  */
 
+function getNationLevelList():array{
+    $table = [
+        0 => ['방랑군', 2, 0],
+        1 => ['호족', 2, 1],
+        2 => ['군벌', 4, 2],
+        3 => ['주자사', 4, 5],
+        4 => ['주목', 6, 8],
+        5 => ['공', 6, 11],
+        6 => ['왕', 8, 16],
+        7 => ['황제', 8, 21],
+    ];
+    return $table;
+}
+
+function getNationTypeList():array{
+    $table = [
+        13=>['명가', '기술↑ 인구↑', '쌀수입↓ 수성↓'],
+        12=>['음양가', '내정↑ 인구↑', '기술↓ 전략↓'],
+        11=>['종횡가', '전략↑ 수성↑', '금수입↓ 내정↓'],
+        10=>['불가', '민심↑ 수성↑', '금수입↓'],
+        9=>['도적', '계략↑', '금수입↓ 치안↓ 민심↓'],
+        8=>['오두미도', '쌀수입↑ 인구↑', '기술↓ 수성↓ 내정↓'],
+        7=>['태평도', '인구↑ 민심↑', '기술↓ 수성↓'],
+        6=>['도가', '인구↑', '기술↓ 치안↓'],
+        5=>['묵가', '수성↑', '기술↓'],
+        4=>['덕가', '치안↑인구↑ 민심↑', '쌀수입↓ 수성↓'],
+        3=>['병가', '기술↑ 수성↑', '인구↓ 민심↓'],
+        2=>['유가', '내정↑ 민심↑', '쌀수입↓'],
+        1=>['법가', '금수입↑ 치안↑', '인구↓ 민심↓'],
+    ];
+    return $table;
+}
+
+function getCityLevelList():array{
+    return [
+        1 => '수',
+        2 => '진',
+        3 => '관',
+        4 => '이',
+        5 => '소',
+        6 => '중',
+        7 => '대',
+        8 => '특'
+    ];
+}
 
  /**
  * 게임 내부에 사용하는 유틸리티 함수들을 분리
@@ -125,6 +170,10 @@ function addGenDex($no, $atmos, $train, $type, $exp) {
     $db = DB::db();
 
     $armType = GameUnitConst::byId($type)->armType;
+    if($armType == GameUnitConst::T_CASTLE){
+        $armType = GameUnitConst::T_SIEGE;
+    }
+
     if($armType < 0){
         return;
     }
@@ -180,7 +229,7 @@ function SetNationFront($nationNo) {
 
     if($adj){
         $db->update('city', [
-            'front'=>1
+            'front'=>($enemyCities?1:2),
         ], 'nation=%i and city in %li', $nationNo, array_keys($adj));
     }
 }
@@ -325,27 +374,6 @@ function preUpdateMonthly() {
     $query = "update city set nation='0',gen1='0',gen2='0',gen3='0',conflict='{}',term=0,front=0 where rate<='30' and supply='0'";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
-    // 우선 병사수/100 만큼 소비
-    $query = "update general set rice=rice-round(crew/100) where crew>=100";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-    // 쌀이 마이너스인 장수들 소집해제
-    $query = "select no,name,rice,crew,city from general where rice<0";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gencount = MYDB_num_rows($result);
-    for($i=0; $i < $gencount; $i++) {
-        $general = MYDB_fetch_array($result);
-
-        // 주민으로 돌아감
-        $query = "update city set pop=pop+'{$general['crew']}' where city='{$general['city']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        $query = "update general set crew=0,rice=0 where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        pushGenLog($general, ["<C>●</>군량이 모자라 병사들이 <R>소집해제</>되었습니다!"]);
-    }
-
     //접률감소
     $query = "update general set connect=floor(connect*0.99)";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -534,11 +562,14 @@ function postUpdateMonthly() {
         $genCount = $genNum[$dip['me']];
         // 25% 참여율일때 두당 10턴에 4000명 소모한다고 계산
         // 4000 / 10 * 0.25 = 100
-        $term = Util::round($dip['dead'] / 100 / $genCount) + 1;
-        if($dip['term'] > $term) { $term = $dip['term']; }
-        if($term > 13) { $term = 13; }
-        $query = "update diplomacy set term='{$term}' where (me='{$dip['me']}' and you='{$dip['you']}')";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $term = floor($dip['dead'] / 100 / $genCount);
+        $dip['dead'] -= $term * 100 * $genCount;
+        $term = Util::valueFit($dip['term'] + $term, 0, 13);
+        
+        $db->update('diplomacy', [
+            'term' => $term,
+            'dead'=> $dip['dead'],
+        ], 'me = %i AND you = %i', $dip['me'], $dip['you']);
     }
 
     //개전국 로그
@@ -581,7 +612,7 @@ function postUpdateMonthly() {
     }
     pushWorldHistory($history, $admin['year'], $admin['month']);
     //사상자 초기화
-    $query = "update diplomacy set dead=0";
+    $query = "update diplomacy set dead=0 WHERE state != 0";
     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     //외교 기한-1
     $query = "update diplomacy set term=term-1 where term!=0";
@@ -932,9 +963,9 @@ function updateNationState() {
     $connect=$db->get();
 
     $history = array();
-    $admin = $gameStor->getValues(['year', 'month']);
+    $admin = $gameStor->getValues(['year', 'month', 'fiction', 'startyear', 'show_img_level', 'turnterm']);
 
-    $query = "select nation,name,level from nation";
+    $query = "select nation,name,level,gennum,tech from nation";
     $nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $nationcount = MYDB_num_rows($nationresult);
 
@@ -968,6 +999,7 @@ function updateNationState() {
         }
 
         if($nationlevel > $nation['level']) {
+            $oldLevel = $nation['level'];
             $nation['level'] = $nationlevel;
 
             switch($nationlevel) {
@@ -992,6 +1024,54 @@ function updateNationState() {
                     break;
             }
 
+            
+            $lastAssemblerID = $gameStor->assembler_id??0;
+            for($levelGen = max(1, $oldLevel) + 1; $levelGen <= $nationlevel; $levelGen+=1){
+                if(in_array($levelGen, [3, 5, 7])){
+                    $genStep = 2;
+                }
+                else{
+                    $genStep = 1;
+                }
+                
+                while($genStep > 0){
+                    $lastAssemblerID += 1;
+                    $npcObj = new Scenario\NPC(
+                        999, '부대장'.$lastAssemblerID, null, $nation['nation'], null, 
+                        10, 10, 10, 1, $admin['year'] - 15, $admin['year'] + 15,  '은둔', '척사'
+                    );
+                    $npcObj->npc = 5;
+                    $npcObj->build($admin);
+                    $npcID = $npcObj->generalID;
+
+                    $db->insert('troop', [
+                        'name'=>$npcObj->realName,
+                        'nation'=>$nation['nation'],
+                        'no'=>$npcID
+                    ]);
+                    $troopID = $db->insertId();
+
+                    $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,
+                        'turn0'=>$command,
+                        'turn1'=>$command,
+                        'turn2'=>$command,
+                        'turn3'=>$command,
+                        'turn4'=>$command,
+                        'turn5'=>$command,
+                        'killturn'=>80
+                    ], 'no=%i', $npcID);
+                    $genStep -= 1;
+                }
+            }
+            $gameStor->assembler_id = $lastAssemblerID;
+
             //작위 상승
             $query = "update nation set level='{$nation['level']}' where nation='{$nation['nation']}'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

hwe/func_map.php

@@ -60,6 +60,7 @@ function getWorldMap($req){
 
     $session = Session::getInstance();
     $userID = $session->userID;
+    $userGrade = $session->userGrade;
 
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -146,6 +147,13 @@ function getWorldMap($req){
             array_map('\\sammo\\Util::toInt', [$r['city'], $r['level'], $r['state'], $r['nation'], $r['region'], $r['supply']]);
     }
 
+    if(($req->showMe || !$req->neutralView) && $userGrade >= 5){
+        $spyInfo = [];
+        foreach($cityList as $tmpCity){
+            $spyInfo[$tmpCity[0]] = 1;
+        }
+    }
+
     return [
         'startYear' => $startYear,
         'year' => $year,

hwe/func_npc.php

@@ -80,10 +80,22 @@ function SetDevelop($genType, $no, $city, $tech) {
     return;
 }
 
-function SetCrew($no, $personal, $gold, $leader, $genType, $tech, $region, $city, $dex0, $dex10, $dex20, $dex30, $dex40) {
+function SetCrew($no, $nationID, $personal, $gold, $leader, $genType, $tech, $dex0, $dex10, $dex20, $dex30, $dex40) {
     $db = DB::db();
     $connect=$db->get();
 
+    $cities = [];
+    $regions = [];
+
+    foreach($db->queryAllLists('SELECT city, region FROM city WHERE nation = %i', $nationID) as [$cityID, $regionID]){
+        $cities[$cityID] = true;
+        $regions[$regionID] = true;
+    }
+
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    [$startyear, $year] = $gameStor->getValuesAsArray(['startyear', 'year']);
+    $relYear = Util::valueFit($year-$startyear, 0);
+
     $type = 0;
     switch($genType) {
     case 0: //무장
@@ -109,48 +121,50 @@ function SetCrew($no, $personal, $gold, $leader, $genType, $tech, $region, $city
 
         
 
+        $types = [];
         switch($sel) {
         case 0:
-            $type = 0; //보병
-                if($tech >= 3000 && $city   ==  3) { $type =  4; } //근위병
-            elseif($tech >= 2000 && $city   == 64) { $type =  3; } //자객병
-            elseif($tech >= 1000 && $region ==  2) { $type =  1; } //청주병
-            elseif($tech >= 1000 && $region ==  5) { $type =  5; } //등갑병
-            elseif($tech >= 1000 && $region ==  7) { $type =  2; } //수병
+            foreach(GameUnitConst::byType(GameUnitConst::T_FOOTMAN) as $crewtype){
+                if($crewtype->isValid($cities, $regions, $relYear, $tech)){
+                    $types[] = $crewtype->id;
+                }
+            }
             break;
         case 1:
-            $type = 10; //궁병
-                if($tech >= 3000 && $city   ==  7) { $type = 14; } //석궁병
-            elseif($tech >= 3000 && $city   ==  6) { $type = 13; } //강궁병
-            elseif($tech >= 1000 && $region ==  4) { $type = 12; } //연노병
-            elseif($tech >= 1000 && $region ==  8) { $type = 11; } //궁기병
+            foreach(GameUnitConst::byType(GameUnitConst::T_ARCHER) as $crewtype){
+                if($crewtype->isValid($cities, $regions, $relYear, $tech)){
+                    $types[] = $crewtype->id;
+                }
+            }
             break;
         case 2:
-            $type = 20; //기병
-                if($tech >= 3000 && $city   ==  2) { $type = 27; } //호표기병
-            elseif($tech >= 2000 && $city   == 63) { $type = 24; } //철기병
-            elseif($tech >= 2000 && $city   == 67) { $type = 25; } //수렵기병
-            elseif($tech >= 2000 && $city   == 65) { $type = 23; } //돌격기병
-            elseif($tech >= 2000 && $city   == 66) { $type = 26; } //맹수병
-            elseif($tech >= 1000 && $region ==  1) { $type = 21; } //백마병
-            elseif($tech >= 1000 && $region ==  3) { $type = 22; } //중장기병
+            foreach(GameUnitConst::byType(GameUnitConst::T_CAVALRY) as $crewtype){
+                if($crewtype->isValid($cities, $regions, $relYear, $tech)){
+                    $types[] = $crewtype->id;
+                }
+            }
             break;
         }
         break;
     case 1: //지장
     case 3: //지내정장
-        $type = 30; //귀병
-            if($tech >= 3000 && $city   ==  4) { $type = 34; } //악귀병
-        elseif($tech >= 3000 && $city   ==  5) { $type = 37; } //천귀병
-        elseif($tech >= 3000 && $city   ==  1) { $type = 38; } //마귀병
-        elseif($tech >= 2000 && $city   == 69) { $type = 33; } //흑귀병
-        elseif($tech >= 2000 && $city   == 68) { $type = 32; } //백귀병
-        elseif($tech >= 1000 && $region ==  6) { $type = 31; } //신귀병
-        elseif($tech >= 3000 && $city   ==  3) { $type = 36; } //황귀병
-        elseif($tech >= 1000 && rand()%100 < 50) { $type = 35; } //남귀병
+        foreach(GameUnitConst::byType(GameUnitConst::T_WIZARD) as $crewtype){
+            if($crewtype->isValid($cities, $regions, $relYear, $tech)){
+                $types[] = $crewtype->id;
+            }
+        }
         break;
     }
 
+    if($types){
+        $type = Util::choiceRandom($types);
+    }
+    else{
+        $type = GameUnitConst::DEFAULT_CREWTYPE;
+    }
+
+    
+
     $gold -= 200;   // 사기비용
 
     $cost = getCost($type) * getTechCost($tech);
@@ -178,10 +192,34 @@ function processAI($no) {
         $isStart = 0;
     }
 
-    $query = "select no,turn0,npcid,name,nation,nations,city,level,npcmsg,personal,leader,intel,power,gold,rice,crew,train,atmos,npc,affinity,mode,injury,picture,imgsvr,killturn,makelimit,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
+    $query = "select no,turn0,npcid,name,nation,nations,city,level,npcmsg,personal,leader,intel,power,gold,rice,crew,train,atmos,troop,npc,affinity,mode,injury,picture,imgsvr,killturn,makelimit,dex0,dex10,dex20,dex30,dex40 from general where no='$no'";
     $result = MYDB_query($query, $connect) or Error("processAI01 ".MYDB_error($connect),"");
     $general = MYDB_fetch_array($result);
 
+    if($general['npc'] == 5){
+        if($general['nation'] == 0 && $general['killturn'] > 1){
+            $command = EncodeCommand(0, 0, 0, 0); //휴식
+            $db->update('general', [
+                'turn0'=>$command,
+                'killturn'=>1
+            ], 'no=%i', $general['no']);
+        }
+        else{
+            $command = EncodeCommand(0, 0, 0, 26); //집합
+            $db->update('general', [
+                'turn0'=>$command,
+                'turn1'=>$command,
+                'turn2'=>$command,
+                'turn3'=>$command,
+                'turn4'=>$command,
+                'turn5'=>$command,
+                'killturn'=>rand(70,75),
+            ], 'no=%i', $general['no']);
+        }
+
+        return;
+    }
+
     // 입력된 턴이 있으면 그것 실행
     if(DecodeCommand($general['turn0'])[0] != 0) {
         return;
@@ -210,7 +248,7 @@ function processAI($no) {
         $coreCommand = MYDB_fetch_array($result);
     }
 
-    $cityCount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i AND supply=1 AND front=1', $general['nation']);
+    $cityCount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i AND supply=1 AND front>0', $general['nation']);
     // 공격가능도시 있으면 1
     $attackable = $cityCount > 0;
 
@@ -306,10 +344,10 @@ function processAI($no) {
     }
 
     //재야인경우
-    if($general['npc'] == 5 && $general['level'] == 0) {
+    if($general['npc'] == 9 && $general['level'] == 0) {
         // 오랑캐는 바로 임관
 
-        $rulerNation = $db->queryFirstField('SELECT nation FROM general WHERE `level`=12 AND npc=5 and nation not in %li ORDER BY RAND() limit 1', Json::decode($general['nations']));
+        $rulerNation = $db->queryFirstField('SELECT nation FROM general WHERE `level`=12 AND npc=9 and nation not in %li ORDER BY RAND() limit 1', Json::decode($general['nations']));
         
         if($ruler) {
             $command = EncodeCommand(0, 0, $rulerNation, 25); //임관
@@ -319,7 +357,7 @@ function processAI($no) {
         $query = "update general set turn0='$command' where no='{$general['no']}'";
         MYDB_query($query, $connect) or Error("processAI07 ".MYDB_error($connect),"");
         return;
-    } elseif($general['npc'] < 5 && $general['level'] == 0) {
+    } elseif($general['npc'] != 9 && $general['level'] == 0) {
         switch(Util::choiceRandomUsingWeight([11.4, 40, 20, 28.6])) {
         //임관 10%
         case 0:
@@ -376,7 +414,7 @@ function processAI($no) {
     //군주가 할일
     if($general['level'] == 12) {
         //오랑캐인데 공격 못하면 바로 방랑/해산
-        if($general['npc'] == 5 && $dipState == 0 && !$attackable) {
+        if($general['npc'] == 9 && $dipState == 0 && !$attackable) {
             //방랑군이냐 아니냐
             if($nation['level'] == 0) {
                 // 해산
@@ -453,7 +491,7 @@ function processAI($no) {
 
                 SetNationFront($nation['nation']);
 
-                $frontCount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i AND front=1', $general['nation']);
+                $frontCount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i AND front>0', $general['nation']);
                 if($frontCount > 0){
                     break;
                 }
@@ -707,7 +745,7 @@ function processAI($no) {
         //전시일때
             if($general['gold'] + $general['rice'] < $resrc*2) { $command = EncodeCommand(0, 0, 0, 9); } //금쌀없으면 조달
             elseif($general['rice'] > $resrc && $city['rate'] < 95 && $city['front'] == 0) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
-            elseif($general['rice'] > $resrc && $city['rate'] < 50 && $city['front'] == 1) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
+            elseif($general['rice'] > $resrc && $city['rate'] < 50 && $city['front'] > 0) { $command = EncodeCommand(0, 0, 0, 4); }  // 우선 선정
             elseif($general['gold'] < $resrc || ($general['gold'] < $resrc *2 && $general['rice'] > $resrc * 6)) {                                   // 금없으면 쌀팜
                 $amount = intdiv(($general['rice'] - $general['gold'])/2, 100);   // 100단위
                 if($amount > 0) { $command = EncodeCommand(0, 1, $amount, 49); }// 팜
@@ -789,9 +827,9 @@ function processAI($no) {
                 if(count($target) == 0) {
                     //전방 도시 선택, 30% 확률로 태수 있는 전방으로 워프
                     if(rand()%100 < 30) {
-                        $query = "select city from city where nation='{$general['nation']}' and supply='1' and front=1 order by gen1 desc,rand() limit 0,1";
+                        $query = "select city from city where nation='{$general['nation']}' and supply='1' and front>0 order by gen1 desc,rand() limit 0,1";
                     } else {
-                        $query = "select city from city where nation='{$general['nation']}' and supply='1' and front=1 order by rand() limit 0,1";
+                        $query = "select city from city where nation='{$general['nation']}' and supply='1' and front>0 order by rand() limit 0,1";
                     }
                     $result = MYDB_query($query, $connect) or Error("processAI10 ".MYDB_error($connect),"");
                     $cityCount = MYDB_num_rows($result);
@@ -834,22 +872,7 @@ function processAI($no) {
         SetDevelop($genType, $general['no'], $general['city'], $nation['tech']);
         return;
     case EncodeCommand(0, 0, 0, 11): //징병
-        $query = "select region from city where nation='{$general['nation']}' order by rand() limit 0,1";
-        $result = MYDB_query($query, $connect) or Error("processAI16 ".MYDB_error($connect),"");
-        $selRegion = MYDB_fetch_array($result);
-
-        $selCity['city'] = 0;
-        // 90% 확률로 이민족 또는 특성병
-        if(rand()%100 < 90) {
-            $query = "select city from city where nation='{$general['nation']}' and (level='4' or level='8') order by rand() limit 0,1";
-            $result = MYDB_query($query, $connect) or Error("processAI16 ".MYDB_error($connect),"");
-            $selCity = MYDB_fetch_array($result);
-        }
-        // 특병 없으면 원래대로
-        if($selCity['city'] == 0) {
-            $selCity['city'] = $general['city'];
-        }
-        SetCrew($general['no'], $general['personal'], $general['gold'], $general['leader'], $genType, $nation['tech'], $selRegion['region'], $selCity['city'], $general['dex0'], $general['dex10'], $general['dex20'], $general['dex30'], $general['dex40']);
+        SetCrew($general['no'], $general['nation'], $general['personal'], $general['gold'], $general['leader'], $genType, $nation['tech'], $general['dex0'], $general['dex10'], $general['dex20'], $general['dex30'], $general['dex40']);
         return;
     default:
         $query = "update general set turn0='$command' where no='{$general['no']}'";
@@ -914,7 +937,7 @@ function NPCStaffWork($general, $nation, $dipState){
 
     $commandList = [];
 
-    foreach($db->query('SELECT `no`, nation, city, npc, `gold`, `rice`, leader, `power`, intel, killturn, crew, train, atmos, `level` FROM general WHERE nation = %i', $general['nation']) as $nationGeneral) {
+    foreach($db->query('SELECT `no`, nation, city, npc, `gold`, `rice`, leader, `power`, intel, killturn, crew, train, atmos, `level`, troop FROM general WHERE nation = %i', $general['nation']) as $nationGeneral) {
         $cityID = $nationGeneral['city'];
         $generalID = $nationGeneral['no'];
 
@@ -1083,7 +1106,15 @@ function NPCStaffWork($general, $nation, $dipState){
         }
     } else{    // 포상
         $compNpcWar = $npcWarGeneralsID?$nationGenerals[$npcWarGeneralsID[0]]:null; 
-        $compNpcCivil = $npcCivilGeneralsID?$nationGenerals[$npcCivilGeneralsID[0]]:null;
+        $compNpcCivil = null;
+        foreach($npcCivilGeneralsID??[] as $npcCivilID){
+            $npcCivil = $nationGenerals[$npcCivilID];
+            if($npcCivil['npc'] == 5){
+                continue;
+            }
+            $compNpcCivil = $npcCivil;
+            break;
+        }
 
         if($compNpcWar && $compNpcWar[$resName] < 21000){
             $amount = min(100, intdiv(($nation[$resName]-($resName=='rice'?(GameConst::$baserice):(GameConst::$basegold))), 5000)*10 + 10);
@@ -1172,13 +1203,18 @@ function NPCStaffWork($general, $nation, $dipState){
 
         if($maxDevCity['dev'] >= 95 && $targetCity['city'] != $maxDevCity['city'] && $targetCity['dev'] <= 70){
             $targetGeneral = $nationGenerals[Util::choiceRandom($maxDevCity['generals'])];
+            if($targetGeneral['troop'] != 0){
                 $commandList[EncodeCommand(0, $targetGeneral['no'], $targetCity['city'], 27)] = 2;
             }
+        }
 
         if(count($targetCity['generals']) < count($maxCity['generals']) - 2){
             //세명 이상 차이나야 함
             $targetGeneral = $nationGenerals[Util::choiceRandom($maxCity['generals'])];
-            if($targetGeneral['npc']>=2 || $maxCity['dev'] >= 95){
+            if($targetGeneral['npc']==5){
+                
+            }
+            else if($targetGeneral['npc']>=2 || $maxCity['dev'] >= 95 && $targetGeneral['troop'] == 0){
                 //유저장은 의도가 있을 것이므로 삽나지 않는 이상 발령 안함!
                 $commandList[EncodeCommand(0, $targetGeneral['no'], $targetCity['city'], 27)] = 5;
             }
@@ -1207,6 +1243,10 @@ function NPCStaffWork($general, $nation, $dipState){
                 continue;
             }
 
+            if($nationGeneral['troop'] != 0){
+                continue;
+            }
+    
             $score = 5;
             if($nationGeneral['npc']<2){
                 $score *= 4;
@@ -1256,6 +1296,9 @@ function NPCStaffWork($general, $nation, $dipState){
             if($generalCity['pop'] - 33000 > $nationGeneral['leader']){
                 continue;
             }
+            if($nationGeneral['troop'] != 0){
+                continue;
+            }
     
             $score = 5;
             if($nationGeneral['npc']<2){

hwe/func_process.php

@@ -21,6 +21,12 @@ function getGeneralLeadership(&$general, $withInjury, $withItem, $withStatAdjust
         $leadership *= (100 - $general['injury']) / 100;
     }
 
+    if($withStatAdjust){
+        if($general['special2'] == 72){
+            $leadership *= 1.15;
+        }
+    }
+
     if(isset($general['lbonus'])){
         $leadership += $general['lbonus'];
     }
@@ -267,6 +273,10 @@ function process_1(&$general, $type) {
         $exp = CharExperience($exp, $general['personal']);
         $ded = CharDedication($ded, $general['personal']);
 
+        if($city['front'] == 1 && $city['city'] != $nation['capital']){
+            $score *= 0.5;
+        }
+
         $score += $city["$stype"];
         if($score > $city["{$stype}2"]) { $score = $city["{$stype}2"]; }
         // 내정 상승
@@ -552,6 +562,16 @@ function process_5(&$general, $type) {
         $exp = $score * 0.7;
         $ded = $score * 1.0;
 
+        if($city['front'] == 1 && $city['city'] != $nation['capital']){
+            if($stype == 'def'){
+                $score *= 0.5;
+            }
+            else{
+                $score *= 0.25;
+            }
+            
+        }
+
         // 성격 보정
         $exp = CharExperience($exp, $general['personal']);
         $ded = CharDedication($ded, $general['personal']);
@@ -814,8 +834,8 @@ function process_9(&$general) {
             $log[] = "<C>●</>{$admin['month']}월:{$stype}을 <C>$score</> 조달했습니다. <1>$date</>";
         }
 
-        $exp = $score * 0.7;
-        $ded = $score * 1.0;
+        $exp = $score * 0.7 / 3;
+        $ded = $score * 1.0 / 3;
 
         // 성격 보정
         $exp = CharExperience($exp, $general['personal']);
@@ -974,7 +994,8 @@ function process_11(&$general, $type) {
         return;
     }
     
-    $actLog->pushGeneralActionLog($crewTypeObj->name."을(를) <C>{$crew}</>명 {$dtype}했습니다. <1>$date</>");
+    $josaUl = JosaUtil::pick($crewTypeObj->name, '을');
+    $actLog->pushGeneralActionLog($crewTypeObj->name."{$josaUl} <C>{$crew}</>명 {$dtype}했습니다. <1>$date</>");
     $exp = Util::round($crew / 100);
     $ded = Util::round($crew / 100);
     // 숙련도 증가
@@ -1288,20 +1309,7 @@ function process_16(&$general) {
         // 숙련도 증가
         addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $general['crewtype'], Util::round($general['crew']/100));
         // 전투 처리
-        $dead = processWar($general, $destcity);
-
-        // 기술력 따라서 보정
-        $dead['att'] = Util::round($dead['att'] * getTechCost($nation['tech']));
-        $dead['def'] = Util::round($dead['def'] * getTechCost($dnation['tech']));
-
-        // 사상자 누적
-        if($nation['nation'] > 0 && $dnation['nation'] > 0) {
-            $query = "update diplomacy set dead=dead+'{$dead['att']}' where me='{$nation['nation']}' and you='{$dnation['nation']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-            $query = "update diplomacy set dead=dead+'{$dead['def']}' where you='{$nation['nation']}' and me='{$dnation['nation']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        }
+        processWar($general, $destcity);
         $log = uniqueItem($general, $log);
     }
 

hwe/func_process_chief.php

@@ -66,12 +66,6 @@ function process_23(&$general) {
     } else {
         $genlog[] = "<C>●</>$dtype <C>$amount</>을 포상으로 받았습니다.";
         $log[] = "<C>●</>{$admin['month']}월:<Y>{$gen['name']}</>에게 $dtype <C>$amount</>을 수여했습니다. <1>$date</>";
-        $exp = 1;
-        $ded = 1;
-
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
 
         if($what == 1) {
             $gen['gold'] += $amount;
@@ -91,8 +85,7 @@ function process_23(&$general) {
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         }
 
-        // 경험치 상승
-        $query = "update general set resturn='SUCCESS',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
+        $query = "update general set resturn='SUCCESS' where no='{$general['no']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
 //        $log = checkAbility($general, $log);
@@ -193,12 +186,6 @@ function process_24(&$general) {
 
         $genlog[] = "<C>●</>$dtype {$amount}을 몰수 당했습니다.";
         $log[] = "<C>●</>{$admin['month']}월:<Y>{$gen['name']}</>에게서 $dtype <C>$amount</>을 몰수했습니다. <1>$date</>";
-        $exp = 1;
-        $ded = 1;
-
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
 
         if($what == 1) {
             $gen['gold'] -= $amount;
@@ -219,7 +206,7 @@ function process_24(&$general) {
         }
 
         // 경험치 상승
-        $query = "update general set resturn='SUCCESS',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
+        $query = "update general set resturn='SUCCESS' where no='{$general['no']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
 //        $log = checkAbility($general, $log);
@@ -283,19 +270,13 @@ function process_27(&$general) {
         $josaRo = JosaUtil::pick($destcity['name'], '로');
         $log[] = "<C>●</>{$admin['month']}월:<Y>{$you['name']}</>{$josaUl} <G><b>{$destcity['name']}</b></>{$josaRo} 발령했습니다. <1>$date</>";
         $youlog[] = "<C>●</><Y>{$general['name']}</>에 의해 <G><b>{$destcity['name']}</b></>{$josaRo} 발령됐습니다. <1>$date</>";
-        $exp = 1;
-        $ded = 1;
-
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
 
         // 발령
         $query = "update general set city='$where' where no='{$you['no']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
         // 경험치 상승
-        $query = "update general set resturn='SUCCESS',experience=experience+'$exp',dedication=dedication+'$ded' where no='{$general['no']}'";
+        $query = "update general set resturn='SUCCESS' where no='{$general['no']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
 //        $log = checkAbility($general, $log);
@@ -342,13 +323,6 @@ function process_51(&$general) {
         return;
     }
     
-    $exp = 5;
-    $ded = 5;
-
-    // 성격 보정
-    $exp = CharExperience($exp, $general['personal']);
-    $ded = CharDedication($ded, $general['personal']);
-
     // 상대에게 발송
     $src = new MessageTarget(
         $general['no'], 
@@ -383,11 +357,6 @@ function process_51(&$general) {
     );
     $msg->send();
 
-    $db->update('general', [
-        'dedication'=>$db->sqleval('dedication+%i', $ded),
-        'experience'=>$db->sqleval('experience+%i', $exp)
-    ], 'no=%i', $general['no']);
-
     pushGenLog($general, ["<C>●</>{$month}월:<D><b>{$destNation['name']}</b></>으로 항복 권고 서신을 보냈습니다.<1>$date</>"]);
 }
 
@@ -428,7 +397,7 @@ function process_52(&$general) {
     $younation = MYDB_fetch_array($result);
 
     if($gold > $mynation['gold']-GameConst::$basegold) { $gold = $mynation['gold'] - GameConst::$basegold; }
-    if($rice > $mynation['rice']-GameConst::$baserice) { $rice = $mynation['rice'] - GameConst::$basegold; }
+    if($rice > $mynation['rice']-GameConst::$baserice) { $rice = $mynation['rice'] - GameConst::$baserice; }
 
     if($younation['nation'] == 0) {
         $log[] = "<C>●</>{$admin['month']}월:멸망한 국가입니다. 원조 실패. <1>$date</>";
@@ -538,13 +507,6 @@ function process_53(&$general) {
         return;
     }
 
-    $exp = 5;
-    $ded = 5;
-
-    // 성격 보정
-    $exp = CharExperience($exp, $general['personal']);
-    $ded = CharDedication($ded, $general['personal']);
-
     // 상대에게 발송
     $src = new MessageTarget(
         $general['no'], 
@@ -579,11 +541,6 @@ function process_53(&$general) {
     );
     $msg->send();
 
-    $db->update('general', [
-        'dedication'=>$db->sqleval('dedication+%i', $ded),
-        'experience'=>$db->sqleval('experience+%i', $exp)
-    ], 'no=%i', $general['no']);
-
     $josaRo = JosaUtil::pick($destNation['name'], '로');
     pushGenLog($general, ["<C>●</>{$month}월:<D><b>{$destNation['name']}</b></>{$josaRo} 통합 제의 서신을 보냈습니다.<1>$date</>"]);
 }
@@ -625,13 +582,6 @@ function process_61(&$general) {
         return;
     }
     
-    $exp = 5;
-    $ded = 5;
-
-    // 성격 보정
-    $exp = CharExperience($exp, $general['personal']);
-    $ded = CharDedication($ded, $general['personal']);
-
     // 상대에게 발송
     $src = new MessageTarget(
         $general['no'], 
@@ -682,11 +632,6 @@ function process_61(&$general) {
     ], 'me=%i AND you=%i', $src->nationID, $dest->nationID);
     // 3턴후
 
-    $db->update('general', [
-        'dedication'=>$db->sqleval('dedication+%i', $ded),
-        'experience'=>$db->sqleval('experience+%i', $exp)
-    ], 'no=%i', $general['no']);
-
     pushGenLog($general, ["<C>●</>{$month}월:<D><b>{$destNation['name']}</b></>으로 불가침 제의 서신을 보냈습니다.<1>$date</>"]);
 }
 
@@ -752,12 +697,6 @@ function process_62(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:초반제한 해제 2년전부터 가능합니다. 선포 실패. <1>$date</>";
     } else {
         $log[] = "<C>●</>{$admin['month']}월:<D><b>{$younation['name']}</b></>으로 선전 포고 했습니다.<1>$date</>";
-        $exp = 5;
-        $ded = 5;
-
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
 
         $josaYi = JosaUtil::pick($general['name'], '이');
         $josaYiNation = JosaUtil::pick($nation['name'], '이');
@@ -774,9 +713,6 @@ function process_62(&$general) {
         $query = "update diplomacy set state='1',term='24' where me='{$younation['nation']}' and you='{$nation['nation']}'";
         MYDB_query($query, $connect) or Error("ally ".MYDB_error($connect),"");
 
-        $query = "update general set dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
         //국메로 저장
         $text = "【외교】{$admin['year']}년 {$admin['month']}월:{$nation['name']}에서 {$younation['name']}에 선전포고";
 
@@ -847,13 +783,6 @@ function process_63(&$general) {
         return;
     }
 
-    $exp = 5;
-    $ded = 5;
-
-    // 성격 보정
-    $exp = CharExperience($exp, $general['personal']);
-    $ded = CharDedication($ded, $general['personal']);
-
     // 상대에게 발송
     $src = new MessageTarget(
         $general['no'], 
@@ -888,11 +817,6 @@ function process_63(&$general) {
     );
     $msg->send();
 
-    $db->update('general', [
-        'dedication'=>$db->sqleval('dedication+%i', $ded),
-        'experience'=>$db->sqleval('experience+%i', $exp)
-    ], 'no=%i', $general['no']);
-
     pushGenLog($general, ["<C>●</>{$month}월:<D><b>{$destNation['name']}</b></>으로 종전 제의 서신을 보냈습니다. <1>$date</>"]);
 }
 
@@ -931,13 +855,6 @@ function process_64(&$general) {
         return;
     }
 
-    $exp = 5;
-    $ded = 5;
-
-    // 성격 보정
-    $exp = CharExperience($exp, $general['personal']);
-    $ded = CharDedication($ded, $general['personal']);
-
     // 상대에게 발송
     $src = new MessageTarget(
         $general['no'], 
@@ -972,11 +889,6 @@ function process_64(&$general) {
     );
     $msg->send();
 
-    $db->update('general', [
-        'dedication'=>$db->sqleval('dedication+%i', $ded),
-        'experience'=>$db->sqleval('experience+%i', $exp)
-    ], 'no=%i', $general['no']);
-
     $josaRo = JosaUtil::pick($destNation['name'], '로');
     pushGenLog($general, ["<C>●</>{$month}월:<D><b>{$destNation['name']}</b></>{$josaRo} 불가침 파기 제의 서신을 보냈습니다.<1>$date</>"]);
 }
@@ -1036,12 +948,6 @@ function process_65(&$general) {
     } else {
         $josaUl = JosaUtil::pick($destcity['name'], '을');
         $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>{$josaUl} 초토화했습니다. <1>$date</>";
-        $exp = 5;
-        $ded = 5;
-
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
 
         $josaYi = JosaUtil::pick($general['name'], '이');
         $josaYiNation = JosaUtil::pick($nation['name'], '이');
@@ -1064,10 +970,6 @@ function process_65(&$general) {
         $query = "update city set pop=pop*0.1,rate=50,agri=agri*0.1,comm=comm*0.1,secu=secu*0.1,nation='0',front='0',gen1='0',gen2='0',gen3='0',conflict='{}' where city='{$destcity['city']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
-        //경험치, 공헌치
-        $query = "update general set dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
         //전장수 10% 삭감
         $query = "update general set experience=experience*0.9,dedication=dedication*0.9 where nation='{$general['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1130,7 +1032,7 @@ function process_66(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:인접도시가 아닙니다. 천도 실패. <1>$date</>";
     } elseif($nation['capset'] == 1) {
         $log[] = "<C>●</>{$admin['month']}월:다음 분기에 가능합니다. 천도 실패. <1>$date</>";
-    } elseif($nation['gold']-GameConst::$basegold < $amount || $nation['rice']-GameConst::$basegold < $amount) {
+    } elseif($nation['gold']-GameConst::$basegold < $amount || $nation['rice']-GameConst::$baserice < $amount) {
         $log[] = "<C>●</>{$admin['month']}월:물자가 부족합니다. 천도 실패. <1>$date</>";
     } elseif($term < 3) {
         $log[] = "<C>●</>{$admin['month']}월:천도중... ({$term}/3) <1>$date</>";
@@ -1140,12 +1042,6 @@ function process_66(&$general) {
     } else {
         $josaRo = JosaUtil::pick($destcity['name'], '로');
         $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>{$josaRo} 천도했습니다. <1>$date</>";
-        $exp = 15;
-        $ded = 15;
-
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
 
         $josaYi = JosaUtil::pick($general['name'], '이');
         $josaYiNation = JosaUtil::pick($nation['name'], '이');
@@ -1159,10 +1055,6 @@ function process_66(&$general) {
         $query = "update nation set l{$general['level']}term='0',capital='{$destcity['city']}',capset='1',gold=gold-'$amount',rice=rice-'$amount' where nation='{$general['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
-        //경험치, 공헌치
-        $query = "update general set dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
         refreshNationStaticInfo();
     }
 
@@ -1222,7 +1114,7 @@ function process_67(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 증축 실패. <1>$date</>";
     } elseif($nation['capset'] == 1) {
         $log[] = "<C>●</>{$admin['month']}월:다음 분기에 가능합니다. 증축 실패. <1>$date</>";
-    } elseif($nation['gold']-GameConst::$basegold < $amount || $nation['rice']-GameConst::$basegold < $amount) {
+    } elseif($nation['gold']-GameConst::$basegold < $amount || $nation['rice']-GameConst::$baserice < $amount) {
         $log[] = "<C>●</>{$admin['month']}월:물자가 부족합니다. 증축 실패. <1>$date</>";
     } elseif($term < 6) {
         $log[] = "<C>●</>{$admin['month']}월:증축중... ({$term}/6) <1>$date</>";
@@ -2184,7 +2076,7 @@ function process_76(&$general) {
                 ) values (
                     '$npccount','$npc','$npc','$affinity','$name','$picture','{$nation['nation']}',
                     '{$general['city']}','$leader','$power','$intel','{$avgGen['exp']}','{$avgGen['ded']}',
-                    '1','100','100','0','0','0','0','0',
+                    '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']}'

hwe/func_process_personnel.php

@@ -172,9 +172,9 @@ function process_25(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:현재 <D>{$nation['name']}</>{$josaUn} 임관이 제한되고 있습니다. 임관 실패.";
     } elseif($admin['year'] < $admin['startyear']+3 && $gencount >= GameConst::$initialNationGenLimit) {
         $log[] = "<C>●</>{$admin['month']}월:현재 <D>{$nation['name']}</>{$josaUn} 임관이 제한되고 있습니다. 임관 실패.";
-    } elseif($nation['scout'] == 1 && $general['npc'] < 5) {
+    } elseif($nation['scout'] == 1 && $general['npc'] != 9) {
         $log[] = "<C>●</>{$admin['month']}월:현재 <D>{$nation['name']}</>{$josaUn} 임관이 금지되어 있습니다. 임관 실패.";
-    } elseif($general['makelimit'] > 0 && $general['npc'] < 5) {
+    } elseif($general['makelimit'] > 0 && $general['npc'] != 9) {
         $log[] = "<C>●</>{$admin['month']}월:재야가 된지 12턴이 지나야 합니다. 임관 실패. <1>$date</>";
     } elseif(in_array($nation['nation'], $joinedNations)) {
         $log[] = "<C>●</>{$admin['month']}월:이미 임관했었던 국가입니다. 임관 실패. <1>$date</>";
@@ -452,7 +452,7 @@ function process_29(&$general) {
                 ) values (
                     '$npccount','$npc','$npc','$affinity','$name','$picture','$scoutNation',
                     '{$general['city']}','$leader','$power','$intel','{$avgGen['exp']}','{$avgGen['ded']}',
-                    '$scoutLevel','100','100','0','0','0','0','0',
+                    '$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']}'

hwe/func_process_sabotage.php

@@ -2,538 +2,708 @@
 
 namespace sammo;
 
+function calcSabotageAttackScore(string $statType, array $general, array $nation):array{
+    setLeadershipBonus($general, $nation['level']);
+
+    if($statType === 'leader'){
+        $genScore = getGeneralLeadership($general, true, true, true);
+    }
+    else if($statType === 'power'){
+        $genScore = getGeneralPower($general, true, true, true);
+    }
+    else if($statType === 'intel'){
+        $genScore = getGeneralIntel($general, true, true, true);
+    }
+    else{
+        throw new MustNotBeReachedException();
+    }
+
+    $genScore /= GameConst::$sabotageProbCoefByStat;
+
+    $specialScore = 0;
+
+    if($general['special'] == 31){
+        //귀모
+        $specialScore += 0.2;
+    }
+    if($general['special2'] == 41){
+        //신산
+        $specialScore += 0.1;
+    }
+
+    if($general['item'] == 21){
+        //육도
+        $specialScore += 0.2;
+    }
+    else if($general['item'] == 22){
+        //삼략
+        $specialScore += 0.2;
+    }
+
+    $itemScore = 0;
+    if($general['item'] == 5){
+        //이추
+        $itemScore += 0.1;
+    }
+    else if($general['item'] == 6){
+        //향낭
+        $itemScore += 0.2;
+    }
+    
+
+    $nationScore = 0;
+    if($nation['type'] == 9){
+        $nationScore = 0.1;
+    }
+
+    return [
+        $genScore,
+        $specialScore,
+        $itemScore,
+        $nationScore,
+    ];
+}
+
+function calcSabotageDefendScore(string $statType, array $generalList, array $city, array $nation):array{
+    $maxGenScore = 0;
+
+    foreach ($generalList as $general) {
+        setLeadershipBonus($general, $nation['level']);
+        
+        if ($statType === 'leader') {
+            $maxGenScore = max($maxGenScore, getGeneralLeadership($general, true, true, true));
+        } elseif ($statType === 'power') {
+            $maxGenScore = max($maxGenScore, getGeneralPower($general, true, true, true));
+        } elseif ($statType === 'intel') {
+            $maxGenScore = max($maxGenScore, getGeneralIntel($general, true, true, true));
+        } else {
+            throw new MustNotBeReachedException();
+        }
+    }
+
+    $cityScore = $city['secu'] / $city['secu2'] / 5;
+    $supplyScore = $city['supply'] ? 0.1 : 0;
+    
+    return [
+        ($maxGenScore / GameConst::$sabotageProbCoefByStat),
+        $cityScore,
+        $supplyScore
+    ];
+}
+
+function checkSabotageFailCondition($general, $srcCity, $destCity, $reqGold, $reqRice, $dipState):?string{
+    $srcNationID = $general['nation'];
+    $destNationID = $destCity['nation'];
+
+    if(!$destCity){
+        return '없는 도시입니다.';
+    }
+    if($general['level'] == 0){
+        return '재야입니다.';
+    }
+    if($srcNationID != $srcCity['nation']){
+        return '아국이 아닙니다.';
+    }
+    if(!$srcCity['supply']){
+        return '고립된 도시입니다.';
+    }
+    if($destNationID == 0){
+        return '공백지입니다.';
+    }
+    if($general['gold'] < $reqGold){
+        return '자금이 모자랍니다.';
+    }
+    if($general['rice'] < $reqRice){
+        return '군량이 모자랍니다.';
+    }
+    if($srcNationID == $destNationID){
+        return '아국입니다.';
+    }
+    if($dipState >= 7){
+        return '불가침국입니다.';
+    }
+    return null;
+}
+
 function process_32(&$general) {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();
-
-    $log = [];
-    $alllog = [];
-    $history = [];
 
     $date = substr($general['turntime'],11,5);
+    $sabotageName = '화계';
+    $statType = 'intel';
 
-    $admin = $gameStor->getValues(['year','month','develcost']);
+    [$year, $month, $develCost] = $gameStor->getValuesAsArray(['year','month','develcost']);
+    $logger = new ActionLogger($general['no'], $general['nation'], $year, $month);
 
-    $dist = searchDistance($general['city'], 5, false);
-    $command = DecodeCommand($general['turn0']);
-    $destination = $command[1];
+    $reqGold = $develCost * 5;
+    $reqRice = $develCost * 5;
     
-    $query = "select * from city where city='$destination'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $destcity = MYDB_fetch_array($result);
+    $srcCityID = $general['city'];
+    $destCityID = DecodeCommand($general['turn0'])[1];
 
-    $nation = getNationStaticInfo($general['nation']);
+    $dist = searchDistance($srcCityID, 5, false);
+    $srcCity = $db->queryFirstRow('SELECT city,nation,supply FROM city WHERE city=%i', $srcCityID);
+    $destCity = $db->queryFirstRow('SELECT city,name,level,nation,secu,secu2,supply,agri,comm,def,wall,rate FROM city WHERE city=%i',$destCityID);
+    $destCityName = $destCity['name']??null;
 
-    $query = "select nation,supply from city where city='{$general['city']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($result);
+    $srcNationID = $general['nation'];
+    $destNationID = $destCity['nation'];
 
-    $query = "select state from diplomacy where me='{$general['nation']}' and you='{$destcity['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $dip = MYDB_fetch_array($result);
+    $dipState = $db->queryFirstField('SELECT `state` FROM diplomacy WHERE me=%i AND you=%i', $srcNationID, $destNationID);
 
-    if(!$destcity) {
-        $log[] = "<C>●</>{$admin['month']}월:없는 도시입니다. 화계 실패. <1>$date</>";
-    } elseif($general['level'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:재야입니다. <G><b>{$destcity['name']}</b></>에 화계 실패. <1>$date</>";
-    } elseif($general['nation'] != $city['nation'] && $nation['level'] != 0) {
-        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. <G><b>{$destcity['name']}</b></>에 화계 실패. <1>$date</>";
-    } elseif($city['supply'] == 0 && $nation['level'] != 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. <G><b>{$destcity['name']}</b></>에 화계 실패. <1>$date</>";
-    } elseif($destcity['nation'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:공백지입니다. <G><b>{$destcity['name']}</b></>에 화계 실패. <1>$date</>";
-    } elseif($general['gold'] < $admin['develcost']*5) {
-        $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. <G><b>{$destcity['name']}</b></>에 화계 실패. <1>$date</>";
-    } elseif($general['rice'] < $admin['develcost']*5) {
-        $log[] = "<C>●</>{$admin['month']}월:군량이 모자랍니다. <G><b>{$destcity['name']}</b></>에 화계 실패. <1>$date</>";
-    } elseif($general['nation'] == $destcity['nation']) {
-        $log[] = "<C>●</>{$admin['month']}월:아국입니다. <G><b>{$destcity['name']}</b></>에 화계 실패. <1>$date</>";
-    } elseif($dip['state'] >= 7) {
-        $log[] = "<C>●</>{$admin['month']}월:불가침국입니다. <G><b>{$destcity['name']}</b></>에 화계 실패. <1>$date</>";
-    } else {
-        $query = "select leader,horse,power,weap,intel,book,injury from general where city='$destination' and nation='{$destcity['nation']}' order by intel desc";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $intelgen = MYDB_fetch_array($result);
-
-        $ratio = Util::round(((getGeneralIntel($general, true, true, true, false) - getGeneralIntel($intelgen, true, true, true, false)) / GameConst::$sabotageProbCoefByStat - ($destcity['secu']/$destcity['secu2'])/5 + GameConst::$sabotageDefaultProb)*100);
-        $ratio2 = rand() % 100;
-
-        if($general['item'] == 5) {
-            // 이추 사용
-            $ratio += 10;
-            $query = "update general set item=0 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $josaUl = JosaUtil::pick($general['item'], '을');
-            $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
-            $general['item'] = 0;
-        } elseif($general['item'] == 6) {
-            // 향낭 사용
-            $ratio += 20;
-            $query = "update general set item=0 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $josaUl = JosaUtil::pick($general['item'], '을');
-            $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
-            $general['item'] = 0;
-        } elseif($general['item'] >= 21 && $general['item'] <= 22) {
-            // 육도, 삼략 사용
-            $ratio += 20;
+    $failReason = checkSabotageFailCondition($general, $srcCity, $destCity, $reqGold, $reqRice, $dipState);
+    if($failReason !== null){
+        $logger->pushGeneralActionLog("{$failReason} {$sabotageName} 실패. <1>{$date}</>");
+        return;
     }
 
-        // 특기보정 : 신산, 귀모
-        if($general['special2'] == 41) { $ratio += 10; }
-        if($general['special'] == 31) { $ratio += 20; }
+    $srcNation = getNationStaticInfo($srcNationID);
+    $destNation = getNationStaticInfo($destNationID);
 
-        // 국가보정
-        if($nation['type'] == 9) { $ratio += 10; }
+    $generalList = $db->query('SELECT `no`,leader,horse,power,weap,intel,book,injury,level,special,special2 FROM general WHERE city=%i and nation=%i', $destCity['city'], $destCity['nation']);
+
+    [
+        $srcGenScore,
+        $srcSpecialScore,
+        $srcItemScore,
+        $srcNationScore,
+    ] = calcSabotageAttackScore($statType, $general, $srcNation);
+
+    [
+        $destGenScore,
+        $destCityScore,
+        $destSupplyScore
+    ] = calcSabotageDefendScore($statType, $generalList, $destCity, $destNation);
+
+    $sabotageProb = (
+        GameConst::$sabotageDefaultProb 
+        + ($srcGenScore + $srcSpecialScore + $srcItemScore + $srcNationScore) 
+        - ($destGenScore + $destCityScore + $destSupplyScore)
+    );
 
     // 거리보정
-        $ratio /= Util::array_get($dist[$destination], 99);
+    $sabotageProb /= Util::array_get($dist[$destCityID], 99);
 
-        if($ratio > $ratio2) {
-            $josaYi = JosaUtil::pick($destcity['name'], '이');
-            $alllog[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>{$josaYi} 불타고 있습니다.";
-            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 화계가 성공했습니다. <1>$date</>";
+    if(!Util::randBool($sabotageProb)){
+        $josaYi = JosaUtil::pick($sabotageName, '이');
+        $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>에 {$sabotageName}{$josaYi} 실패했습니다. <1>$date</>");
 
-            $destcity['agri'] -= rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount;
-            $destcity['comm'] -= rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount;
-            if($destcity['agri'] < 0) { $destcity['agri'] = 0; }
-            if($destcity['comm'] < 0) { $destcity['comm'] = 0; }
-            $query = "update city set state=32,agri='{$destcity['agri']}',comm='{$destcity['comm']}' where city='$destination'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update general set firenum=firenum+1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $exp = Util::randRangeInt(1, 100);
+        $exp *= getCharExpMultiplier($general['personal']);
+        $ded = Util::randRangeInt(1, 70);
+        $ded *= getCharDedMultiplier($general['personal']);
 
-            SabotageInjury($destination);
-            $exp = rand() % 100 + 201;
-            $ded = rand() % 70 + 141;
-        } else {
-            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 화계가 실패했습니다. <1>$date</>";
-            $exp = rand() % 100 + 1;
-            $ded = rand() % 70 + 1;
+        $general[$statType.'2'] += 1;
+        $general['gold'] -= $reqGold;
+        $general['rice'] -= $reqRice;
+        $db->update('general', [
+            ($statType.'2') => $general[$statType.'2'],
+            'resturn'=>'SUCCESS',
+            'gold'=>$general['gold'],
+            'rice'=>$general['rice'],
+            'experience'=>$db->sqleval('experience + %i', Util::round($exp)),
+            'dedication'=>$db->sqleval('dedication + %i', Util::round($ded))
+        ], 'no=%i', $general['no']);
+
+        checkAbilityEx($general['no'], $logger);
+        return;
     }
 
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
-
-        $general['intel2']++;
-        $general['gold'] -= $admin['develcost']*5;
-        $general['rice'] -= $admin['develcost']*5;
-        $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',intel2='{$general['intel2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        $log = checkAbility($general, $log);
+    if($srcItemScore){
+        $itemName = getItemName($general['item']);
+        $josaUl = JosaUtil::pick($itemName, '을');
+        $logger->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 사용!", ActionLogger::PLAIN);
+        $general['item'] = 0;
     }
-    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-    pushGenLog($general, $log);
+
+    $josaYi = JosaUtil::pick($destCityName, '이');
+    $logger->pushGlobalActionLog("<G><b>{$destCityName}</b></>{$josaYi} 불타고 있습니다.");
+    $josaYi = JosaUtil::pick($sabotageName, '이');
+    $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>에 {$sabotageName}{$josaYi} 성공했습니다. <1>$date</>");
+
+    $agriAmount = Util::valueFit(Util::randRangeInt(GameConst::$sabotageDamageMin, GameConst::$sabotageDamageMax), null, $destCity['agri']);
+    $commAmount = Util::valueFit(Util::randRangeInt(GameConst::$sabotageDamageMin, GameConst::$sabotageDamageMax), null, $destCity['comm']);
+    $destCity['agri'] -= $agriAmount;
+    $destCity['comm'] -= $commAmount;
+
+    $db->update('city', [
+        'state'=>32,
+        'agri'=>$destCity['agri'],
+        'comm'=>$destCity['comm']
+    ], 'city=%i', $destCityID);
+
+    $injuryCount = SabotageInjury($destCityID);
+
+    $logger->pushGeneralActionLog("도시의 농업이 <C>{$agriAmount}</>, 상업이 <C>{$commAmount}</>만큼 감소하고, 장수 <C>{$injuryCount}</>명이 부상 당했습니다.", ActionLogger::PLAIN);
+
+    $exp = Util::randRangeInt(201, 300);
+    $exp *= getCharExpMultiplier($general['personal']);
+    $ded = Util::randRangeInt(141, 210);
+    $ded *= getCharDedMultiplier($general['personal']);
+
+    $general[$statType.'2'] += 1;
+    $general['gold'] -= $reqGold;
+    $general['rice'] -= $reqRice;
+    $db->update('general', [
+        'firenum' => $db->sqleval('firenum + 1'),
+        ($statType.'2') => $general[$statType.'2'],
+        'resturn'=>'SUCCESS',
+        'gold'=>$general['gold'],
+        'rice'=>$general['rice'],
+        'item'=>$general['item'],
+        'experience'=>$db->sqleval('experience + %i', Util::round($exp)),
+        'dedication'=>$db->sqleval('dedication + %i', Util::round($ded))
+    ], 'no=%i', $general['no']);
+
+    checkAbilityEx($general['no'], $logger);
 }
 
 function process_33(&$general) {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();
 
-    $log = [];
-    $alllog = [];
-    $history = [];
+    $date = substr($general['turntime'],11,5);
+    $sabotageName = '탈취';
+    $statType = 'power';
+
+    [$year, $month, $develCost] = $gameStor->getValuesAsArray(['year','month','develcost']);
+    $logger = new ActionLogger($general['no'], $general['nation'], $year, $month);
+
+    $reqGold = $develCost * 5;
+    $reqRice = $develCost * 5;
+
+    $srcCityID = $general['city'];
+    $destCityID = DecodeCommand($general['turn0'])[1];
+
+    $dist = searchDistance($srcCityID, 5, false);
+    $srcCity = $db->queryFirstRow('SELECT city,nation,supply FROM city WHERE city=%i', $srcCityID);
+    $destCity = $db->queryFirstRow('SELECT city,name,level,nation,secu,secu2,supply,agri,comm,def,wall,rate FROM city WHERE city=%i',$destCityID);
+    $destCityName = $destCity['name']??null;
+
+    $srcNationID = $general['nation'];
+    $destNationID = $destCity['nation'];
 
     //탈취는 0까지 무제한
-    $date = substr($general['turntime'],11,5);
 
-    $admin = $gameStor->getValues(['year','month','develcost']);
+    $srcNation = getNationStaticInfo($srcNationID);
+    $dipState = $db->queryFirstField('SELECT `state` FROM diplomacy WHERE me=%i AND you=%i', $srcNationID, $destNationID);
 
-    $dist = searchDistance($general['city'], 5, false);
-    $command = DecodeCommand($general['turn0']);
-    $destination = $command[1];
-
-    $query = "select name,level,nation,secu,secu2 from city where city='$destination'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $destcity = MYDB_fetch_array($result);
-
-    $query = "select gold,rice from nation where nation='{$destcity['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    $mynation = getNationStaticInfo($general['nation']);
-
-    $query = "select nation,supply from city where city='{$general['city']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($result);
-
-    $query = "select state from diplomacy where me='{$general['nation']}' and you='{$destcity['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $dip = MYDB_fetch_array($result);
-
-    if(!$destcity) {
-        $log[] = "<C>●</>{$admin['month']}월:없는 도시입니다. 탈취 실패. <1>$date</>";
-    } elseif($general['level'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:재야입니다. <G><b>{$destcity['name']}</b></>에 탈취 실패. <1>$date</>";
-    } elseif($general['nation'] != $city['nation'] && $mynation['level'] != 0) {
-        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. <G><b>{$destcity['name']}</b></>에 탈취 실패. <1>$date</>";
-    } elseif($city['supply'] == 0 && $mynation['level'] != 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. <G><b>{$destcity['name']}</b></>에 탈취 실패. <1>$date</>";
-    } elseif($destcity['nation'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:공백지입니다. <G><b>{$destcity['name']}</b></>에 탈취 실패. <1>$date</>";
-    } elseif($general['gold'] < $admin['develcost']*5) {
-        $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. <G><b>{$destcity['name']}</b></>에 탈취 실패. <1>$date</>";
-    } elseif($general['rice'] < $admin['develcost']*5) {
-        $log[] = "<C>●</>{$admin['month']}월:군량이 모자랍니다. <G><b>{$destcity['name']}</b></>에 탈취 실패. <1>$date</>";
-    } elseif($general['nation'] == $destcity['nation']) {
-        $log[] = "<C>●</>{$admin['month']}월:아국입니다. <G><b>{$destcity['name']}</b></>에 탈취 실패. <1>$date</>";
-    } elseif($dip['state'] >= 7) {
-        $log[] = "<C>●</>{$admin['month']}월:불가침국입니다. <G><b>{$destcity['name']}</b></>에 탈취 실패. <1>$date</>";
-    } else {
-        $query = "select leader,horse,power,weap,intel,book,injury from general where city='$destination' and nation='{$destcity['nation']}' order by power desc";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $powergen = MYDB_fetch_array($result);
-
-        $ratio = Util::round(((getGeneralPower($general, true, true, true, false) - getGeneralPower($powergen, true, true, true, false)) / GameConst::$sabotageProbCoefByStat - ($destcity['secu']/$destcity['secu2'])/5 + GameConst::$sabotageDefaultProb)*100);
-        $ratio2 = rand() % 100;
-
-        if($general['item'] == 5) {
-            // 이추 사용
-            $ratio += 10;
-            $query = "update general set item=0 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $josaUl = JosaUtil::pick($general['item'], '을');
-            $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
-            $general['item'] = 0;
-        } elseif($general['item'] == 6) {
-            // 향낭 사용
-            $ratio += 20;
-            $query = "update general set item=0 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $josaUl = JosaUtil::pick($general['item'], '을');
-            $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
-            $general['item'] = 0;
-        } elseif($general['item'] >= 21 && $general['item'] <= 22) {
-            // 육도, 삼략 사용
-            $ratio += 20;
+    $failReason = checkSabotageFailCondition($general, $srcCity, $destCity, $reqGold, $reqRice, $dipState);
+    if($failReason !== null){
+        $logger->pushGeneralActionLog("{$failReason} {$sabotageName} 실패. <1>{$date}</>");
+        return;
     }
 
-        // 특기보정 : 신산, 귀모
-        if($general['special2'] == 41) { $ratio += 10; }
-        if($general['special'] == 31) { $ratio += 20; }
+    $srcNation = getNationStaticInfo($srcNationID);
+    $destNation = getNationStaticInfo($destNationID);
 
-        // 국가보정
-        if($mynation['type'] == 9) { $ratio += 10; }
+    $generalList = $db->query('SELECT `no`,leader,horse,power,weap,intel,book,injury,level,special,special2 FROM general WHERE city=%i and nation=%i', $destCity['city'], $destCity['nation']);
+
+    [
+        $srcGenScore,
+        $srcSpecialScore,
+        $srcItemScore,
+        $srcNationScore,
+    ] = calcSabotageAttackScore($statType, $general, $srcNation);
+
+    [
+        $destGenScore,
+        $destCityScore,
+        $destSupplyScore
+    ] = calcSabotageDefendScore($statType, $generalList, $destCity, $destNation);
+
+    $sabotageProb = (
+        GameConst::$sabotageDefaultProb 
+        + ($srcGenScore + $srcSpecialScore + $srcItemScore + $srcNationScore) 
+        - ($destGenScore + $destCityScore + $destSupplyScore)
+    );
 
     // 거리보정
-        $ratio /= Util::array_get($dist[$destination], 99);
+    $sabotageProb /= Util::array_get($dist[$destCityID], 99);
 
-        if($ratio > $ratio2) {
-            $alllog[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에서 금과 쌀을 도둑맞았습니다.";
-            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 탈취가 성공했습니다. <1>$date</>";
+    if(!Util::randBool($sabotageProb)){
+        $josaYi = JosaUtil::pick($sabotageName, '이');
+        $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>에 {$sabotageName}{$josaYi} 실패했습니다. <1>$date</>");
+
+        $exp = Util::randRangeInt(1, 100);
+        $exp *= getCharExpMultiplier($general['personal']);
+        $ded = Util::randRangeInt(1, 70);
+        $ded *= getCharDedMultiplier($general['personal']);
+
+        $general[$statType.'2'] += 1;
+        $general['gold'] -= $reqGold;
+        $general['rice'] -= $reqRice;
+        $db->update('general', [
+            ($statType.'2') => $general[$statType.'2'],
+            'resturn'=>'SUCCESS',
+            'gold'=>$general['gold'],
+            'rice'=>$general['rice'],
+            'experience'=>$db->sqleval('experience + %i', Util::round($exp)),
+            'dedication'=>$db->sqleval('dedication + %i', Util::round($ded))
+        ], 'no=%i', $general['no']);
+
+        checkAbilityEx($general['no'], $logger);
+        return;
+    }
+
+    if($srcItemScore){
+        $itemName = getItemName($general['item']);
+        $josaUl = JosaUtil::pick($itemName, '을');
+        $logger->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 사용!", ActionLogger::PLAIN);
+        $general['item'] = 0;
+    }
+
+    $logger->pushGlobalActionLog("<G><b>{$destCityName}</b></>에서 금과 쌀을 도둑맞았습니다.");
+    $josaYi = JosaUtil::pick($sabotageName, '이');
+    $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>에 {$sabotageName}{$josaYi} 성공했습니다. <1>$date</>");
 
     // 탈취 최대 400 * 8
-            $gold = (rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount) * $destcity['level'];
-            $rice = (rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount) * $destcity['level'];
+    $gold = Util::randRangeInt(GameConst::$sabotageDamageMin, GameConst::$sabotageDamageMax) * $destCity['level'];
+    $rice = Util::randRangeInt(GameConst::$sabotageDamageMin, GameConst::$sabotageDamageMax) * $destCity['level'];
 
-            $nation['gold'] -= $gold;
-            $nation['rice'] -= $rice;
-            if($nation['gold'] < GameConst::$minNationalGold) { $gold += ($nation['gold'] - GameConst::$minNationalGold); $nation['gold'] = GameConst::$minNationalGold; }
-            if($nation['rice'] < GameConst::$minNationalRice) { $rice += ($nation['rice'] - GameConst::$minNationalRice); $nation['rice'] = GameConst::$minNationalRice; }
-            $query = "update nation set gold='{$nation['gold']}',rice='{$nation['rice']}' where nation='{$destcity['nation']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update city set state=34 where city='$destination'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update general set firenum=firenum+1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            // 본국으로 회수, 재야이면 본인이 소유
+    if($destCity['supply']){
+        [$destNationGold, $destNationRice] = $db->queryFirstList('SELECT gold,rice FROM nation WHERE nation=%i', $destNationID);
+
+        $destNationGold -= $gold;
+        $destNationRice -= $rice;
+
+        if($destNationGold < GameConst::$minNationalGold) { 
+            $gold += $destNationGold - GameConst::$minNationalGold;
+            $destNationGold = GameConst::$minNationalGold;
+        }
+        if($destNationRice < GameConst::$minNationalRice) {
+            $rice += $destNationRice - GameConst::$minNationalRice;
+            $destNationRice = GameConst::$minNationalRice;
+        }
+
+        $db->update('nation', [
+            'gold'=>$destNationGold,
+            'rice'=>$destNationRice
+        ], 'nation=%i', $destNationID);
+        $db->update('city', [
+            'state'=>34
+        ], 'city=%i', $destCityID);
+    }
+    else{
+        $db->update('city', [
+            'comm'=>Util::valueFit($destCity['comm'] - $gold / 12, 0),
+            'agri'=>Util::valueFit($destCity['agri'] - $rice / 12, 0),
+            'state'=>34
+        ], 'city=%i', $destCityID);
+    }
+    
+    // 본국으로 일부 회수, 재야이면 본인이 전량 소유
     if($general['nation'] != 0) {
-                $query = "select gold,rice from nation where nation='{$general['nation']}'";
-                $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-                $nation = MYDB_fetch_array($result);
-                $nation['gold'] += $gold;
-                $nation['rice'] += $rice;
-                $query = "update nation set gold='{$nation['gold']}',rice='{$nation['rice']}' where nation='{$general['nation']}'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $db->update('nation', [
+            'gold' => $db->sqleval('gold + %i', Util::round($gold * 0.7)),
+            'rice' => $db->sqleval('rice + %i', Util::round($rice * 0.7))
+        ], 'nation=%i', $srcNationID);
+        $general['gold'] += $gold - Util::round($gold * 0.7);
+        $general['rice'] += $rice - Util::round($rice * 0.7);
     } else {
         $general['gold'] += $gold;
         $general['rice'] += $rice;
-                $query = "update general set gold='{$general['gold']}',rice='{$general['rice']}' where no='{$general['no']}'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            }
-            $log[] = "<C>●</>금<C>$gold</> 쌀<C>$rice</>을 획득했습니다.";
-
-//            SabotageInjury($destination);
-            $exp = rand() % 100 + 201;
-            $ded = rand() % 70 + 141;
-        } else {
-            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 탈취가 실패했습니다. <1>$date</>";
-            $exp = rand() % 100 + 1;
-            $ded = rand() % 70 + 1;
     }
 
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
+    $logger->pushGeneralActionLog("금<C>{$gold}</> 쌀<C>{$rice}</>을 획득했습니다.", ActionLogger::PLAIN);
 
-        $general['power2']++;
-        $general['gold'] -= $admin['develcost']*5;
-        $general['rice'] -= $admin['develcost']*5;
-        $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',power2='{$general['power2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $exp = Util::randRangeInt(201, 300);
+    $exp *= getCharExpMultiplier($general['personal']);
+    $ded = Util::randRangeInt(141, 210);
+    $ded *= getCharDedMultiplier($general['personal']);
 
-        $log = checkAbility($general, $log);
-    }
-    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-    pushGenLog($general, $log);
+    $general[$statType.'2'] += 1;
+    $general['gold'] -= $reqGold;
+    $general['rice'] -= $reqRice;
+    $db->update('general', [
+        'firenum' => $db->sqleval('firenum + 1'),
+        ($statType.'2') => $general[$statType.'2'],
+        'resturn'=>'SUCCESS',
+        'gold'=>$general['gold'],
+        'rice'=>$general['rice'],
+        'item'=>$general['item'],
+        'experience'=>$db->sqleval('experience + %i', Util::round($exp)),
+        'dedication'=>$db->sqleval('dedication + %i', Util::round($ded))
+    ], 'no=%i', $general['no']);
+
+    checkAbilityEx($general['no'], $logger);
 }
 
 function process_34(&$general) {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();
-
-    $log = [];
-    $alllog = [];
-    $history = [];
 
     $date = substr($general['turntime'],11,5);
+    $sabotageName = '파괴';
+    $statType = 'power';
 
-    $admin = $gameStor->getValues(['year','month','develcost']);
+    [$year, $month, $develCost] = $gameStor->getValuesAsArray(['year','month','develcost']);
+    $logger = new ActionLogger($general['no'], $general['nation'], $year, $month);
 
-    $dist = searchDistance($general['city'], 5, false);
-    $command = DecodeCommand($general['turn0']);
-    $destination = $command[1];
+    $reqGold = $develCost * 5;
+    $reqRice = $develCost * 5;
 
-    $query = "select name,nation,def,wall,secu,secu2 from city where city='$destination'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $destcity = MYDB_fetch_array($result);
+    $srcCityID = $general['city'];
+    $destCityID = DecodeCommand($general['turn0'])[1];
 
-    $mynation = getNationStaticInfo($general['nation']);
+    $dist = searchDistance($srcCityID, 5, false);
+    $srcCity = $db->queryFirstRow('SELECT city,nation,supply FROM city WHERE city=%i', $srcCityID);
+    $destCity = $db->queryFirstRow('SELECT city,name,level,nation,secu,secu2,supply,agri,comm,def,wall,rate FROM city WHERE city=%i',$destCityID);
+    $destCityName = $destCity['name']??null;
 
-    $query = "select nation,supply from city where city='{$general['city']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($result);
+    $srcNationID = $general['nation'];
+    $destNationID = $destCity['nation'];
 
-    $query = "select state from diplomacy where me='{$general['nation']}' and you='{$destcity['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $dip = MYDB_fetch_array($result);
+    $srcNation = getNationStaticInfo($srcNationID);
+    $dipState = $db->queryFirstField('SELECT `state` FROM diplomacy WHERE me=%i AND you=%i', $srcNationID, $destNationID);
 
-    if(!$destcity) {
-        $log[] = "<C>●</>{$admin['month']}월:없는 도시입니다. 파괴 실패. <1>$date</>";
-    } elseif($general['level'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:재야입니다. <G><b>{$destcity['name']}</b></>에 파괴 실패. <1>$date</>";
-    } elseif($general['nation'] != $city['nation'] && $mynation['level'] != 0) {
-        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. <G><b>{$destcity['name']}</b></>에 파괴 실패. <1>$date</>";
-    } elseif($city['supply'] == 0 && $mynation['level'] != 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. <G><b>{$destcity['name']}</b></>에 파괴 실패. <1>$date</>";
-    } elseif($destcity['nation'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:공백지입니다. <G><b>{$destcity['name']}</b></>에 파괴 실패. <1>$date</>";
-    } elseif($general['gold'] < $admin['develcost']*5) {
-        $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. <G><b>{$destcity['name']}</b></>에 파괴 실패. <1>$date</>";
-    } elseif($general['rice'] < $admin['develcost']*5) {
-        $log[] = "<C>●</>{$admin['month']}월:군량이 모자랍니다. <G><b>{$destcity['name']}</b></>에 파괴 실패. <1>$date</>";
-    } elseif($general['nation'] == $destcity['nation']) {
-        $log[] = "<C>●</>{$admin['month']}월:아국입니다. <G><b>{$destcity['name']}</b></>에 파괴 실패. <1>$date</>";
-    } elseif($dip['state'] >= 7) {
-        $log[] = "<C>●</>{$admin['month']}월:불가침국입니다. <G><b>{$destcity['name']}</b></>에 파괴 실패. <1>$date</>";
-    } else {
-        $query = "select leader,horse,power,weap,intel,book,injury from general where city='$destination' and nation='{$destcity['nation']}' order by power desc";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $powergen = MYDB_fetch_array($result);
-
-        $ratio = Util::round(((getGeneralPower($general, true, true, true, false) - getGeneralPower($powergen, true, true, true, false)) / GameConst::$sabotageProbCoefByStat - ($destcity['secu']/$destcity['secu2'])/5 + GameConst::$sabotageDefaultProb)*100);
-        $ratio2 = rand() % 100;
-
-        if($general['item'] == 5) {
-            // 이추 사용
-            $ratio += 10;
-            $query = "update general set item=0 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $josaUl = JosaUtil::pick($general['item'], '을');
-            $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
-            $general['item'] = 0;
-        } elseif($general['item'] == 6) {
-            // 향낭 사용
-            $ratio += 20;
-            $query = "update general set item=0 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $josaUl = JosaUtil::pick($general['item'], '을');
-            $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
-            $general['item'] = 0;
-        } elseif($general['item'] >= 21 && $general['item'] <= 22) {
-            // 육도, 삼략 사용
-            $ratio += 20;
+    $failReason = checkSabotageFailCondition($general, $srcCity, $destCity, $reqGold, $reqRice, $dipState);
+    if($failReason !== null){
+        $logger->pushGeneralActionLog("{$failReason} {$sabotageName} 실패. <1>{$date}</>");
+        return;
     }    
 
-        // 특기보정 : 신산, 귀모
-        if($general['special2'] == 41) { $ratio += 10; }
-        if($general['special'] == 31) { $ratio += 20; }
+    $srcNation = getNationStaticInfo($srcNationID);
+    $destNation = getNationStaticInfo($destNationID);
 
-        // 국가보정
-        if($mynation['type'] == 9) { $ratio += 10; }
+    $generalList = $db->query('SELECT `no`,leader,horse,power,weap,intel,book,injury,level,special,special2 FROM general WHERE city=%i and nation=%i', $destCity['city'], $destCity['nation']);
+
+    [
+        $srcGenScore,
+        $srcSpecialScore,
+        $srcItemScore,
+        $srcNationScore,
+    ] = calcSabotageAttackScore($statType, $general, $srcNation);
+
+    [
+        $destGenScore,
+        $destCityScore,
+        $destSupplyScore
+    ] = calcSabotageDefendScore($statType, $generalList, $destCity, $destNation);
+
+    $sabotageProb = (
+        GameConst::$sabotageDefaultProb 
+        + ($srcGenScore + $srcSpecialScore + $srcItemScore + $srcNationScore) 
+        - ($destGenScore + $destCityScore + $destSupplyScore)
+    );
 
     // 거리보정
-        $ratio /= Util::array_get($dist[$destination], 99);
+    $sabotageProb /= Util::array_get($dist[$destCityID], 99);
 
-        if($ratio > $ratio2) {
-            $alllog[] = "<C>●</>{$admin['month']}월:누군가가 <G><b>{$destcity['name']}</b></>의 성벽을 허물었습니다.";
-            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 파괴가 성공했습니다. <1>$date</>";
+    if(!Util::randBool($sabotageProb)){
+        $josaYi = JosaUtil::pick($sabotageName, '이');
+        $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>에 {$sabotageName}{$josaYi} 실패했습니다. <1>$date</>");
+
+        $exp = Util::randRangeInt(1, 100);
+        $exp *= getCharExpMultiplier($general['personal']);
+        $ded = Util::randRangeInt(1, 70);
+        $ded *= getCharDedMultiplier($general['personal']);
+
+        $general[$statType.'2'] += 1;
+        $general['gold'] -= $reqGold;
+        $general['rice'] -= $reqRice;
+        $db->update('general', [
+            ($statType.'2') => $general[$statType.'2'],
+            'resturn'=>'SUCCESS',
+            'gold'=>$general['gold'],
+            'rice'=>$general['rice'],
+            'experience'=>$db->sqleval('experience + %i', Util::round($exp)),
+            'dedication'=>$db->sqleval('dedication + %i', Util::round($ded))
+        ], 'no=%i', $general['no']);
+
+        checkAbilityEx($general['no'], $logger);
+        return;
+    }
+
+    if($srcItemScore){
+        $itemName = getItemName($general['item']);
+        $josaUl = JosaUtil::pick($itemName, '을');
+        $logger->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 사용!", ActionLogger::PLAIN);
+        $general['item'] = 0;
+    }
+
+    $logger->pushGlobalActionLog("누군가가 <G><b>{$destCityName}</b></>의 성벽을 허물었습니다.");
+    $josaYi = JosaUtil::pick($sabotageName, '이');
+    $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>에 {$sabotageName}{$josaYi} 성공했습니다. <1>$date</>");
 
     // 파괴
-            $destcity['def'] -= rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount;
-            $destcity['wall'] -= rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount;
-            if($destcity['def'] < 100) { $destcity['def'] = 100; }
-            if($destcity['wall'] < 100) { $destcity['wall'] = 100; }
-            $query = "update city set state=34,def='{$destcity['def']}',wall='{$destcity['wall']}' where city='$destination'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update general set firenum=firenum+1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $defAmount = Util::valueFit(Util::randRangeInt(GameConst::$sabotageDamageMin, GameConst::$sabotageDamageMax), null, $destCity['def'] - 100);
+    $wallAmount = Util::valueFit(Util::randRangeInt(GameConst::$sabotageDamageMin, GameConst::$sabotageDamageMax), null, $destCity['wall'] - 100);
+    if($defAmount < 0){ $defAmount = 0; }
+    if($wallAmount < 0){ $wallAmount = 0; }
 
-            SabotageInjury($destination);
-            $exp = rand() % 100 + 201;
-            $ded = rand() % 70 + 141;
-        } else {
-            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 파괴가 실패했습니다. <1>$date</>";
-            $exp = rand() % 100 + 1;
-            $ded = rand() % 70 + 1;
-        }
+    $destCity['def'] -= $defAmount;
+    $destCity['wall'] -= $wallAmount;
 
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
+    $db->update('city', [
+        'state'=>32,
+        'def'=>$destCity['def'],
+        'wall'=>$destCity['wall']
+    ], 'city=%i', $destCityID);
 
-        $general['power2']++;
-        $general['gold'] -= $admin['develcost']*5;
-        $general['rice'] -= $admin['develcost']*5;
-        $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',power2='{$general['power2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $injuryCount = SabotageInjury($destCityID);
 
-        $log = checkAbility($general, $log);
-    }
-    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-    pushGenLog($general, $log);
+    $logger->pushGeneralActionLog("도시의 수비가 <C>{$defAmount}</>, 성벽이 <C>{$wallAmount}</>만큼 감소하고, 장수 <C>{$injuryCount}</>명이 부상 당했습니다.", ActionLogger::PLAIN);
+
+    $exp = Util::randRangeInt(201, 300);
+    $exp *= getCharExpMultiplier($general['personal']);
+    $ded = Util::randRangeInt(141, 210);
+    $ded *= getCharDedMultiplier($general['personal']);
+
+    $general[$statType.'2'] += 1;
+    $general['gold'] -= $reqGold;
+    $general['rice'] -= $reqRice;
+    $db->update('general', [
+        'firenum' => $db->sqleval('firenum + 1'),
+        ($statType.'2') => $general[$statType.'2'],
+        'resturn'=>'SUCCESS',
+        'gold'=>$general['gold'],
+        'rice'=>$general['rice'],
+        'item'=>$general['item'],
+        'experience'=>$db->sqleval('experience + %i', Util::round($exp)),
+        'dedication'=>$db->sqleval('dedication + %i', Util::round($ded))
+    ], 'no=%i', $general['no']);
+
+    checkAbilityEx($general['no'], $logger);
 }
 
 function process_35(&$general) {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();
-
-    $log = [];
-    $alllog = [];
-    $history = [];
 
     $date = substr($general['turntime'],11,5);
+    $sabotageName = '선동';
+    $statType = 'leader';
 
-    $admin = $gameStor->getValues(['year','month','develcost']);
+    [$year, $month, $develCost] = $gameStor->getValuesAsArray(['year','month','develcost']);
+    $logger = new ActionLogger($general['no'], $general['nation'], $year, $month);
 
-    $dist = searchDistance($general['city'], 5, false);
-    $command = DecodeCommand($general['turn0']);
-    $destination = $command[1];
+    $reqGold = $develCost * 5;
+    $reqRice = $develCost * 5;
 
-    $query = "select name,nation,rate,secu,secu2 from city where city='$destination'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $destcity = MYDB_fetch_array($result);
+    $srcCityID = $general['city'];
+    $destCityID = DecodeCommand($general['turn0'])[1];
 
-    $mynation = getNationStaticInfo($general['nation']);
+    $dist = searchDistance($srcCityID, 5, false);
+    $srcCity = $db->queryFirstRow('SELECT city,nation,supply FROM city WHERE city=%i', $srcCityID);
+    $destCity = $db->queryFirstRow('SELECT city,name,level,nation,secu,secu2,supply,agri,comm,def,wall,rate FROM city WHERE city=%i',$destCityID);
+    $destCityName = $destCity['name']??null;
 
-    $lbonus = setLeadershipBonus($general, $mynation['level']);
+    $srcNationID = $general['nation'];
+    $destNationID = $destCity['nation'];
 
-    $query = "select nation,supply from city where city='{$general['city']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($result);
+    $srcNation = getNationStaticInfo($srcNationID);
+    $dipState = $db->queryFirstField('SELECT `state` FROM diplomacy WHERE me=%i AND you=%i', $srcNationID, $destNationID);
 
-    $query = "select state from diplomacy where me='{$general['nation']}' and you='{$destcity['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $dip = MYDB_fetch_array($result);
+    $lbonus = setLeadershipBonus($general, $srcNation['level']);
 
-    if(!$destcity) {
-        $log[] = "<C>●</>{$admin['month']}월:없는 도시입니다. 선동 실패. <1>$date</>";
-    } elseif($general['level'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:재야입니다. <G><b>{$destcity['name']}</b></>에 선동 실패. <1>$date</>";
-    } elseif($general['nation'] != $city['nation'] && $mynation['level'] != 0) {
-        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. <G><b>{$destcity['name']}</b></>에 선동 실패. <1>$date</>";
-    } elseif($city['supply'] == 0 && $mynation['level'] != 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. <G><b>{$destcity['name']}</b></>에 선동 실패. <1>$date</>";
-    } elseif($destcity['nation'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:공백지입니다. <G><b>{$destcity['name']}</b></>에 선동 실패. <1>$date</>";
-    } elseif($general['gold'] < $admin['develcost']*5) {
-        $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. <G><b>{$destcity['name']}</b></>에 선동 실패. <1>$date</>";
-    } elseif($general['rice'] < $admin['develcost']*5) {
-        $log[] = "<C>●</>{$admin['month']}월:군량이 모자랍니다. <G><b>{$destcity['name']}</b></>에 선동 실패. <1>$date</>";
-    } elseif($general['nation'] == $destcity['nation']) {
-        $log[] = "<C>●</>{$admin['month']}월:아국입니다. <G><b>{$destcity['name']}</b></>에 선동 실패. <1>$date</>";
-    } elseif($dip['state'] >= 7) {
-        $log[] = "<C>●</>{$admin['month']}월:불가침국입니다. <G><b>{$destcity['name']}</b></>에 선동 실패. <1>$date</>";
-    } else {
-        $query = "select leader,horse,power,weap,intel,book,injury from general where city='$destination' and nation='{$destcity['nation']}' order by leader desc";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $gen = MYDB_fetch_array($result);
-
-        $ratio = Util::round(((getGeneralLeadership($general, true, true, true) - getGeneralLeadership($gen, true, true, true)) / GameConst::$sabotageProbCoefByStat - ($destcity['secu']/$destcity['secu2'])/5 + GameConst::$sabotageDefaultProb)*100);
-        $ratio2 = rand() % 100;
-
-        if($general['item'] == 5) {
-            // 이추 사용
-            $ratio += 10;
-            $query = "update general set item=0 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $josaUl = JosaUtil::pick($general['item'], '을');
-            $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
-            $general['item'] = 0;
-        } elseif($general['item'] == 6) {
-            // 향낭 사용
-            $ratio += 20;
-            $query = "update general set item=0 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $josaUl = JosaUtil::pick($general['item'], '을');
-            $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
-            $general['item'] = 0;
-        } elseif($general['item'] >= 21 && $general['item'] <= 22) {
-            // 육도, 삼략 사용
-            $ratio += 20;
+    $failReason = checkSabotageFailCondition($general, $srcCity, $destCity, $reqGold, $reqRice, $dipState);
+    if($failReason !== null){
+        $logger->pushGeneralActionLog("{$failReason} {$sabotageName} 실패. <1>{$date}</>");
+        return;
     }
 
-        // 특기보정 : 신산, 귀모
-        if($general['special2'] == 41) { $ratio += 10; }
-        if($general['special'] == 31) { $ratio += 20; }
+    $srcNation = getNationStaticInfo($srcNationID);
+    $destNation = getNationStaticInfo($destNationID);
 
-        // 국가보정
-        if($mynation['type'] == 9) { $ratio += 10; }
+    $generalList = $db->query('SELECT `no`,leader,horse,power,weap,intel,book,injury,level,special,special2 FROM general WHERE city=%i and nation=%i', $destCity['city'], $destCity['nation']);
+    [
+        $srcGenScore,
+        $srcSpecialScore,
+        $srcItemScore,
+        $srcNationScore,
+    ] = calcSabotageAttackScore($statType, $general, $srcNation);
+
+    [
+        $destGenScore,
+        $destCityScore,
+        $destSupplyScore
+    ] = calcSabotageDefendScore($statType, $generalList, $destCity, $destNation);
+
+    $sabotageProb = (
+        GameConst::$sabotageDefaultProb 
+        + ($srcGenScore + $srcSpecialScore + $srcItemScore + $srcNationScore) 
+        - ($destGenScore + $destCityScore + $destSupplyScore)
+    );
 
     // 거리보정
-        $ratio /= Util::array_get($dist[$destination], 99);
+    $sabotageProb /= Util::array_get($dist[$destCityID], 99);
 
-        if($ratio > $ratio2) {
-            $alllog[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>의 백성들이 동요하고 있습니다.";
-            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 선동이 성공했습니다. <1>$date</>";
+    if(!Util::randBool($sabotageProb)){
+        $josaYi = JosaUtil::pick($sabotageName, '이');
+        $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>에 {$sabotageName}{$josaYi} 실패했습니다. <1>$date</>");
+
+        $exp = Util::randRangeInt(1, 100);
+        $exp *= getCharExpMultiplier($general['personal']);
+        $ded = Util::randRangeInt(1, 70);
+        $ded *= getCharDedMultiplier($general['personal']);
+
+        $general[$statType.'2'] += 1;
+        $general['gold'] -= $reqGold;
+        $general['rice'] -= $reqRice;
+        $db->update('general', [
+            ($statType.'2') => $general[$statType.'2'],
+            'resturn'=>'SUCCESS',
+            'gold'=>$general['gold'],
+            'rice'=>$general['rice'],
+            'experience'=>$db->sqleval('experience + %i', Util::round($exp)),
+            'dedication'=>$db->sqleval('dedication + %i', Util::round($ded))
+        ], 'no=%i', $general['no']);
+
+        checkAbilityEx($general['no'], $logger);
+        return;
+    }
+
+    if($srcItemScore){
+        $itemName = getItemName($general['item']);
+        $josaUl = JosaUtil::pick($itemName, '을');
+        $logger->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 사용!", ActionLogger::PLAIN);
+        $general['item'] = 0;
+    }
+
+    $logger->pushGlobalActionLog("<G><b>{$destCityName}</b></>의 백성들이 동요하고 있습니다.");
+    $josaYi = JosaUtil::pick($sabotageName, '이');
+    $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>에 {$sabotageName}{$josaYi} 성공했습니다. <1>$date</>");
 
     // 선동 최대 10
-            $destcity['secu'] -= rand() % Util::round(GameConst::$sabotageAmountCoef/2) + GameConst::$sabotageDefaultAmount;
-            $destcity['rate'] -= rand() % Util::round(GameConst::$sabotageAmountCoef/50) + GameConst::$sabotageDefaultAmount/50;
-            if($destcity['secu'] < 0) { $destcity['secu'] = 0; }
-            if($destcity['rate'] < 0) { $destcity['rate'] = 0; }
-            $query = "update city set state=32,rate='{$destcity['rate']}',secu='{$destcity['secu']}' where city='$destination'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update general set firenum=firenum+1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $secuAmount = Util::valueFit(Util::randRangeInt(GameConst::$sabotageDamageMin, GameConst::$sabotageDamageMax), null, $destCity['secu']);
+    $rateAmount = Util::valueFit(
+        Util::round(Util::randRangeInt(GameConst::$sabotageDamageMin, GameConst::$sabotageDamageMax) / 50),
+        null, 
+        $destCity['rate']
+    );
+    $destCity['secu'] -= $secuAmount;
+    $destCity['rate'] -= $rateAmount;
     
-            SabotageInjury($destination);
-            $exp = rand() % 100 + 201;
-            $ded = rand() % 70 + 141;
-        } else {
-            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 선동이 실패했습니다. <1>$date</>";
-            $exp = rand() % 100 + 1;
-            $ded = rand() % 70 + 1;
-        }
+    $db->update('city', [
+        'state'=>32,
+        'secu'=>$destCity['secu'],
+        'rate'=>$destCity['rate']
+    ], 'city=%i', $destCityID);
 
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
+    $injuryCount = SabotageInjury($destCityID);
 
-        $general['leader2']++;
-        $general['gold'] -= $admin['develcost']*5;
-        $general['rice'] -= $admin['develcost']*5;
-        $query = "update general set resturn='SUCCESS',gold='{$general['gold']}',rice='{$general['rice']}',leader2='{$general['leader2']}',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $logger->pushGeneralActionLog("도시의 치안이 <C>{$secuAmount}</>, 민심이 <C>{$rateAmount}</>만큼 감소하고, 장수 <C>{$injuryCount}</>명이 부상 당했습니다.", ActionLogger::PLAIN);
 
-        $log = checkAbility($general, $log);
-    }
-    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-    pushGenLog($general, $log);
+    $exp = Util::randRangeInt(201, 300);
+    $exp *= getCharExpMultiplier($general['personal']);
+    $ded = Util::randRangeInt(141, 210);
+    $ded *= getCharDedMultiplier($general['personal']);
+
+    $general[$statType.'2'] += 1;
+    $general['gold'] -= $reqGold;
+    $general['rice'] -= $reqRice;
+    $db->update('general', [
+        'firenum' => $db->sqleval('firenum + 1'),
+        ($statType.'2') => $general[$statType.'2'],
+        'resturn'=>'SUCCESS',
+        'gold'=>$general['gold'],
+        'rice'=>$general['rice'],
+        'item'=>$general['item'],
+        'experience'=>$db->sqleval('experience + %i', Util::round($exp)),
+        'dedication'=>$db->sqleval('dedication + %i', Util::round($ded))
+    ], 'no=%i', $general['no']);
+
+    checkAbilityEx($general['no'], $logger);
 }

hwe/func_time_event.php

@@ -101,7 +101,7 @@ function processGoldIncome() {
         $query = "update nation set gold='{$nation['gold']}' where nation='{$nation['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
-        $query = "select no,name,nation,dedication,gold from general where nation='{$nation['nation']}'";
+        $query = "select no,name,nation,dedication,gold from general where nation='{$nation['nation']}' AND npc != 5";
         $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $gencount = MYDB_num_rows($genresult);
 
@@ -317,7 +317,7 @@ function getGoldOutcome($nation, $bill) {
     $db = DB::db();
     $connect=$db->get();
 
-    $query = "select dedication from general where nation='$nation'"; // 장수 목록
+    $query = "select dedication from general where nation='$nation' AND npc != 5"; // 장수 목록
     $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $gencount = MYDB_num_rows($genresult);
 
@@ -424,7 +424,7 @@ function processRiceIncome() {
         $query = "update nation set rice='{$nation['rice']}' where nation='{$nation['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
-        $query = "select no,name,nation,dedication,rice from general where nation='{$nation['nation']}'";
+        $query = "select no,name,nation,dedication,rice from general where nation='{$nation['nation']}' AND npc != 5";
         $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $gencount = MYDB_num_rows($genresult);
 
@@ -517,7 +517,7 @@ function getRiceOutcome($nation, $bill) {
     $db = DB::db();
     $connect=$db->get();
 
-    $query = "select dedication from general where nation='$nation'"; // 장수 목록
+    $query = "select dedication from general where nation='$nation' AND npc != 5"; // 장수 목록
     $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $gencount = MYDB_num_rows($genresult);
 
@@ -594,14 +594,14 @@ function disaster() {
 
     for($i=0; $i < $citycount; $i++) {
         $city = MYDB_fetch_array($cityresult);
-        //호황 발생 도시 선택 ( 기본 3% 이므로 약 3개 도시 )
-        //재해 발생 도시 선택 ( 기본 6% 이므로 약 6개 도시 )
-        if($isgood == 1) { $ratio = 3 + Util::round(1.0*$city['secu']/$city['secu2']*3); }    // 3 ~ 6%
-        else { $ratio = 6 - Util::round(1.0*$city['secu']/$city['secu2']*3); }    // 3 ~ 6%
+        //호황 발생 도시 선택 ( 기본 2% )
+        //재해 발생 도시 선택 ( 기본 6% )
+        if($isgood == 1) { $ratio = 2 + Util::round($city['secu']/$city['secu2']*5); }    // 2 ~ 7%
+        else { $ratio = 6 - Util::round($city['secu']/$city['secu2']*5); }    // 1 ~ 6%
 
         if(rand()%100+1 < $ratio) {
             $disastercity[] = $city['city'];
-            $disasterratio[] = 1.0 * $city['secu'] / $city['secu2'];
+            $disasterratio[] = Util::valueFit($city['secu'] / 0.8 / $city['secu2'], 0, 1);
             $disastername[] = $city['name'];
         }
     }

hwe/func_tournament.php

@@ -298,7 +298,7 @@ function fillLowGenAll() {
     }
 
     //자동신청하고, 돈 있고, 아직 참가 안한 장수
-    $query = "select no,npc,name,leader,power,intel,explevel from general where tnmt='1' and tournament='0' and gold>='{$develcost}' order by rand() limit 0,64";
+    $query = "select no,npc,name,leader,power,intel,explevel from general where tnmt='1' and tournament='0' order by rand() limit 0,64";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $genCount = MYDB_num_rows($result);
 
@@ -313,7 +313,7 @@ function fillLowGenAll() {
                 if($genCount > 0) {
                     $genCount--;
                     $gen = MYDB_fetch_array($result);
-                    $query = "update general set gold=gold-'{$develcost}',tournament='1' where no='{$gen['no']}'";
+                    $query = "update general set tournament='1' where no='{$gen['no']}'";
                     MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
                     $query = "insert into tournament (no, npc, name, ldr, pwr, itl, lvl, grp, grp_no) values ('{$gen['no']}', '{$gen['npc']}', '{$gen['name']}', '{$gen['leader']}', '{$gen['power']}', '{$gen['intel']}', '{$gen['explevel']}', '$i', '$grpCount[$i]')";

hwe/index.php

@@ -114,7 +114,7 @@ $(function(){
 <?=WebUtil::printCSS('css/main.css')?>
 <?=WebUtil::printCSS('css/map.css')?>
 <?=WebUtil::printCSS('css/msg.css')?>
-
+<link href="https://fonts.googleapis.com/css?family=Nanum+Gothic|Nanum+Myeongjo|Nanum+Pen+Script" rel="stylesheet">
 
 </head>
 <body class="img_back">
@@ -200,7 +200,7 @@ echo "
 ?>
     <tr><td colspan=5 style="text-align:left;">접속중인 국가: <?=onlinenation()?></td></tr>
     <tr><td colspan=5 style="text-align:left;"><?=adminMsg()?></td></tr>
-    <tr><td colspan=5 style="text-align:left;"><div>【 국가방침 】</div><div style="color:orange;"><?=nationMsg()?></div></td></tr>
+    <tr><td colspan=5 style="text-align:left;"><div>【 국가방침 】</div><div><?=nationMsg()?></div></td></tr>
     <tr><td colspan=5 style="text-align:left;">【 접속자 】<?=onlinegen()?></td></tr>
 <?php
 if ($session->userGrade >= 5) {
@@ -232,10 +232,10 @@ else if($session->userGrade == 4){
 </table>
 <table class="tb_layout bg0" style="width:1000px;">
     <tr>
-        <td width=698 height=520 colspan=2>
+        <td style='width:700px;height:520px;' colspan=2>
             <?=getMapHtml($mapTheme)?>
         </td>
-        <td width=298 rowspan=4><iframe seamless="seamless" name=commandlist src='commandlist.php' width=298 height=700 frameborder=0 marginwidth=0 marginheight=0 topmargin=0 scrolling=no></iframe></td>
+        <td style='width:300px;' rowspan=4><iframe seamless="seamless" name=commandlist src='commandlist.php' style='width:300px;height:700px;' frameborder=0 marginwidth=0 marginheight=0 topmargin=0 scrolling=no></iframe></td>
     </tr>
 <form name=form2 action=preprocessing.php method=post target=commandlist>
     <tr>

hwe/j_install.php

@@ -19,6 +19,14 @@ $allowReset = in_array('reset', $serverAcl);
 $allowFullReset = in_array('fullReset',$serverAcl);
 $allowReset |= $allowFullReset;
 
+$reserve_open = Util::getReq('reserve_open');
+if($reserve_open && $reserve_open < date('Y-m-d H:i')){
+    Json::die([
+        'result'=>false,
+        'reason'=>'현재 시간보다 이전 시간대를 예약 시간으로 지정했습니다.'
+    ]);
+}
+
 if($session->userGrade < 5 && !$allowReset){
     Json::die([
         'result'=>false,
@@ -85,7 +93,6 @@ $npcmode = (int)$_POST['npcmode'];
 $show_img_level = (int)$_POST['show_img_level'];
 $tournament_trig = (int)$_POST['tournament_trig'];
 
-$reserve_open = Util::getReq('reserve_open');
 if($reserve_open){
     $reserve_open = new \DateTime($reserve_open);
     $db = DB::db();

hwe/j_map_history.php

@@ -17,7 +17,7 @@ if(!strpos($_SERVER['HTTP_REFERER'], $url)) {
 	]);
 }
 
-if(!$year || !$month) {
+if($year === null || !$month) {
 	Json::die([
 		'result'=>false,
 		'reason'=>'year, month가 지정되지 않았습니다'

hwe/j_simulate_battle.php

@@ -0,0 +1,437 @@
+<?php
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+
+$session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
+
+$query = Util::getReq('query');
+if($query === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'입력값이 없습니다.'
+    ]);
+}
+
+$action = Util::getReq('action');
+if($action === null || !in_array($action, ['reorder', 'battle'])){
+    Json::die([
+        'result'=>false,
+        'reason'=>'원하는 동작이 지정되지 않았습니다.'
+    ]);
+}
+
+$query = Json::decode($query);
+if($query === null){
+    Json::die([
+        'result'=>false,
+        'reason'=>'올바르지 않은 JSON입니다.'
+    ]);
+}
+
+
+$defaultCheck = [
+    'required'=>[
+        'attackerGeneral', 'attackerCity', 'attackerNation',
+        'defenderGenerals', 'defenderCity', 'defenderNation',
+        'year', 'month', 'repeatCnt'
+    ],
+    'integer'=>[
+        'year','month','repeatCnt'
+    ],
+    'between'=>[
+        ['month', [1, 12]]
+    ],
+    'in'=>[
+        ['repeatCnt', [1, 1000]]
+    ],
+    'min'=>[
+        ['year', 0]
+    ],
+    'array'=>[
+        'attackerGeneral', 'attackerCity', 'attackerNation', 
+        'defenderGenerals', 'defenderCity', 'defenderNation'
+    ],
+];
+
+$v = new Validator($query);
+$v->rules($defaultCheck);
+if(!$v->validate()){
+    Json::die([
+        'result'=>false,
+        'reason'=>$v->errorStr()
+    ]);
+}
+
+$year = $query['year'];
+$month = $query['month'];
+$repeatCnt = $query['repeatCnt'];
+
+$rawAttacker = $query['attackerGeneral'];
+$rawAttacker['turntime'] = date('Y-m-d H:i:s');
+$rawAttackerCity = $query['attackerCity'];
+$rawAttackerNation = $query['attackerNation'];
+
+$defenderList = $query['defenderGenerals'];
+$rawDefenderCity = $query['defenderCity'];
+$rawDefenderNation = $query['defenderNation'];
+
+
+$generalCheck = [
+    'required'=>[
+        'no', 'name', 'nation', 'turntime', 'personal', 'special2', 'crew', 'crewtype', 'atmos', 'train', 
+        'intel', 'intel2', 'book', 'power', 'power2', 'weap', 'injury', 'leader', 'leader2', 'horse', 'item', 
+        'explevel', 'experience', 'dedication', 'level', 'gold', 'rice', 'dex0', 'dex10', 'dex20', 'dex30', 'dex40',
+        'warnum', 'killnum', 'deathnum', 'killcrew', 'deathcrew', 'recwar'
+    ],
+    'integer'=>[
+        'no', 'nation', 'personal', 'special2', 'crew', 'crewtype', 'atmos', 'train',
+        'intel', 'intel2', 'book', 'power', 'power2', 'weap', 'injury', 'leader', 'leader2', 'horse', 'item',
+        'explevel', 'experience', 'dedication', 'level', 'gold', 'rice', 'dex0', 'dex10', 'dex20', 'dex30', 'dex40',
+        'warnum', 'killnum', 'deathnum', 'killcrew', 'deathcrew'
+    ],
+    'min'=>[
+        ['no', 1],
+        ['nation', 1],
+        ['crew', 0],
+        ['intel', 0],
+        ['power', 0],
+        ['leader', 0],
+        ['experience', 0],
+        ['gold', 0],
+        ['rice', 0],
+        ['dex0', 0],
+        ['dex10', 0],
+        ['dex20', 0],
+        ['dex30', 0],
+        ['dex40', 0],
+    ],
+    'between'=>[
+        ['train', [40, GameConst::$maxTrainByWar]],
+        ['atmos', [40, GameConst::$maxAtmosByWar]],
+        ['book', [0, 26]],
+        ['weap', [0, 26]],
+        ['horse', [0, 26]],
+        ['item', [0, 26]],
+        ['explevel', [0, 300]],
+        ['injury', [0, 80]],
+        ['level', [1, 12]]
+    ],
+    'in'=>[
+        ['personal', array_keys(getCharacterList())],
+        ['special2', array_merge(array_keys(SpecialityConst::WAR), [0])],
+        ['crewtype', array_keys(GameUnitConst::all())],
+    ]
+];
+
+$v = new Validator($rawAttacker);
+$v->rules($generalCheck);
+if(!$v->validate()){
+    Json::die([
+        'result'=>false,
+        'reason'=>'[출병자]'.$v->errorStr()
+    ]);
+}
+
+foreach($defenderList as $idx=>$rawDefenderGeneral){
+    $v = new Validator($rawDefenderGeneral);
+    $v->rules($generalCheck);
+    if(!$v->validate()){
+        $idx+=1;
+        Json::die([
+            'result'=>false,
+            'reason'=>"[수비자{$idx}]".$v->errorStr()
+        ]);
+    }
+}
+
+
+$cityCheck = [
+    'required'=>[
+        'city', 'nation', 'supply', 'name', 
+        'pop', 'agri', 'comm', 'secu', 'def', 'wall', 
+        'rate', 'level',
+        'pop2', 'agri2', 'comm2', 'secu2', 'def2', 'wall2',
+        'dead', 'state', 'gen1', 'gen2', 'gen3', 'conflict', 
+    ],
+    'numeric'=>[
+        'pop', 'agri', 'comm', 'secu', 'def', 'wall', 'rate', 'dead'
+    ],
+    'integer'=>[
+        'city', 'nation', 'supply',
+        'pop2', 'agri2', 'comm2', 'secu2', 'def2', 'wall2',
+        'state', 'gen1', 'gen2', 'gen3'
+    ],
+    'min'=>[
+        ['def', 0],
+        ['wall', 0],
+        ['rate', 0],
+        ['pop', 0],
+        ['comm', 0],
+        ['secu', 0],
+        ['city', 1],
+        ['nation', 0]
+    ],
+    'in'=>[
+        ['level', array_keys(getCityLevelList())]
+    ]
+];
+
+$v = new Validator($rawAttackerCity);
+$v->rules($cityCheck);
+if(!$v->validate()){
+    Json::die([
+        'result'=>false,
+        'reason'=>'[출병도시]'.$v->errorStr()
+    ]);
+}
+
+$v = new Validator($rawDefenderCity);
+$v->rules($cityCheck);
+if(!$v->validate()){
+    Json::die([
+        'result'=>false,
+        'reason'=>'[수비도시]'.$v->errorStr()
+    ]);
+}
+
+$nationCheck = [
+    'required'=>[
+        'type', 'tech', 'level', 'capital',
+        'nation', 'name', 'gold', 'rice', 'totaltech', 'gennum'
+    ],
+    'integer'=>[
+        'type', 'level', 'capital', 'nation', 'gennum',
+    ],
+    'numeric'=>[
+        'tech', 'gold', 'rice', 'totaltech'
+    ],
+    'min'=>[
+        ['tech', 0],
+        ['totaltech', 0],
+        ['gold', 0],
+        ['rice', 0],
+        ['gennum', 1],
+        ['gen1', 0],
+        ['gen2', 0],
+        ['gen3', 0],
+    ],
+    'in'=>[
+        ['type', array_keys(getNationTypeList())],
+        ['level', array_keys(getNationLevelList())]
+    ]
+];
+
+$v = new Validator($rawAttackerNation);
+$v->rules($nationCheck);
+if(!$v->validate()){
+    Json::die([
+        'result'=>false,
+        'reason'=>'[출병국]'.$v->errorStr()
+    ]);
+}
+
+$v = new Validator($rawDefenderNation);
+$v->rules($nationCheck);
+if(!$v->validate()){
+    Json::die([
+        'result'=>false,
+        'reason'=>'[수비국]'.$v->errorStr()
+    ]);
+}
+
+if($action == 'reorder'){
+    usort($defenderList, function($lhs, $rhs){
+        return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
+    });
+
+    $order = [];
+    foreach($defenderList as $rawDefenderGeneral){
+        $order[] = $rawDefenderGeneral['no'];
+    }
+    
+    Json::die([
+        'result'=>true,
+        'reason'=>'success',
+        'order'=>$order
+    ]);
+}
+
+usort($defenderList, function($lhs, $rhs){
+    return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
+});
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+$startYear = $gameStor->startyear;
+$cityRate = Util::round(($year - $startYear) / 1.5) + 60;
+
+
+function simulateBattle(
+    $rawAttacker, $rawAttackerCity, $rawAttackerNation, 
+    $defenderList, $rawDefenderCity, $rawDefenderNation, 
+    $startYear, $year, $month, $cityRate
+){
+    $attacker = new WarUnitGeneral($rawAttacker, $rawAttackerCity, $rawAttackerNation, true, $year, $month);
+    $city = new WarUnitCity($rawDefenderCity, $rawDefenderNation, $year, $month, $cityRate);
+
+    $iterDefender = new \ArrayIterator($defenderList);
+    $iterDefender->rewind();
+
+    $battleResult = [];
+
+    $attackerRice = $rawAttacker['rice'];
+    $defenderRice = 0;
+
+    $getNextDefender = function(?WarUnit $prevDefender, bool $reqNext) 
+        use ($iterDefender, $rawDefenderCity, $rawDefenderNation, $year, $month, &$battleResult, &$defenderRice) {
+        if($prevDefender !== null){
+            $prevDefender->getLogger()->rollback();
+            $battleResult[] = $prevDefender;
+            if($prevDefender instanceof WarUnitGeneral){
+                $defenderRice -= $prevDefender->getVar('rice');
+            }
+        }
+
+        if(!$reqNext){
+            return null;
+        }
+
+        if(!$iterDefender->valid()){
+            return null;
+        }
+
+        $rawGeneral = $iterDefender->current();
+        if(extractBattleOrder($rawGeneral) <= 0){
+            return null;
+        }
+
+        $defenderRice += $rawGeneral['rice'];
+
+        $retVal = new WarUnitGeneral($rawGeneral, $rawDefenderCity, $rawDefenderNation, false, $year, $month);
+        $iterDefender->next();
+        return $retVal;
+    };
+
+    $conquerCity = processWar_NG($attacker, $getNextDefender, $city, $year - $startYear);
+
+    $rawDefenderCity = $city->getRaw();
+    $updateAttackerNation = [];
+    $updateDefenderNation = [];
+
+    $attackerRice -= $attacker->getVar('rice');
+
+    if($city->getPhase() > 0){
+        $rice = $city->getKilled() / 100 * 0.8;
+        $rice *= $city->getCrewType()->rice;
+        $rice *= getTechCost($rawDefenderNation['tech']);
+        $rice *= $cityRate / 100 - 0.2;
+        Util::setRound($rice);
+
+        $defenderRice += $rice;
+    }
+
+    $totalDead = $attacker->getKilled() + $attacker->getDead();
+    $attackerCityDead = $totalDead * 0.4;
+    $defenderCityDead = $totalDead * 0.6;
+
+    return [$attacker, $city, $battleResult, $conquerCity, $attackerRice, $defenderRice];
+}
+
+$lastWarLog = [];
+
+$attackerKilled = 0;
+$attackerDead = 0;
+
+$attackerMaxKilled = 0;
+$attackerMinKilled = PHP_INT_MAX;
+
+$attackerMaxDead = 0;
+$attackerMinDead = PHP_INT_MAX;
+
+
+$attackerAvgRice = 0;
+$defenderAvgRice = 0;
+
+$avgPhase = 0;
+$avgWar = 0;
+
+$attackerActivatedSkills = [];
+$defendersActivatedSkills = [];
+
+foreach(range(1, $repeatCnt) as $repeatIdx){
+    [$attacker, $city, $battleResult, $conquerCity, $attackerRice, $defenderRice] = simulateBattle(
+        $rawAttacker, $rawAttackerCity, $rawAttackerNation, 
+        $defenderList, $rawDefenderCity, $rawDefenderNation, 
+        $startYear, $year, $month, $cityRate
+    );
+    $lastWarLog = Util::mapWithKey(function($key, $values){
+        return ConvertLog(join('<br>', $values));
+    }, $attacker->getLogger()->rollback()); 
+
+    $avgPhase += $attacker->getPhase() / $repeatCnt;
+
+    $killed = $attacker->getKilled();
+    $dead = $attacker->getDead();
+
+    $attackerKilled += $killed / $repeatCnt;
+    $attackerDead += $dead / $repeatCnt;
+
+    $attackerMaxKilled = max($attackerMaxKilled, $killed);
+    $attackerMinKilled = min($attackerMinKilled, $killed);
+
+    $attackerMaxDead = max($attackerMaxDead, $dead);
+    $attackerMinDead = min($attackerMinDead, $dead);
+
+    $attackerAvgRice += $attackerRice / $repeatCnt;
+    $defenderAvgRice += $defenderRice / $repeatCnt;
+
+    $avgWar += count($battleResult) / $repeatCnt;
+
+    foreach($attacker->getActivatedSkillLog() as $skillName => $skillCnt){
+        if(!key_exists($skillName, $attackerActivatedSkills)){
+            $attackerActivatedSkills[$skillName] = $skillCnt / $repeatCnt;
+        }
+        else{
+            $attackerActivatedSkills[$skillName] += $skillCnt / $repeatCnt;
+        }
+    }
+
+    foreach($battleResult as $idx=>$defender){
+        while($idx >= count($defendersActivatedSkills)){
+            $defendersActivatedSkills[] = [];
+        }
+
+        $activatedSkills = &$defendersActivatedSkills[$idx];
+        foreach($defender->getActivatedSkillLog() as $skillName => $skillCnt){
+            if(!key_exists($skillName, $activatedSkills)){
+                $activatedSkills[$skillName] = $skillCnt / $repeatCnt;
+            }
+            else{
+                $activatedSkills[$skillName] += $skillCnt / $repeatCnt;
+            }
+        }
+        
+    }
+}
+
+Json::die([
+    'result'=>true,
+    'datetime'=>$rawAttacker['turntime'],
+    'reason'=>'success',
+    'lastWarLog'=>$lastWarLog,
+    'avgWar'=>$avgWar,
+    'phase'=>$avgPhase,
+    'killed'=>$attackerKilled,
+    'maxKilled'=>$attackerMaxKilled,
+    'minKilled'=>$attackerMinKilled,
+    'dead'=>$attackerDead,
+    'maxDead'=>$attackerMaxDead,
+    'minDead'=>$attackerMinDead,
+    'attackerRice'=>$attackerAvgRice,
+    'defenderRice'=>$defenderAvgRice,
+    'attackerSkills'=>$attackerActivatedSkills,
+    'defendersSkills'=>$defendersActivatedSkills,
+]);

hwe/join.php

@@ -84,7 +84,7 @@ $nationList = $db->query('SELECT nation,`name`,color,scout,scoutmsg FROM nation
 echo getInvitationList($nationList);
 ?>
 
-<form name=form1 method=post action=join_post.php>
+<form id='join_form' name=form1 method=post action=join_post.php>
     <table align=center width=1000 class='tb_layout bg0'>
         <tr>
             <td colspan=3 align=center id=bg1>장수 생성</td>

hwe/join_post.php

@@ -155,26 +155,40 @@ $leader = $leader + $pleader;
 $power = $power + $ppower;
 $intel = $intel + $pintel;
 
+$admin = $gameStor->getValues(['scenario', 'turnterm', 'show_img_level', 'startyear', 'year']);
+$relYear = Util::valueFit($admin['year'] - $admin['startyear'], 0);
+
 $age = 20 + ($pleader + $ppower + $pintel) * 2 - (mt_rand(0, 1));
 // 아직 남았고 천재등록상태이면 특기 부여
 if ($genius) {
     $specage2 = $age;
     $special2 = getSpecial2($leader, $power, $intel);
 } else {
-    $specage2 = Util::round((80 - $age)/3) + $age;
+    $specage2 = Util::valueFit(Util::round((80 - $age)/4 - $relYear / 2), 3) + $age;
     $special2 = 0;
 }
 //내특
-$specage = Util::round((80 - $age)/12) + $age;
+$specage = Util::valueFit(Util::round((80 - $age)/12 - $relYear / 2), 3) + $age;
 $special = 0;
 
-$admin = $gameStor->getValues(['scenario', 'turnterm', 'show_img_level']);
-
 if ($admin['scenario'] >= 1000) {
     $specage2 = $age + 3;
     $specage = $age + 3;
 }
 
+if($relYear < 3){
+    $experience = 0;
+}
+else{
+    $expGenCount = $db->queryFirstField('SELECT count(*) FROM general WHERE nation != 0 AND npc < 5');
+    $targetGenOrder = Util::round($expGenCount * 0.2);
+    $experience = $db->queryFirstField(
+        'SELECT experience FROM general WHERE nation != 0 AND npc < 5 ORDER BY experience ASC LIMIT %i, 1', 
+        $targetGenOrder - 1
+    );
+    $experience *= 0.8;
+}
+
 $turntime = getRandTurn($admin['turnterm']);
 
 $lastconnect = date('Y-m-d H:i:s');
@@ -211,7 +225,7 @@ $db->insert('general', [
     'leader' => $leader,
     'power' => $power,
     'intel' => $intel,
-    'experience' => 0,
+    'experience' => $experience,
     'dedication' => 0,
     'gold' => 1000,
     'rice' => 1000,
@@ -222,6 +236,7 @@ $db->insert('general', [
     'turntime' => $turntime,
     'killturn' => 6,
     'lastconnect' => $lastconnect,
+    'crewtype'=>GameUnitConst::DEFAULT_CREWTYPE,
     'makelimit' => 0,
     'age' => $age,
     'startage' => $age,

hwe/js/battle_simulator.js

@@ -0,0 +1,817 @@
+jQuery(function($){
+
+
+    var $generalForm = $('.form_sample .general_detail');
+    var $defenderHeaderForm = $('.form_sample .card-header');
+    var $defenderColumn = $('.defender-column');
+
+    var defenderNoList = {};
+
+    var $attackerCard = $('.attacker_form');
+
+    var initBasicEvent = function(){
+
+        $('.form_injury').change(function(){
+            var $this = $(this);
+            var $general = getGeneralDetail($this);
+            var $helptext = $general.find('.injury_helptext');
+
+            var injury = parseInt($this.val());
+            //FIXME: PHP 코드와 항상 일치하도록 변경
+            var text = '건강';
+            var color = 'white';
+            if(injury > 60){
+                text = '위독';
+                color = 'red';
+            }
+            else if(injury > 40){
+                text = '심각';
+                color = 'magenta';
+            }
+            else if(injury > 20){
+                text = '중상';
+                color = 'orange';
+            }
+            else if(injury > 0){
+                text = '경상';
+                color = 'yellow';
+            }
+            $helptext.html(text).css('color', color);
+        });
+
+        $('.export_general').click(function(){
+            var $btn = $(this);
+            var $general = getGeneralDetail($btn);
+            
+            var values = exportGeneralInfo($general);
+            console.log(values);
+        });
+        $('.delete-defender').click(function(){
+            var $card = getGeneralFrame($(this));
+            deleteDefender($card);
+        });
+        $('.copy-defender').click(function(){
+            var $card = getGeneralFrame($(this));
+            copyDefender($card);
+        });
+
+        $('.add-defender').click(function(){
+            addDefender();
+        });
+
+        $('.btn-general-load').click(function(){
+            var $file = $(this).prev();
+            $file[0].click();
+        })
+
+        $('.form_load_general_file').on('change', function(e){
+            e.preventDefault();
+            var $this = $(this);
+            var $card = getGeneralFrame($this);
+
+            var files = e.target.files;
+
+            importGeneralInfoByFile(files, $card);
+            return false;
+        });
+
+        $('.btn-general-save').click(function(){
+            var $this = $(this);
+            var $general = getGeneralDetail($this);
+            var generalData = exportGeneralInfo($general);
+
+            var filename = "general_{0}.json".format(generalData.name);
+            var saveData = JSON.stringify({
+                objType:'general',
+                data:generalData
+            }, null, 4);
+
+            download(saveData, filename, 'application/json');
+        });
+
+        $('.btn-battle-load').click(function(){
+            var $file = $(this).prev();
+            $file[0].click();
+        })
+
+        $('.form_load_battle_file').on('change', function(e){
+            e.preventDefault();
+            var $this = $(this);
+            var files = e.target.files;
+
+            importBattleInfoByFile(files);
+            return false;
+        });
+
+        $('.btn-battle-save').click(function(){
+            var battleData = exportAllData();
+            var filename = "battle_{0}.json".format(moment().format('YYYYMMDD_hhmmss'));
+            var saveData = JSON.stringify({
+                objType:'battle',
+                data:battleData
+            }, null, 4);
+
+            download(saveData, filename, 'application/json');
+        })
+
+        var $generals = $('.general_detail');
+        $generals.bind('dragover dragleave', function(e) {
+            e.stopPropagation()
+            e.preventDefault()
+        })
+        $generals.bind('drop', function(e){
+            e.preventDefault();
+            var $this = $(this);
+            var $card = getGeneralFrame($this);
+
+            var files = e.originalEvent.dataTransfer.files;
+
+            importGeneralInfoByFile(files, $card);
+            return false;
+        });
+
+        var $battlePad = $('.dragpad_battle');
+        $battlePad.bind('dragover dragleave', function(e) {
+            e.stopPropagation()
+            e.preventDefault()
+        })
+        $battlePad.bind('drop', function(e){
+            e.preventDefault();
+
+            var files = e.originalEvent.dataTransfer.files;
+
+            importBattleInfoByFile(files);
+            return false;
+        });
+    }
+
+    var importGeneralInfo = function($general, data){
+        var setVal = function(query, val){
+            $general.find(query).val(val).change();
+        }
+
+        setVal('.form_general_name', data.name);
+
+        setVal('.form_general_level', data.level);
+        setVal('.form_exp_level', data.explevel);
+        setVal('.form_injury', data.injury);
+
+        setVal('.form_leadership', data.leader);
+        setVal('.form_general_horse', data.horse);
+        setVal('.form_power', data.power);
+        setVal('.form_general_weap', data.weap);
+        setVal('.form_intel', data.intel);
+        setVal('.form_general_book', data.book);
+        setVal('.form_general_item', data.item);
+
+        setVal('.form_injury', data.injury);
+
+        setVal('.form_rice', data.rice);
+
+        setVal('.form_general_character', data.personal);
+        setVal('.form_general_special_war', data.special2);
+
+        setVal('.form_crew', data.crew);
+        setVal('.form_crewtype', data.crewtype);
+        setVal('.form_atmos', data.atmos);
+        setVal('.form_train', data.train);
+
+        setVal('.form_dex0', data.dex0);
+        setVal('.form_dex10', data.dex10);
+        setVal('.form_dex20', data.dex20);
+        setVal('.form_dex30', data.dex30);
+        setVal('.form_dex40', data.dex40);
+        setVal('.form_defend_mode', data.mode);
+
+        if(!setGeneralNo($general, data.no)){
+            setGeneralNo($general, generateNewGeneralNo());
+        }
+    }
+
+    var exportGeneralInfo = function($general){
+        var getInt = function(query){
+            return parseInt($general.find(query).val());
+        }
+
+        var getVal = function(query){
+            return $general.find(query).val();
+        }
+
+        return {
+            no:getGeneralNo($general),
+            name:getVal('.form_general_name'),
+            level:getInt('.form_general_level'),
+            explevel:getInt('.form_exp_level'),
+
+            leader:getInt('.form_leadership'),
+            horse:getInt('.form_general_horse'),
+            power:getInt('.form_power'),
+            weap:getInt('.form_general_weap'),
+            intel:getInt('.form_intel'),
+            book:getInt('.form_general_book'),
+            item:getInt('.form_general_item'),
+
+            injury:getInt('.form_injury'),
+
+            rice:getInt('.form_rice'),
+
+            personal:getInt('.form_general_character'),
+            special2:getInt('.form_general_special_war'),
+
+            crew:getInt('.form_crew'),
+            crewtype:getInt('.form_crewtype'),
+            atmos:getInt('.form_atmos'),
+            train:getInt('.form_train'),
+            
+            dex0:getInt('.form_dex0'),
+            dex10:getInt('.form_dex10'),
+            dex20:getInt('.form_dex20'),
+            dex30:getInt('.form_dex30'),
+            dex40:getInt('.form_dex40'),
+            mode:getInt('.form_defend_mode'),
+        };
+    }
+
+    var importBattleInfoByFile = function(files){
+        if(files === null){
+            alert('파일 에러!');
+            return false;
+        }
+
+        if(files.length < 1){
+            alert("파일 에러!");
+            return false;
+        }
+
+
+        var file = files[0];
+        if(file.size > 1024*1024){
+            alert('파일이 너무 큽니다!');
+            return false;
+        }
+        if(file.type === ''){
+            alert('폴더를 업로드할 수 없습니다!');
+            return false;
+        }
+
+        var reader = new FileReader();
+        reader.onload = function(){
+            var battleData = {};
+            try {
+                battleData = JSON.parse(reader.result);
+            } catch(e) {
+                alert('올바르지 않은 파일 형식입니다');
+                return false;
+            }
+
+            if(!('objType' in battleData)){
+                alert('파일 형식을 확인할 수 없습니다');
+                return false;
+            }
+
+            if(battleData.objType != 'battle'){
+                alert('전투 데이터가 아닙니다');
+                return false;
+            }
+
+            importBattleInfo(battleData.data);
+            return true;
+        };
+
+        try {
+
+            reader.readAsText(file);
+        }
+        catch(e) {
+            alert('파일을 읽는데 실패했습니다.');
+            return false;
+        }
+
+        return true;
+    }
+
+    var importGeneralInfoByFile = function(files, $card){
+        if($card === undefined){
+            $card = addDefender();
+        }
+
+        if(files === null){
+            alert('파일 에러!');
+            return false;
+        }
+
+        if(files.length < 1){
+            alert("파일 에러!");
+            return false;
+        }
+
+
+        var file = files[0];
+        if(file.size > 1024*1024){
+            alert('파일이 너무 큽니다!');
+            return false;
+        }
+        if(file.type === ''){
+            alert('폴더를 업로드할 수 없습니다!');
+            return false;
+        }
+        
+        var reader = new FileReader();
+        reader.onload = function(){
+            var generalData = {};
+            try {
+                generalData = JSON.parse(reader.result);
+            } catch(e) {
+                alert('올바르지 않은 파일 형식입니다');
+                return false;
+            }
+
+            if(!('objType' in generalData)){
+                alert('파일 형식을 확인할 수 없습니다');
+                return false;
+            }
+
+            if(generalData.objType == 'battle'){
+                importBattleInfo(generalData.data);
+                return true;
+            }
+            if(generalData.objType != 'general'){
+                alert('장수 데이터가 아닙니다');
+                return false;
+            }
+
+            $card.find('.form_load_general_file').val('');
+
+            importGeneralInfo($card, generalData.data);
+            return true;
+        };
+
+        try {
+
+            reader.readAsText(file);
+        }
+        catch(e) {
+            alert('파일을 읽는데 실패했습니다.');
+            return false;
+        }
+
+        return true;
+    }
+
+    var extendGeneralInfoForDB = function(generalData){
+
+        var dbVal = {
+            nation: (generalData.no)<=1 ? 1 : 2,
+            city: (generalData.no)<=1 ? 1 : 3,
+            turntime:'2018-08-26 12:00',
+            special:0,
+            leader2:0,
+            power2:0,
+            intel2:0,
+            
+            gold:10000,
+
+            dedication:0,
+            warnum:0,
+            killnum:0,
+            deathnum:0,
+
+            killcrew:20000,
+            deathcrew:20000,
+            recwar:'SUCCESS',
+            experience:Math.pow(generalData.explevel, 2),
+        };
+
+        return $.extend({}, generalData, dbVal);
+    }
+
+    var getGeneralFrame = function($btn){
+        var $card = $btn.closest('.general_form');
+        return $card;
+    }
+
+    var getGeneralDetail = function($btn){
+        var $card = getGeneralFrame($btn);
+        var $general = $card.find('.general_detail');
+        return $general;
+    }
+
+    var getGeneralNo = function($btn){
+        return parseInt(getGeneralFrame($btn).data('general_no'));
+    }
+
+    var setGeneralNo = function($btn, value){
+        if(value == 1){
+            //1번은 무조건 공격자임
+            return false; 
+        }
+        if(value in defenderNoList){
+            return false;
+        }
+        var $card = getGeneralFrame($btn);
+        $card.data('general_no', value);
+        defenderNoList[value] = $card;
+        return true;
+    }
+
+    var generateNewGeneralNo = function(){
+        while(true){
+            var newGeneralNo = parseInt(Math.random()*(1<<24))+2;
+            if(newGeneralNo in defenderNoList){
+                continue;
+            }
+            return newGeneralNo;
+        }
+    }
+
+    var deleteGeneralNo = function($btn){
+        var $card = getGeneralFrame($btn);
+        $card.removeData('general_no');
+        var generalNo = getGeneralNo($card);
+        delete defenderNoList[generalNo];
+    }
+
+    var addDefender = function($cardAfter){
+        var $newCard = $('<div class="card mb-2 defender_form general_form"></div>');
+
+        if($cardAfter === undefined){
+            $defenderColumn.append($newCard);
+        }
+        else{
+            $cardAfter.after($newCard);
+        }
+        
+        $newCard.append($defenderHeaderForm.clone(true,true));
+        $newCard.append($generalForm.clone(true,true));
+
+        $newGeneral = getGeneralDetail($newCard);
+        setGeneralNo($newCard, generateNewGeneralNo());
+
+        return $newCard;
+    }
+
+    var deleteDefender = function($card){
+        deleteGeneralNo($card);
+        $card.detach();
+    }
+
+    var copyDefender = function($card){
+        var $general = getGeneralDetail($card);
+
+        var generalData = exportGeneralInfo($general);
+        var $newObj = addDefender($card);
+        importGeneralInfo(getGeneralDetail($newObj), generalData);
+    }
+
+    var importBattleInfo = function(battleData){
+
+        $('.form_load_battle_file').val('');
+        console.log(battleData);
+
+        var $attackerNation = $('.attacker_nation');
+        var $defenderNation = $('.defender_nation');
+
+        var attackerGeneral = battleData.attackerGeneral;
+        var attackerCity = battleData.attackerCity;
+        var attackerNation = battleData.attackerNation;
+
+        var defenderGenerals = battleData.defenderGenerals;
+        var defenderCity = battleData.defenderCity;
+        var defenderNation = battleData.defenderNation;
+
+        $('#year').val(battleData.year);
+        $('#month').val(battleData.month);
+        $('#repeat_cnt').val(battleData.repeatCnt);
+        
+        $('.delete-defender').click();
+
+        $attackerNation.find('.form_nation_type').val(attackerNation.type);
+        $attackerNation.find('.form_tech').val(Math.floor(attackerNation.tech/1000));
+        $attackerNation.find('.form_nation_level').val(attackerNation.level);
+        if(attackerNation.capital == 1){
+            $attackerNation.find('.form_is_capital:first').click();
+        }
+        else{
+            $attackerNation.find('.form_is_capital:last').click();
+        }
+        $attackerNation.find('.form_city_level').val(attackerCity.level);
+
+        importGeneralInfo($('.attacker_form'), attackerGeneral);
+
+        $defenderNation.find('.form_nation_type').val(defenderNation.type);
+        $defenderNation.find('.form_tech').val(Math.floor(defenderNation.tech/1000));
+        $defenderNation.find('.form_nation_level').val(defenderNation.level);
+        if(defenderNation.capital == 1){
+            $defenderNation.find('.form_is_capital:first').click();
+        }
+        else{
+            $defenderNation.find('.form_is_capital:last').click();
+        }
+        $defenderNation.find('.form_city_level').val(defenderCity.level);
+        $('#city_def').val(defenderCity.def);
+        $('#city_wall').val(defenderCity.wall);
+
+        $.each(defenderGenerals, function(idx, defenderGeneral){
+            var $card = addDefender();
+            importGeneralInfo($card, defenderGeneral);
+        });
+    }
+
+    var exportAllData = function(){
+        var $attackerNation = $('.attacker_nation');
+        var $defenderNation = $('.defender_nation');
+
+        var attackerGeneral = exportGeneralInfo($('.attacker_form'));
+
+        var attackerCity = {
+            level:parseInt($attackerNation.find('.form_city_level').val()),
+        };
+
+        var attackerNation = {
+            type:parseInt($attackerNation.find('.form_nation_type').val()),
+            tech:parseInt($attackerNation.find('.form_tech').val()) * 1000,
+            level:parseInt($attackerNation.find('.form_nation_level').val()),
+            capital:$attackerNation.find('.form_is_capital:checked').val()=='1'?1:2,
+        }
+
+        var defenderGenerals = $('.defender_form').map(function(){
+            return exportGeneralInfo($(this));
+        }).toArray();
+
+        var defenderCity = {
+            def: parseInt($('#city_def').val()),
+            wall: parseInt($('#city_wall').val()),
+            level:parseInt($defenderNation.find('.form_city_level').val()),
+        };
+
+        var defenderNation = {
+            type:parseInt($defenderNation.find('.form_nation_type').val()),
+            tech:parseInt($defenderNation.find('.form_tech').val()) * 1000,
+            level:parseInt($defenderNation.find('.form_nation_level').val()),
+            capital:$defenderNation.find('.form_is_capital:checked').val()=='1'?3:4,
+        }
+
+        var year = parseInt($('#year').val());
+        var month = parseInt($('#month').val());
+        var repeatCnt = parseInt($('#repeat_cnt').val());
+
+        return {
+            attackerGeneral:attackerGeneral,
+            attackerCity:attackerCity,
+            attackerNation:attackerNation,
+
+            defenderGenerals:defenderGenerals,
+            defenderCity:defenderCity,
+            defenderNation:defenderNation,
+
+            year:year,
+            month:month,
+            repeatCnt:repeatCnt,
+        };
+    }
+
+    var extendAllDataForDB = function(allData){
+        var defaultNation = {
+            nation:0,
+            name:'재야',
+            capital:0,
+            level:0,
+            gold:0,
+            rice:2000,
+            type:0,
+            tech:0,
+            totaltech:0,
+            gennum:200,
+        };
+
+        var defaultCity = {
+            nation:0,
+            supply:1,
+            name:'도시',
+            
+            pop:500000,
+            agri:10000,
+            comm:10000,
+            secu:10000,
+            def:1000,
+            wall:1000,
+            
+            rate:100,
+            
+            pop2:600000,
+            agri2:12000,
+            comm2:12000,
+            secu2:10000,
+            def2:12000,
+            wall2:12000,
+            
+            dead:0,
+
+            state:0,
+            gen1:0,
+            gen2:0,
+            gen3:0,
+
+            conflict:'{}',
+        };
+
+        var attackerNation = $.extend({}, defaultNation, allData.attackerNation);
+        attackerNation.nation = 1;
+        attackerNation.name = '출병국';
+        attackerNation.totaltech = attackerNation.tech * attackerNation.gennum;
+
+        var attackerCity = $.extend({}, defaultCity, allData.attackerCity);
+        attackerCity.nation = 1;
+        attackerCity.city = 1;
+
+        var attackerGeneral = extendGeneralInfoForDB(allData.attackerGeneral);
+        if(attackerGeneral.level == 4){
+            attackerCity.gen1 = attackerGeneral.no;
+        }
+        if(attackerGeneral.level == 3){
+            attackerCity.gen2 = attackerGeneral.no;
+        }
+        if(attackerGeneral.level == 2){
+            attackerCity.gen3 = attackerGeneral.no;
+        }
+
+        var defenderNation = $.extend({}, defaultNation, allData.defenderNation);
+        defenderNation.nation = 2;
+        defenderNation.name = '수비국';
+        defenderNation.totaltech = defenderNation.tech * defenderNation.gennum;
+
+        var defenderCity = $.extend({}, defaultCity, allData.defenderCity);
+        defenderCity.nation = 2;
+        defenderCity.city = 3;
+        defenderCity.wall2 = defenderCity.wall/5*6;
+        defenderCity.def2 = defenderCity.def/5*6;
+
+        var defenderGenerals = [];
+        $.each(allData.defenderGenerals, function(){
+            var defenderGeneral = extendGeneralInfoForDB(this);
+            if(defenderGeneral.level == 4){
+                defenderCity.gen1 = defenderGeneral.no;
+            }
+            if(defenderGeneral.level == 3){
+                defenderCity.gen2 = defenderGeneral.no;
+            }
+            if(defenderGeneral.level == 2){
+                defenderCity.gen3 = defenderGeneral.no;
+            }
+
+            defenderGenerals.push(defenderGeneral);
+        });
+
+
+        return $.extend({}, allData, {
+            attackerGeneral:attackerGeneral,
+            attackerCity:attackerCity,
+            attackerNation:attackerNation,
+
+            defenderGenerals:defenderGenerals,
+            defenderCity:defenderCity,
+            defenderNation:defenderNation,
+        });
+    }
+
+    var parseSkillCount = function(skills){
+        var result = [];
+        $.each(skills, function(key, value){
+            result.push("{0}({1}회)".format(key, toPretty(value)));
+        })
+
+        if(result.length == 0){
+            return '-';
+        }
+        return result.join(', ');
+    }
+
+    var toPretty = function(number){
+        if(isInt(number)){
+            number = parseInt(number);
+        }
+        else{
+            number = parseFloat(number).toFixed(2);
+        }
+        return numberWithCommas(number);
+    }
+
+    var showBattleResult = function(result){
+        $('#result_datetime').html(result.datetime);
+        $('#result_warcnt').html(toPretty(result.avgWar));
+        $('#result_phase').html(toPretty(result.phase));
+        $('#result_killed').html(toPretty(result.killed));
+        if(result.minKilled != result.maxKilled){
+            $('#result_maxKilled').html(toPretty(result.maxKilled));
+            $('#result_minKilled').html(toPretty(result.minKilled));
+            $('#result_varKilled').show();
+        }
+        else{
+            $('#result_varKilled').hide();
+        }
+        $('#result_dead').html(toPretty(result.dead));
+        if(result.minDead != result.maxDead){
+            $('#result_maxDead').html(toPretty(result.maxDead));
+            $('#result_minDead').html(toPretty(result.minDead));
+            $('#result_varDead').show();
+        }
+        else{
+            $('#result_varDead').hide();
+        }
+        
+        $('#result_attackerRice').html(toPretty(result.attackerRice));
+        $('#result_defenderRice').html(toPretty(result.defenderRice));
+        $('#result_attackerSkills').html(parseSkillCount(result.attackerSkills));
+        
+        $('.result_defenderSkills').detach();
+
+        var $summary = $('#battle_result_summary');
+
+        $.each(result.defendersSkills, function(idx, defenderSkills){
+            console.log(defenderSkills);
+            var $result = $("<tr class='result_defenderSkills'><th>수비자{0} 스킬</th><td></td></tr>".format(idx + 1));
+            $result.find('td').html(parseSkillCount(defenderSkills));
+            $summary.append($result);
+        });
+
+        $('#generalBattleResultLog').html(result.lastWarLog.generalBattleResultLog);
+        $('#generalBattleDetailLog').html(result.lastWarLog.generalBattleDetailLog);
+
+    }
+
+    var beginBattle = function(){
+        var data = extendAllDataForDB(exportAllData());
+        console.log(data);
+        $.ajax({
+            type:'post',
+            url:'j_simulate_battle.php',
+            dataType:'json',
+            data:{
+                action:'battle',
+                query:JSON.stringify(data),
+            }
+        }).then(function(result){
+            console.log(result);
+            if(!result.result){
+                alert(result.reason);
+                return;
+            }
+            showBattleResult(result);
+            
+        }, function(result){
+            alert('전투 개시 실패!');
+        });
+    }
+
+
+    var reorderDefender = function(defenderOrder){
+        $.each(defenderOrder, function(idx, generalNo){
+
+            if(!(generalNo in defenderNoList)){
+                //음..?
+                alert("{0}이 수비자 리스트에 없습니다. 버그인 듯 합니다.".format(generalNo));
+                return true;
+            }
+
+            var $defenderObj = defenderNoList[generalNo];
+            $defenderObj.detach();
+            $defenderColumn.append($defenderObj);
+        })
+    }
+
+    var requestReorderDefender = function(){
+        var data = extendAllDataForDB(exportAllData());
+        console.log(data);
+        $.ajax({
+            type:'post',
+            url:'j_simulate_battle.php',
+            dataType:'json',
+            data:{
+                action:'reorder',
+                query:JSON.stringify(data),
+            }
+        }).then(function(result){
+            console.log(result);
+            if(!result.result){
+                alert(result.reason);
+                return;
+            }
+            reorderDefender(result.order);
+            
+        }, function(result){
+            alert('재정렬 실패!');
+        });
+    }
+
+    initBasicEvent();
+    $attackerCard.append($generalForm.clone(true,true));
+    addDefender();
+    
+    $('.btn-begin_battle').click(function(){
+        beginBattle();
+    });
+
+    $('.btn-reorder_defender').click(function(){
+        requestReorderDefender();
+    })
+});

hwe/js/common.js

@@ -23,6 +23,14 @@ var escapeHtml = (function (string) {
     }
 })();
 
+/**
+ * 변수가 정수인지 확인하는 함수
+ * @param {*} n 정수인지 확인하기 위한 인자
+ * @return {boolean} 정수인지 여부
+ */
+function isInt(n) {
+    return +n === n && !(n % 1);
+}
 
 /**
  * object의 array를 id를 key로 삼는 object로 재 변환
@@ -89,6 +97,11 @@ function convColorValue(color) {
 
 }
 
+
+function numberWithCommas(x) {
+    return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+}
+
 /**
  * 단순한 Template 함수.  <%변수명%>으로 template 가능
  * @see  https://github.com/krasimir/absurd/blob/master/lib/processors/html/helpers/TemplateEngine.js
@@ -137,4 +150,11 @@ jQuery(function($){
         },
         html:true
     });
+
+    var customCSS = localStorage.getItem('sam_customCSS');
+    if(customCSS){
+        var $style = $('<style type="text/css"></style>');
+        $style.text(customCSS); 
+        $style.appendTo($('head'));
+    }
 });

hwe/js/dipcenter.js

@@ -0,0 +1,75 @@
+
+
+
+
+jQuery(function($){
+
+    function guiEditorInit($obj, editable){
+    var $submitBtn = $obj.find('.submit');
+    var $noticeInput = $obj.find('.input_form');
+    var $editForm = $obj.find('.edit_form');
+    var $cancelEdit = $obj.find('.cancel_edit');
+
+    var editMode = false;
+
+    function enableEditor(){
+        editMode = true;
+        $cancelEdit.show();
+        $editForm.removeClass('viewer').summernote({
+            minHeight:200,
+            maxHeight:null,
+            focus:true,
+            lang:'ko-KR',
+            toolbar: [
+                // [groupName, [list of button]]
+                ['do', ['undo', 'redo']],
+                ['style', ['bold', 'italic', 'underline', 'clear']],
+                ['font2', ['fontname', 'fontsize']],
+                ['font', ['strikethrough', 'superscript', 'subscript']],
+                ['color', ['color']],
+                ['in', ['picture', 'link', 'video', 'table', 'hr']],
+                ['para', ['ul', 'ol', 'paragraph']],
+                ['height', ['height', 'codeview']]
+            ],
+            fontNames: ['맑은 고딕', 'Nanum Gothic', 'Nanum Myeongjo', 'Nanum Pen Script', '굴림', '굴림체', '바탕', '바탕체', '궁서', '궁서체'],
+            fontSizes: ['8', '9', '10', '11', '12', '14', '16', '20', '24', '28', '32', '36', '40', '46', '52', '60'],
+
+        }).summernote('code', $noticeInput.val());
+    }
+
+    function disableEditor(){
+        editMode = false;
+        $editForm.summernote('destroy');
+        $cancelEdit.hide();
+        $editForm.html($noticeInput.val()).addClass('viewer');
+    }
+
+    $cancelEdit.hide();
+    $editForm.html($noticeInput.val());
+    if(editable){
+        $submitBtn.prop('disabled', false);
+    }
+    else{
+        $submitBtn.prop('disabled', true);
+    }
+
+    $submitBtn.click(function(e){
+        if(!editMode){
+            e.preventDefault();
+            enableEditor();
+            return false;
+        }
+        $noticeInput.val($editForm.summernote('code'));
+    });
+
+    $cancelEdit.click(function(e){
+        e.preventDefault();
+        disableEditor();
+    });
+
+}
+
+guiEditorInit($('#noticeForm'), editable);
+guiEditorInit($('#scoutMsgForm'), editable);
+
+})

hwe/js/ext.kingdoms.js

@@ -10,7 +10,7 @@ $(function(){
     var getUserType = function(통,무,지){
         var 총 = 통+무+지;
         if(통 < 40){
-            if(무+지 < 통){
+            if(무+지 < 40){
                 return "무능";
             }
             return "무지";
@@ -28,6 +28,9 @@ $(function(){
         if(지 >= 60 && 무 < 지*0.8){
             return "지";
         }
+        if(통 >= 60 && 무 + 지 < 통){
+            return "통";
+        }
 
         
 
@@ -83,6 +86,7 @@ $(function(){
                     if(!(국가 in 국가별)){
                         국가별[국가] = {};
                         국가별[국가].만능 = [];
+                        국가별[국가].통 = [];
                         국가별[국가].무 = [];
                         국가별[국가].지 = [];
                         국가별[국가].평범 = [];

hwe/js/ext.plugin_troop.js

@@ -8,94 +8,8 @@ $(function(){
     
     var $userFrame;
     
-    window.groupList = groupList;
     window.userList = userList;
     
-    var aGroup = {};
-    
-    $('#troop_list tbody > tr').each(function(idx){
-        var $this = $(this);
-        //console.log(this);
-        //console.log($this);
-        if(idx%3 == 0){
-            aGroup = {
-                turn : '77:77',
-                turnTime : 5555,
-                부대장 : '에러-집합장없음',
-                부대명 : '에러-부대명없음',
-                srclist : [],
-                도시 : '없지롱',
-                list: [],
-                trs:[]
-            };
-            
-            aGroup.trs.push($this);
-            var $children = $this.children();
-            var names = $.trim($children.eq(1).text()).split('【');
-            var 부대명 = $.trim(names[0]);
-            var 도시 = $.trim(names[1].substr(0,names[1].length-1));
-            
-            aGroup.도시 = 도시;
-            aGroup.부대명 = 부대명;
-            
-            aGroup.obj = $this;
-            aGroup.$users = $children.eq(3);
-            
-            var lists = $.trim($children.eq(3).text()).split(', ');
-            lists.pop();
-            aGroup.srcList = lists;
-        }
-        else if(idx%3 == 1){
-            aGroup.trs.push($this);
-            var turnBase = $this.children().eq(0).text().split('】')[1];
-            //console.log(turnBase);
-            var userName = $this.children().eq(1).text();
-            
-            var turn = turnBase;
-            
-            var turnMS = turnBase.split(':');
-            var turnM = parseInt(turnMS[0]);
-            var turnS = parseInt(turnMS[1]);
-            var turnTime = turnM*60+turnS;
-            
-            aGroup.turn = turn;
-            aGroup.turnTime = turnTime;
-            aGroup.부대장 = userName;
-            aGroup.obj2 = $this;
-            
-            groupList[aGroup.부대명] = aGroup;
-            tGroup.push(aGroup);
-        }
-        else{
-            if($this.find('input').length==0){
-                $this.detach();
-            }
-        }
-    });
-    
-    $.each(tGroup,function(idx,val){
-        console.log(val);
-        for(var i=0;i<val.trs.length;i++){
-            val.trs[i].detach();
-        }
-    });
-    tGroup.sort(function(lhs,rhs){
-        return lhs.turnTime-rhs.turnTime;
-    });
-    
-    var $last = $('table:eq(1) tr:eq(-1)');
-    var $tbody = $('table:eq(1) tbody');
-    $last.detach();
-    console.log($last);
-    $.each(tGroup,function(idx,val){
-        for(var i=0;i<val.trs.length;i++){
-            $tbody.append(val.trs[i]);
-        }
-        $tbody.append('<tr><td colspan="5"></td></tr>');
-    });
-    $tbody.find('tr:eq(-1)').detach();
-    $tbody.append($last);
-    
     var runAnalysis = function(){
         $.each(groupList,function(idx,val){
             val.list = [];
@@ -111,19 +25,15 @@ $(function(){
                 
                 var tmpUsers = {};
                 $html.each(function(idx){
-                    if(this.tagName == "TABLE"){
-                        cnt+=1;
-                        if(cnt==2){
+                    var $this = $(this);
+                    if($this.attr('id') == "general_list"){
                         tmpUsers = $(this);
                         return false;
                     }
-                    }
                 });
                 
                 tmpUsers.find("tbody > tr").each(function(idx){
                     var $this = $(this);
-                    
-                    
                     var $부대 = $this.children('.i_troop');
                     
                     var 부대 = $.trim($부대.text());
@@ -134,73 +44,27 @@ $(function(){
                     }
                     $부대.remove();
                     
-                    var $name = $this.children('.i_name');
-                    $name.addClass('nameplate');
-    
-                    var name = $name.find('.t_name').text();
-                    
-                    var $도시 = $this.children('.i_city');
-                    var 도시 = $.trim($도시.text());
-                    
-                    var $턴 = $this.children('.i_action');
-                    //console.log($턴);
-                    var 턴0 = $턴.text().split(':');
-                    var 턴 = parseInt(턴0[0])*60 + parseInt(턴0[1]);
-                    
-                    var userInfo = {
-                        이름 : name,
-                        부대 : 부대,
-                        도시 : 도시,
-                        턴 : 턴,
-                        obj : $this
-                    };
-                    
-    
-                    
-                    groupList[부대].list.push(userInfo);
-                    userList[name] = userInfo;
+                    var generalID = parseInt($this.data('general-id'));
+                    userList[generalID] = $this;
                     $this.hide();
                     $content.append($this);
-                    
                 });
                 
-                
-                $.each(groupList,function(부대명,aGroup){
-                    aGroup.$users.html('');
-                    
-                    $.each(aGroup.list,function(idx,userInfo){
-                        var $user = $('<span><span class="name"></span><span class="other"></span></span>');
-                        var $userName = $user.children('.name');
-                        if(userInfo.이름 == aGroup.부대장){
-                            $userName.html('*'+userInfo.이름+'*');
-                            $userName.css('color','lightgreen');
-                        }
-                        else{
-                            $userName.html(userInfo.이름);
-                        }
-                        
-                        if(userInfo.도시 != aGroup.도시){
-                            $userName.css('color','red');
-                            $user.children('.other').html('【'+userInfo.도시+'】');
-                        }
-                        
-                        $user.hover(function(){
-                            var top = aGroup.obj2.offset().top + aGroup.obj2.outerHeight();
+                $('.troopUser').hover(function(){
+                    var $this = $(this);
+                    var parent = $this.closest('tr');
+                    var generalID = parseInt($this.data('general-id'));
+                    console.log(generalID);
+                    var top = parent.offset().top + parent.outerHeight();
                     $userFrame.css('top',top);
-                            userInfo.obj.show();
+                    userList[generalID].show();
                     $userFrame.show();
-                            console.log('올림!'+userInfo.이름);
                 },function(){
+                    var $this = $(this);
+                    var parent = $this.closest('tr');
+                    var generalID = parseInt($this.data('general-id'));
+                    userList[generalID].hide();
                     $userFrame.hide();
-                            userInfo.obj.hide();
-                            console.log('내림!'+userInfo.이름);
-                        });
-                        
-                        $user.append(', ');
-                        aGroup.$users.append($user);
-                    });
-                    
-                    aGroup.$users.append('('+aGroup.list.length+'명)');
                 });
             }
             catch(err){
@@ -223,24 +87,26 @@ $(function(){
     
     
     
-    $userFrame = $('<div id="on_mover" style="position:absolute;">'+
-        '<table class="tb_layout bg0" style="width:100%;"><thead><tr>'+
-        '<td width="98" align="center" class="bg1">이 름</td>'+
-        '<td width="98" align="center" class="bg1"">통무지</td>'+
-        '<td width="58" align="center" class="bg1">자 금</td>'+
-        '<td width="58" align="center" class="bg1">군 량</td>'+
-        '<td width="48" align="center" class="bg1">도시</td>'+
-        '<td width="28" align="center" class="bg1">守</td>'+
-        '<td width="58" align="center" class="bg1">병 종</td>'+
-        '<td width="68" align="center" class="bg1">병 사</td>'+
-        '<td width="48" align="center" class="bg1">훈련</td>'+
-        '<td width="48" align="center" class="bg1">사기</td>'+
-        '<td width="148" align="center" class="bg1">명 령</td>'+
-        '<td width="58" align="center" class="bg1">삭턴</td>'+
-        '<td width="58" align="center" class="bg1">턴</td>'+
-    '</tr></thead><tbody class="content"></tbody></table></div>');
+    $userFrame = $("<div id='on_mover' style='position:absolute;'>"+
+        "<table class='tb_layout bg0' style='width:100%;'><thead>"+
+        "<tr>"+
+            "<td width=98 class='bg1 center'>이 름</td>"+
+            "<td width=98 class='bg1 center'>통무지</td>"+
+            "<td width=53 class='bg1 center'>자 금</td>"+
+            "<td width=53 class='bg1 center'>군 량</td>"+
+            "<td width=48 class='bg1 center'>도시</td>"+
+            "<td width=28 class='bg1 center'>守</td>"+
+            "<td width=58 class='bg1 center'>병 종</td>"+
+            "<td width=63 class='bg1 center'>병 사</td>"+
+            "<td width=38 class='bg1 center'>훈련</td>"+
+            "<td width=38 class='bg1 center'>사기</td>"+
+            "<td width=213 class='bg1 center'>명 령</td>"+
+            "<td width=38 class='bg1 center'>삭턴</td>"+
+            "<td width=48 class='bg1 center'>턴</td>"+
+        "</tr>"+
+    "</thead></thead><tbody class='content'></tbody></table></div>");
     $userFrame.find('thead td');
-    $userFrame.css('width','900px').css('margin','0').css('padding','0').css('left','50%').css('margin-left','-450px');
+    $userFrame.css('width','960px').css('margin','0').css('padding','0').css('left','50%').css('margin-left','-480px');
     $userFrame.hide();
     
     

hwe/js/join.js

@@ -163,4 +163,14 @@ jQuery(function($){
             $charInfoText.html('');
         }
     });
+
+    $('#join_form').submit(function(){
+        var currentStatTotal = parseInt($leader.val()) + parseInt($power.val()) + parseInt($intel.val());
+        if(currentStatTotal < defaultStatTotal){
+            if(!confirm('현재 능력치 총합은 {0}으로, {1}보다 낮습니다. 장수 생성을 진행할까요?'.format(currentStatTotal, defaultStatTotal))){
+                return false;
+            }
+        }
+        return true;
+    });
 });

hwe/js/map.js

@@ -143,37 +143,6 @@ function reloadWorldMap(option){
         var myCity = obj.myCity;
         var myNation = obj.myNation;
 
-        function formatCityInfo(city) {
-            var region_str = '';
-            var level_str = '';
-            switch(city.region) {
-                case 1: region_str = "【하북|"; break;
-                case 2: region_str = "【중원|"; break;
-                case 3: region_str = "【서북|"; break;
-                case 4: region_str = "【서촉|"; break;
-                case 5: region_str = "【남중|"; break;
-                case 6: region_str = "【　초|"; break;
-                case 7: region_str = "【오월|"; break;
-                case 8: region_str = "【동이|"; break;
-            }
-        
-            switch(city.level) {
-                case 1: level_str = "수】"; break;
-                case 2: level_str = "진】"; break;
-                case 3: level_str = "관】"; break;
-                case 4: level_str = "이】"; break;
-                case 5: level_str = "소】"; break;
-                case 6: level_str = "중】"; break;
-                case 7: level_str = "대】"; break;
-                case 8: level_str = "특】"; break;
-            }
-
-            city.text = region_str + level_str + city.name;
-            city.region_str = region_str;
-            city.level_str = level_str;
-
-            return city;
-        }
 
         function mergePositionInfo(city){
             var id = city.id;

hwe/js/map/theme_che.js

@@ -3,3 +3,20 @@
 function getCityPosition(){
     return {"1":["업",345,130],"2":["허창",330,215],"3":["낙양",275,180],"4":["장안",145,165],"5":["성도",25,290],"6":["양양",255,290],"7":["건업",505,305],"8":["북평",465,65],"9":["남피",395,95],"10":["완",270,235],"11":["수춘",395,270],"12":["서주",440,250],"13":["강릉",245,335],"14":["장사",255,375],"15":["시상",360,360],"16":["위례",620,145],"17":["계",365,35],"18":["복양",410,170],"19":["진류",365,185],"20":["여남",330,260],"21":["하비",480,235],"22":["서량",25,50],"23":["하내",230,150],"24":["한중",135,205],"25":["상용",185,225],"26":["덕양",85,275],"27":["강주",70,310],"28":["건녕",80,400],"29":["남해",245,480],"30":["계양",230,400],"31":["오",510,345],"32":["평양",590,100],"33":["사비",605,205],"34":["계림",655,200],"35":["진양",295,60],"36":["평원",440,115],"37":["북해",470,155],"38":["초",365,230],"39":["패",430,220],"40":["천수",70,105],"41":["안정",95,145],"42":["홍농",210,175],"43":["하변",45,190],"44":["자동",75,245],"45":["영안",115,295],"46":["귀양",90,360],"47":["주시",30,345],"48":["운남",30,415],"49":["남영",135,405],"50":["교지",130,480],"51":["신야",250,260],"52":["강하",315,295],"53":["무릉",195,355],"54":["영릉",190,395],"55":["상동",210,435],"56":["여강",380,315],"57":["회계",480,395],"58":["고창",350,405],"59":["대",450,480],"60":["안평",530,80],"61":["졸본",570,65],"62":["이도",680,260],"63":["강",95,35],"64":["저",25,120],"65":["Line truncated
 }
+
+function formatCityInfo(city) {
+            
+
+    var regionMap = {"하북":1,"1":"하북","중원":2,"2":"중원","서북":3,"3":"서북","서촉":4,"4":"서촉","남중":5,"5":"남중","초":6,"6":"초","오월":7,"7":"오월","동이":8,"8":"동이"};
+
+    var levelMap = {"수":1,"1":"수","진":2,"2":"진","관":3,"3":"관","이":4,"4":"이","소":5,"5":"소","중":6,"6":"중","대":7,"7":"대","특":8,"8":"특"};
+    
+    var region_str = regionMap[city.region];
+    var level_str = levelMap[city.level];
+    
+    city.text = '【' + region_str + '|' + level_str + '】' + city.name;
+    city.region_str = region_str;
+    city.level_str = level_str;
+
+    return city;
+}

hwe/js/map/theme_ludo_rathowm.js

@@ -0,0 +1,22 @@
+
+
+function getCityPosition(){
+    return {"1":["구 마왕성",35,142],"2":["악의 탑",45,40],"3":["실키의 성",45,270],"4":["카스케도바우",120,276],"5":["붉은 집",70,335],"6":["케셀링크의 성",135,338],"7":["케이브리스의 성",37,384],"8":["푸른 집",59,446],"9":["한탄의 협곡",97,152],"10":["뼈의 숲",160,386],"11":["유황의 숲",72,209],"12":["카미라의 성",130,460],"13":["메이드의 묘지",102,380],"14":["갈라놓은 숲",186,472],"15":["죽음의 대지",10,320],"16":["녹의 마을",202,290],"17":["펜실 카우",297,267],"18":["샹그릴라",374,272],"19":["파리티라온",259,332],"20":["왕자의 탑",259,367],"21":["도약의 탑",265,406],"22":["일요일의 탑",324,358],"23":["탄창의 탑",331,409],"24":["라그나로크 아크",295,385],"25":["알텐누",293,482],"26":["마크",288,436],"27":["호박성",328,458],"28":["올드제스",367,444],"29":["테이브",385,406],"30":["이탈리아",375,361],"31":["나가르모르",322,322],"32":["사바사바",375,324],"33":["아담의탑",420,340],"34":["마지노 A",215,365],"35":["마지노 B",243,477],"36":["이코마",211,60],"37":["워크랜드",177,90],"38":["로렌그라드",200,126],"39":["파르나스",204,171],"40":["라보리",225,219],"41":["랑그바우",263,135],"42":["거대전함",273,21],"43":["세미타포",268,174],"44":["스도리 17",296,214],"45":["스도리 13",359,217],"46":["마이크로그라드",316,166],"47":["폰",377,187],"48":["파스",286,90],"49":["큐로브",341,96],"50"Line truncated
+}
+
+function formatCityInfo(city) {
+            
+
+    var regionMap = {"호넷 마인령":1,"1":"호넷 마인령","케이브리스 마인령":2,"2":"케이브리스 마인령","카라의 숲":3,"3":"카라의 숲","샹그릴라":4,"4":"샹그릴라","제스 북부":5,"5":"제스 북부","제스 남부":6,"6":"제스 남부","헬만 서부":7,"7":"헬만 서부","헬만 동부":8,"8":"헬만 동부","리자스 남부":9,"9":"리자스 남부","리자스 북부":10,"10":"리자스 북부","JAPAN":11,"11":"JAPAN","자유도시 동부":12,"12":"자유도시 동부","자유도시 서부":13,"13":"자유도시 서부","AL교":14,"14":"AL교"};
+
+    var levelMap = {"수":1,"1":"수","진":2,"2":"진","관":3,"3":"관","이":4,"4":"이","소":5,"5":"소","중":6,"6":"중","대":7,"7":"대","특":8,"8":"특"};
+    
+    var region_str = regionMap[city.region];
+    var level_str = levelMap[city.level];
+    
+    city.text = '【' + region_str + '|' + level_str + '】' + city.name;
+    city.region_str = region_str;
+    city.level_str = level_str;
+
+    return city;
+}

hwe/js/map/theme_miniche.js

@@ -3,3 +3,20 @@
 function getCityPosition(){
     return {"1":["낙양",285,176],"2":["성도",30,285],"3":["건업",507,303],"4":["업",355,135],"5":["장안",162,173],"6":["허창",325,218],"7":["양양",259,295],"8":["시상",357,357],"9":["수춘",385,270],"10":["한중",130,218],"11":["남피",410,93],"12":["위례",618,140],"13":["북평",442,53],"14":["강릉",245,330],"15":["완",275,235],"16":["장사",258,373],"17":["오",515,340],"18":["하비",460,240],"19":["복양",412,170],"20":["웅진",615,205],"21":["강주",75,305],"22":["무도",55,191],"23":["국내",596,48],"24":["진류",370,175],"25":["계양",242,408],"26":["계림",660,195],"27":["계",386,55],"28":["무위",56,76],"29":["제남",402,132],"30":["남해",270,474],"31":["덕양",73,276],"32":["하내",295,140],"33":["상용",190,220],"34":["초",375,225],"35":["운남",45,405],"36":["대",450,470],"37":["하동",240,140],"38":["무릉",195,352],"39":["교지",136,480],"40":["단양",440,350],"41":["영안",116,282],"42":["북해",470,150],"43":["합비",420,294],"44":["이릉",188,275],"45":["건녕",85,390],"46":["강하",320,299],"47":["진양",310,75],"48":["평원",445,110],"49":["회계",485,390],"50":["천수",76,140],"51":["평양",606,97],"52":["요동",549,26],"53":["거록",355,95],"54":["여강",392,325],"55":["패",425,210],"56":["자동",62,240],"57":["광릉",478,270],"58":["장가",136,395],"59":["영릉",197,390],"60":["월수",39,349],"61":["건안",440,420],"62":["신야",245,255],"63":["탐라",614,259],"64":["상동",285,405],Line truncated
 }
+
+function formatCityInfo(city) {
+            
+
+    var regionMap = {"하북":1,"1":"하북","중원":2,"2":"중원","서북":3,"3":"서북","서촉":4,"4":"서촉","남중":5,"5":"남중","초":6,"6":"초","오월":7,"7":"오월","동이":8,"8":"동이"};
+
+    var levelMap = {"수":1,"1":"수","진":2,"2":"진","관":3,"3":"관","이":4,"4":"이","소":5,"5":"소","중":6,"6":"중","대":7,"7":"대","특":8,"8":"특"};
+    
+    var region_str = regionMap[city.region];
+    var level_str = levelMap[city.level];
+    
+    city.text = '【' + region_str + '|' + level_str + '】' + city.name;
+    city.region_str = region_str;
+    city.level_str = level_str;
+
+    return city;
+}

hwe/js/msg.js

@@ -257,6 +257,16 @@ function refreshMailboxList(obj){
             $optgroup.css('color', 'white');
         }
 
+        nation.general.sort(function(lhs, rhs){
+            if(lhs[1] < rhs[1]){
+                return -1;
+            }
+            if(lhs[1] > rhs[1]){
+                return 1;
+            }
+            return 0;
+        });
+
         $.each(nation.general, function(){
             var generalID = this[0];
             var generalName = this[1];
@@ -402,7 +412,7 @@ function activateMessageForm(){
 jQuery(function($){
 
     //tmp_template.html은 추후 msg.js에 통합될 수 있음
-    var getTemplate = $.get('js/templates/message.html',function(obj){
+    var getTemplate = $.get('js/templates/message.html?3',function(obj){
         messageTemplate = obj;
     });
 

hwe/js/myPage.js

@@ -0,0 +1,34 @@
+jQuery(function($){
+
+
+    var initCustomCSSForm = function(){
+        var lastTimeOut = null;
+        var $obj = $('#custom_css');
+        var key = 'sam_customCSS';
+
+        var text = localStorage.getItem(key);
+        if(text){
+            $obj.val(text);
+            console.log(text);
+        }
+
+        if($obj.on('change keyup paste', function(){
+            var newText = $obj.val();
+            if(text == newText){
+                return;
+            }
+            if(lastTimeOut){
+                clearTimeout(lastTimeOut);
+            }
+            $obj.css('background-color', '#222222');
+            lastTimeOut = setTimeout(function(){
+                text = $obj.val();
+                localStorage.setItem(key, text);
+                $obj.css('background-color', 'black');
+            }, 500);
+        }));
+
+    }
+
+    initCustomCSSForm();
+});

hwe/js/templates/message.html

@@ -5,9 +5,9 @@
 >
     <div class="msg_icon">
         <%if(src.icon){ %>
-            <img width='64' height='64' src="<%encodeURI(src.icon)%>">
+            <img class='generalIcon' width='64' height='64' src="<%encodeURI(src.icon)%>">
         <%} else {%>
-            <img width='64' height='64' src="<%encodeURI(defaultIcon)%>">
+            <img class='generalIcon' width='64' height='64' src="<%encodeURI(defaultIcon)%>">
         <%}%>
     </div>
     <div class="msg_body">
@@ -16,9 +16,9 @@
                 <%if(src.name == generalName){%>
                 <span class="msg_target msg_<%src.colorType%>" style="background-color:<%src.color%>;">나</span
                 ><span class="msg_from_to">▶</span
-                ><span class="msg_target msg_<%dest.colorType%>" style="background-color:<%dest.color%>;"><%e(dest.name)%>:<%e(dest.nation)%></span>
+                ><span class="msg_target msg_<%dest.colorType%>" style="background-color:<%dest.color%>;"><%e(dest.name)%>:<%dest.nation%></span>
                 <%}else{%>
-                <span class="msg_target msg_<%src.colorType%>" style="background-color:<%src.color%>;"><%e(src.name)%>:<%e(src.nation)%></span
+                <span class="msg_target msg_<%src.colorType%>" style="background-color:<%src.color%>;"><%e(src.name)%>:<%src.nation%></span
                 ><span class="msg_from_to">▶</span
                 ><span class="msg_target msg_<%dest.colorType%>" style="background-color:<%dest.color%>;">나</span>
                 <%}%>
@@ -28,13 +28,13 @@
                 <%if(src.nation_id == nationID){%>
                 <span class="msg_target msg_<%src.colorType%>" style="background-color:<%src.color%>;"><%e(src.name)%></span
                 ><span class="msg_from_to">▶</span
-                ><span class="msg_target msg_<%dest.colorType%>" style="background-color:<%dest.color%>;"><%e(dest.nation)%></span>
+                ><span class="msg_target msg_<%dest.colorType%>" style="background-color:<%dest.color%>;"><%dest.nation%></span>
                 <%}else{%>
-                <span class="msg_target msg_<%src.colorType%>" style="background-color:<%src.color%>;"><%e(src.name)%>:<%e(src.nation)%></span
+                <span class="msg_target msg_<%src.colorType%>" style="background-color:<%src.color%>;"><%e(src.name)%>:<%src.nation%></span
                 ><span class="msg_from_to"></span>
                 <%}%>
             <%} else {%>
-                <span class="msg_target msg_<%src.colorType%>" style="background-color:<%src.color%>;"><%e(src.name)%>:<%e(src.nation)%></span>
+                <span class="msg_target msg_<%src.colorType%>" style="background-color:<%src.color%>;"><%e(src.name)%>:<%src.nation%></span>
             <%} %>
             <span class="msg_time">&lt;<%e(time)%>&gt;</span>
         </div>

hwe/process_war.old.php

@@ -0,0 +1,1877 @@
+<?php
+namespace sammo;
+
+function processWar($general, $city) {
+    '@phan-var array<string,int|string|null> $general';
+
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    $connect=$db->get();
+
+    $templates = new \League\Plates\Engine(__dir__.'/templates');
+
+    $date = substr($general['turntime'],11,5);
+
+    $admin = $gameStor->getAll();
+
+    $year = $admin['year'];
+    $month = $admin['month'];
+
+    $log = [];
+    $batlog = [];
+    $batres = [];
+
+    $opplog = [];
+    $oppbatlog = [];
+    $oppbatres = [];
+
+    $alllog = [];
+    $history = [];
+
+    $deadAmount = [
+        'att'=>0,
+        'def'=>0
+    ];
+
+    $generalCrewType = GameUnitConst::byID($general['crewtype']);
+    $warphase = $generalCrewType->speed;   //병종간 페이즈 수 얻기
+
+    // 특기보정 : 돌격
+    if($general['special2'] == 60) { $warphase += 1; }
+
+    $genAtmos = 0;
+    if($general['item'] == 3) {
+        //탁주 사용
+        $genAtmos += 3;
+        $query = "update general set item=0 where no='{$general['no']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $josaUl = JosaUtil::pick(getItemName($general['item']), '을');
+        $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
+        $general['item'] = 0;
+    } elseif($general['item'] >= 14 && $general['item'] <= 16) {
+        //의적주, 두강주, 보령압주 사용
+        $genAtmos += 5;
+    } elseif($general['item'] >= 19 && $general['item'] <= 20) {
+        //춘화첩, 초선화 사용
+        $genAtmos += 7;
+    }
+    $genTrain = 0;
+    if($general['item'] == 4) {
+        //청주 사용
+        $genTrain += 3;
+        $query = "update general set item=0 where no='{$general['no']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $josaUl = JosaUtil::pick($general['item'], '을');
+        $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
+        $general['item'] = 0;
+    } elseif($general['item'] >= 12 && $general['item'] <= 13) {
+        //과실주, 이강주 사용
+        $genTrain += 5;
+    } elseif($general['item'] >= 17 && $general['item'] <= 18) {
+        //철벽서, 단결도 사용
+        $genTrain += 7;
+    }
+
+    // 우선 스케일링
+    $city['def'] *= 10;
+    $city['wall'] *= 10;
+
+    $query = "select level from city where city='{$general['city']}'";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $originCity = MYDB_fetch_array($result);
+
+    $query = "select nation,level,name,capital,tech,type from nation where nation='{$general['nation']}'";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $nation = MYDB_fetch_array($result);
+
+    setLeadershipBonus($general, $nation['level']);
+
+    $query = "select nation,level,name,rice,capital,tech,type from nation where nation='{$city['nation']}'";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $destnation = MYDB_fetch_array($result) ?: [
+        'nation'=>0,
+        'capital'=>0,
+        'level'=>0,
+        'rice'=>2000,
+        'type'=>0,
+        'tech'=>0        
+    ];
+
+    //장수수 구함
+    $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;
+    //장수수 구함
+    $query = "select no from general where nation='{$destnation['nation']}'";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $destgencount = MYDB_num_rows($result);
+    if($destgencount < GameConst::$initialNationGenLimit) $destgencount = GameConst::$initialNationGenLimit;
+
+    $genAtmosBonus = 0;   $genTrainBonus = 0;
+    $oppAtmosBonus = 0;   $oppTrainBonus = 0;
+    //공격자 수도보정
+    if($nation['capital'] == $general['city']) { $genAtmosBonus += 5; }
+    //방어자 수도보정
+    //if($destnation['capital'] == $city['city']) { $oppTrainBonus += 5; }
+    //관,진,수진 보정
+    if($city['level']       == 1) { $oppTrainBonus += 5; }   // 방어도시가 수진이면 방어자 방어보정
+    if($originCity['level'] == 2) { $genAtmosBonus += 5; }   // 출병도시가 진이면 공격자 공격보정
+    if($city['level']       == 3) { $oppTrainBonus += 5; }   // 방어도시가 관이면 방어자 방어보정
+
+    $josaRo = JosaUtil::pick($city['name'], '로');
+    $josaYi = JosaUtil::pick($general['name'], '이');
+    $alllog[] = "<C>●</>{$month}월:<D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <G><b>{$city['name']}</b></>{$josaRo} 진격합니다.";
+    $log[] = "<C>●</>{$month}월:<G><b>{$city['name']}</b></>{$josaRo} <M>진격</>합니다. <1>$date</>";
+
+    // 목표 도시내에 목표 국가 소속 장수 중, 병사가 있는 능력치합+병사수 순으로 훈,사 60, 80 이상
+    $query = "select no,name,turntime,personal,special2,crew,crewtype,atmos,train,intel,intel2,book,power,power2,weap,injury,leader,leader2,horse,item,explevel,level,rice,leader+power+intel+weap+horse+book+crew/100 as sum,dex0,dex10,dex20,dex30,dex40 from general where city='{$city['city']}' and nation='{$city['nation']}' and nation!=0 and crew>'0' and rice>round(crew/100) and ((train>=60 and atmos>=60 and mode=1) or (train>=80 and atmos>=80 and mode=2)) order by sum desc";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $opposecount = MYDB_num_rows($result);
+
+    $exp = 0;   //병사 소진 시킨 만큼
+    $opexp = 0;
+    $exp2 = 1;  //능력경험치
+    $phase = 0;
+    while($phase < $warphase) {
+        // 장수가 없어서 도시 공격하려했으나 병량없을시
+        if($opposecount == 0 && $destnation['nation'] > 0 && $destnation['rice'] <= 0 && $city['supply'] == 1) {
+            $general['train'] += 1; //훈련 상승
+            if($general['train'] > GameConst::$maxTrainByWar) { $general['train'] = GameConst::$maxTrainByWar; }
+            $query = "update general set recwar='{$general['turntime']}',train='{$general['train']}',warnum=warnum+1 where no='{$general['no']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+            $alllog[] = "<C>●</>{$month}월:병량 부족으로 <G><b>{$city['name']}</b></>의 수비병들이 <R>패퇴</>합니다.";
+            $josaUl = JosaUtil::pick($city['name'], '을');
+            $josaYi = JosaUtil::pick($general['name'], '이');
+            $history[] = "<C>●</>{$year}년 {$month}월:<M><b>【패퇴】</b></><D><b>{$destnation['name']}</b></>{$josaYi} 병량 부족으로 <G><b>{$city['name']}</b></>{$josaUl} 뺏기고 말았습니다.";
+            pushGenLog($general, $log);
+            pushGeneralPublicRecord($alllog, $year, $month);
+            pushWorldHistory($history);
+            $log = [];
+            $alllog = [];
+            $history= [];
+
+            //패퇴시 병량보충
+            $destnation['rice'] += 500;
+            $query = "update nation set rice='{$destnation['rice']}' where nation='{$destnation['nation']}'";
+            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            //내정 피폐
+            $query = "update city set agri=agri*0.5,comm=comm*0.5,secu=secu*0.5 where city='{$city['city']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+            $city = addConflict($city, $general['nation'], 1);//NOTE: 이 경우 두 국가가 분쟁 중인 경우에는 병량패퇴의 이득이 없다.
+
+            ConquerCity($admin, $general, $city, $nation, $destnation);
+            break;
+        // 장수가 없어서 도시 공격
+        } elseif($opposecount == 0) {
+            $opposeCrewType = GameUnitConst::byId(GameUnitConst::T_CASTLE);
+            $josaRo = JosaUtil::pick($generalCrewType->name, '로');
+            $josaYi = JosaUtil::pick($general['name'], '이');
+            $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>{$josaYi} {$generalCrewType->name}{$josaRo} 성벽을 공격합니다.";
+            $log[] = "<C>●</>{$generalCrewType->name}{$josaRo} 성벽을 <M>공격</>합니다.";
+
+            $general['train'] += 1; //훈련 상승
+            if($general['train'] > GameConst::$maxTrainByWar) { $general['train'] = GameConst::$maxTrainByWar; }
+            $query = "update general set recwar='{$general['turntime']}',train='{$general['train']}',warnum=warnum+1 where no='{$general['no']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+            $mykillnum = 0; $mydeathnum = 0;
+            while($phase < $warphase) {
+                $phase++;
+
+                $myAtt = $generalCrewType->getComputedAttack($general, $nation['tech']);
+                $myDef = $generalCrewType->getComputedDefence($general, $nation['tech']);
+                $cityAtt = $opposeCrewType->getComputedAttack($city, $destnation['tech']);
+                $cityDef = $opposeCrewType->getComputedDefence($city, $destnation['tech']);
+
+                // 감소할 병사 수
+                $cityCrew = GameConst::$armperphase + $myAtt - $cityDef;
+                $myCrew = GameConst::$armperphase + $cityAtt - $myDef;
+                if($cityCrew <= 0) { $cityCrew = rand() % 90 + 10; }
+                if($myCrew <= 0) { $myCrew = rand() % 90 + 10; }
+
+                //훈련 사기따라
+                $myCrew = getCrew($myCrew, $admin['city_rate']+$oppAtmosBonus, CharTrain($general['train']+$genTrain+$genTrainBonus, $general['personal']));
+                $cityCrew = getCrew($cityCrew, CharAtmos($general['atmos']+$genAtmos+$genAtmosBonus, $general['personal']), $admin['city_rate']+$oppTrainBonus);
+                //숙련도 따라
+                $genDexAtt = getGenDex($general, $general['crewtype']);
+                $genDexDef = getGenDex($general, GameUnitConst::T_CASTLE);
+                $cityCrew *= getDexLog($genDexAtt, ($admin['city_rate']-60)*7200);
+                $myCrew *= getDexLog(($admin['city_rate']-60)*7200, $genDexDef);
+
+                $cityCrew *= $generalCrewType->getAttackCoef($opposeCrewType);
+                $myCrew *= $generalCrewType->getDefenceCoef($opposeCrewType);
+
+                $avoid = 1;
+                // 병종간 특성
+                if($generalCrewType->magicCoef) {
+                    $int = Util::round(getGeneralIntel($general, true, true, true, false));
+                    $ratio2 = $int / 100 * $generalCrewType->magicCoef;
+
+                    // 특기보정 : 신산
+                    if($general['special2'] == 41) { $ratio2 += 0.2; }
+
+                    if(Util::randBool($ratio2)) {
+                        $ratio = rand() % 100; // 0~99
+                        // 특기보정 : 귀병, 신산, 환술, 신중
+                        if($general['special2'] == 40) { $ratio += 20; }
+                        if($general['special2'] == 41) { $ratio += 20; }
+                        if($general['special2'] == 42) { $ratio += 10; }
+                        if($general['special2'] == 44) { $ratio += 100; }
+                        if($ratio >= 30) {
+                            // 특기보정 : 환술, 집중
+                            if($general['special2'] == 42) { $cityCrew *= 1.3; }
+                            if($general['special2'] == 43) { $cityCrew *= 1.5; }
+                            $type = rand() % 3;
+                            switch($type) {
+                            case 0:
+                                $batlog[] = "<C>●</><D>급습</>을 <C>성공</>했다!";
+                                $cityCrew *= 1.2;
+                                break;
+                            case 1:
+                                $batlog[] = "<C>●</><D>위보</>를 <C>성공</>했다!";
+                                $cityCrew *= 1.4;
+                                break;
+                            case 2:
+                                $batlog[] = "<C>●</><D>혼란</>을 <C>성공</>했다!";
+                                $cityCrew *= 1.6;
+                                break;
+                            }
+                        } else {
+                            $type = rand() % 3;
+                            switch($type) {
+                            case 0:
+                                $batlog[] = "<C>●</><D>급습</>을 <R>실패</>했다!";
+                                $cityCrew /= 1.2;   $myCrew *= 1.2;
+                                break;
+                            case 1:
+                                $batlog[] = "<C>●</><D>위보</>를 <R>실패</>했다!";
+                                $cityCrew /= 1.4;   $myCrew *= 1.4;
+                                break;
+                            case 2:
+                                $batlog[] = "<C>●</><D>혼란</>을 <R>실패</>했다!";
+                                $cityCrew /= 1.6;   $myCrew *= 1.6;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                //군주 공격 보정 10%
+                if($general['level'] == 12) {
+                    $cityCrew = $cityCrew * 1.10;
+                //참모, 장군 공격 보정 5%
+                } elseif($general['level'] == 11 || $general['level'] == 10 || $general['level'] == 8 || $general['level'] == 6) {
+                    $cityCrew = $cityCrew * 1.05;
+                }
+                //레벨 보정
+                $cityCrew = $cityCrew * (100 + $general['explevel']/6)/100;
+
+                // 특기보정 : 공성, 기병, 돌격, 무쌍, 보병, 견고, 의술(청낭서,태평청령)
+                if($general['special2'] == 53) { $cityCrew *= 2.00; }
+                if($general['special2'] == 52) { $cityCrew *= 1.20; }
+                if($general['special2'] == 60) { $cityCrew *= 1.10; }
+                if($general['special2'] == 61) { $cityCrew *= 1.10; }
+                if($general['special2'] == 50) { $myCrew *= 0.90; }
+                if($general['special2'] == 62) { $myCrew *= 0.90; }
+                $ratio = rand() % 100; // 0 ~ 99
+                if(($general['special2'] == 73 || $general['item'] == 23 || $general['item'] == 24) && $ratio > 80 && $avoid == 1) {
+                    $batlog[] = "<C>●</><C>치료</>했다!</>";
+                    $myCrew /= 1.5; // 66%만 소모
+                    $avoid = 0;
+                }
+
+                //크리
+                $rd = rand() % 100; // 0 ~ 99
+                $ratio = $generalCrewType->getCriticalRatio($general);
+                // 특기보정 : 무쌍, 필살
+                if($general['special2'] == 61) { $ratio += 10; }
+                if($general['special2'] == 71) { $ratio += 20; }
+                if($ratio >= $rd && $avoid == 1) {
+                    $batlog[] = "<C>●</><C>필살</>공격!</>";
+                    $cityCrew = CriticalScore2($cityCrew);
+                    $avoid = 0;
+                }
+                //회피
+                $ratio = rand() % 100; // 0 ~ 99
+                $ratio2 = $generalCrewType->avoid;   //회피율
+                $ratio2 = Util::round($ratio2 * $general['train'] / 100); //훈련 반영
+                //특기보정 : 궁병
+                if($general['special2'] == 51) { $ratio2 += 20; }
+                //도구 보정 : 둔갑천서, 태평요술
+                if($general['item'] == 26 || $general['item'] == 25) { $ratio2 += 20; }
+                LogText('avoid0', [date("Ymd_His"), $generalCrewType->id, $general['train'], $ratio2]);
+                if($ratio < $ratio2 && $avoid == 1) {
+                    LogText('avoid0', true);
+                    $batlog[] = "<C>●</><C>회피</>했다!</>";
+                    $myCrew /= 5; // 20%만 소모
+                    $avoid = 0;
+                }
+
+                //랜타추가
+                $cityCrew *= (rand() % 21 + 90)/100; // 90~110%
+                $myCrew *= (rand() % 21 + 90)/100; // 90~110%
+
+                //특기보정 : 위압
+                if($general['special2'] == 63 && $phase == 1 && $general['crew'] >= 1000 && $general['atmos'] >= 90 && $general['train'] >= 90) {
+                    $batlog[] = "<C>●</>상대에게 <C>위압</>을 줬다!</>";
+                    $myCrew = 0;
+                }
+
+                $general['crew'] -= Util::round($myCrew);
+                $city['def'] -= Util::round($cityCrew);
+                $city['wall'] -= Util::round($cityCrew);
+
+                $tempMyCrew = $myCrew; $tempCityCrew = $cityCrew;
+                $tempGeneralCrew = $general['crew']; $tempCityDef = $city['def'];
+
+                if($city['wall'] <= 0) { $city['wall'] = 0; }
+
+                if($general['crew'] <= 0 && $city['def'] <= 0) {
+                    $r1 = $tempGeneralCrew / $tempMyCrew;
+                    $r2 = $tempCityDef / $tempCityCrew;
+
+                    if($r1 > $r2) {
+                        $offset = Util::round($tempCityDef*$tempMyCrew/$tempCityCrew);
+                        $myCrew += $offset;
+                        $general['crew'] -= $offset;
+                        $cityCrew += $tempCityDef;
+                        $city['def'] = 0;
+                    } else {
+                        $offset = Util::round($tempGeneralCrew*$tempCityCrew/$tempMyCrew);
+                        $cityCrew += $offset;
+                        $city['def'] -= $offset;
+                        $myCrew += $tempGeneralCrew;
+                        $general['crew'] = 0;
+                    }
+                } elseif($general['crew'] * $city['def'] <= 0) {
+                    if($city['def'] < 0) {
+                        $offset = Util::round($tempCityDef*$tempMyCrew/$tempCityCrew);
+                        $myCrew += $offset;
+                        $general['crew'] -= $offset;
+                        $cityCrew += $tempCityDef;
+                        $city['def'] = 0;
+                    }
+                    if($general['crew'] < 0) {
+                        $offset = Util::round($tempGeneralCrew*$tempCityCrew/$tempMyCrew);
+                        $cityCrew += $offset;
+                        $city['def'] -= $offset;
+                        $myCrew += $tempGeneralCrew;
+                        $general['crew'] = 0;
+                    }
+                }
+
+                $exp += $cityCrew;
+                $opexp += $myCrew;
+                $general['crew'] = Util::round($general['crew']);
+                $cityCrew = Util::round($cityCrew);
+                $myCrew = Util::round($myCrew);
+                $batlog[] = "<C>●</> $phase : <Y1>【{$general['name']}】</> <C>{$general['crew']} (-$myCrew)</> VS <C>{$city['def']} (-$cityCrew)</> <Y1>【{$city['name']}】</>";
+
+                $mykillnum += $cityCrew; $mydeathnum += $myCrew;
+
+                // 중간 쌀 체크
+                $myRice = Util::round($exp / 50);
+                // 성격 보정
+                $myRice = CharExperience($myRice, $general['personal']);
+                // 쌀 소모
+                $myRice = ($myRice * 5 * getCrewtypeRice($generalCrewType, $nation['tech']));
+                // 결과 쌀
+                $myRice = $general['rice'] - $myRice;
+
+                if($myRice <= Util::round($general['crew']/100)) { break; }
+
+                if($city['def'] <= 0) { break; }
+                if($general['crew'] <= 0) { break; }
+            }
+
+            $render_attacker = [
+                'crewtype' => mb_substr($generalCrewType->name, 0, 2),
+                'name'=> $general['name'],
+                'remain_crew' => $general['crew'],
+                'killed_crew' => -$mydeathnum
+            ];
+            $render_defender = [
+                'crewtype' => '성벽',
+                'name'=> $city['name'],
+                'remain_crew' => $city['def'],
+                'killed_crew' => -$mykillnum
+            ];
+
+            $res = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
+                'year'=>$year,
+                'month'=>$month,
+                'war_type'=>'siege',
+                'war_type_str'=>'→',
+                'me' => $render_attacker,
+                'you' => $render_defender,
+            ]));
+
+            $log[] = $res;//TODO: $log를 출력할 때 date에 대해선 숨겨야 함.
+            $batlog[] = $res;
+            $batres[] = $res;
+            $deadAmount['att'] = $deadAmount['att'] + $mydeathnum;
+            $deadAmount['def'] = $deadAmount['def'] + $mykillnum;
+
+            // 도시쌀 소모 계산
+            $opexp = Util::round($opexp / 50 * 0.8);
+            $rice = Util::round($opexp * 5 * getCrewtypeRice($opposeCrewType, 0) * ($admin['city_rate']/100 - 0.2));
+            $destnation['rice'] -= $rice;
+            if($destnation['rice'] < 0) { $destnation['rice'] = 0; }
+            $query = "update nation set rice='{$destnation['rice']}' where nation='{$destnation['nation']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+            pushAdminLog(["성벽 쌀 소모 : $rice"]);
+
+            //원래대로 스케일링
+            $city['def'] = Util::round($city['def'] / 10);
+            $city['wall'] = Util::round($city['wall'] / 10);
+            //내정 감소
+            $dec = Util::round($cityCrew / 10);
+            $city['agri'] -= $dec;
+            $city['comm'] -= $dec;
+            $city['secu'] -= $dec;
+            if($city['agri'] < 0) { $city['agri'] = 0; }
+            if($city['comm'] < 0) { $city['comm'] = 0; }
+            if($city['secu'] < 0) { $city['secu'] = 0; }
+            // 병사수 변경
+            $query = "update general set crew='{$general['crew']}',killcrew=killcrew+'$mykillnum',deathcrew=deathcrew+'$mydeathnum' where no='{$general['no']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            // 숙련도 증가
+            addGenDex($general['no'], $general['atmos'], $general['train'], $general['crewtype'], $mykillnum);
+            addGenDex($general['no'], $general['atmos'], $general['train'], GameUnitConstBase::T_CASTLE, $mydeathnum);
+            // 죽은수 기술로 누적
+            $num = Util::round($mydeathnum * 0.01);
+            // 국가보정
+            if($nation['type'] == 3 || $nation['type'] == 13)                                                                   { $num *= 1.1; }
+            if($nation['type'] == 5 || $nation['type'] == 6 || $nation['type'] == 7 || $nation['type'] == 8 || $nation['type'] == 12) { $num *= 0.9; }
+            // 부드러운 기술 제한
+            if(TechLimit($admin['startyear'], $year, $nation['tech'])) { $num = intdiv($num, 4); }
+            $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$gencount' where nation='{$nation['nation']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            // 죽은수 기술로 누적
+            $num = Util::round($mykillnum * 0.01);
+            // 국가보정
+            if($destnation['type'] == 3 || $destnation['type'] == 13){ 
+                $num *= 1.1; 
+            }
+            if($destnation['type'] == 5 || $destnation['type'] == 6 || $destnation['type'] == 7 || $destnation['type'] == 8 || $destnation['type'] == 12) {
+                $num *= 0.9;
+            }
+            // 부드러운 기술 제한
+            if(TechLimit($admin['startyear'], $year, $destnation['tech'])) { $num = intdiv($num, 4); }
+            $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$destgencount' where nation='{$destnation['nation']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            //양국 평균 기술가격
+            //$techRatio = (getTechCost($nation['tech']) + getTechCost($destnation['tech'])) / 2;
+            $techRatio = 1.0;
+            // 죽은수 도시 재정으로 누적 60%
+            $num = Util::round(($mykillnum+$mydeathnum) * 0.6 * $techRatio);
+            // 국가보정
+            if($destnation['type'] == 1)                            { $num *= 1.1; }
+            if($destnation['type'] == 9 || $destnation['type'] == 10) { $num *= 0.9; }
+            $query = "update city set dead=dead+'$num',def='{$city['def']}',wall='{$city['wall']}',agri='{$city['agri']}',comm='{$city['comm']}',secu='{$city['secu']}' where city='{$city['city']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            // 죽은수 도시 재정으로 누적 40%
+            $num = Util::round(($mykillnum+$mydeathnum) * 0.4 * $techRatio);
+            // 국가보정
+            if($nation['type'] == 1)                        { $num *= 1.1; }
+            if($nation['type'] == 9 || $nation['type'] == 10) { $num *= 0.9; }
+            $query = "update city set dead=dead+'$num' where city='{$general['city']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+            //분쟁현황에 추가
+            $city = addConflict($city, $general['nation'], $mykillnum);
+
+            // 병사 소진시 성 함락
+            if($city['def'] <= 0) {
+                $exp += 1000;
+                $exp2++;
+
+                pushGenLog($general, $log);
+                pushBatLog($general, $batlog);
+                pushBatRes($general, $batres);
+                pushGeneralPublicRecord($alllog, $year, $month);
+                pushWorldHistory($history, $year, $month);
+                $log = [];
+                $batlog = [];
+                $batres = [];
+                $alllog = [];
+                $history = [];
+
+                ConquerCity($admin, $general, $city, $nation, $destnation);
+                break;
+            // 공격 장수 병사 소진시 실패 처리
+            } elseif($general['crew'] <= 0) {
+                $josaYi = JosaUtil::pick($generalCrewType->name, '이');
+                $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 {$generalCrewType->name}{$josaYi} 퇴각했습니다.";
+                $log[] = "<C>●</>퇴각했습니다.";
+
+                $query = "update general set deathnum=deathnum+1 where no='{$general['no']}'";
+                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+                break;
+            } elseif($myRice <= Util::round($general['crew']/100)) {
+                $josaYi = JosaUtil::pick($generalCrewType->name, '이');
+                $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 {$generalCrewType->name}{$josaYi} 퇴각했습니다.";
+                $log[] = "<C>●</>군량 부족으로 퇴각합니다.";
+
+                $query = "update general set deathnum=deathnum+1 where no='{$general['no']}'";
+                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+                break;
+            }
+        // 장수 대결
+        } else {
+            $oppose = MYDB_fetch_array($result);
+            setLeadershipBonus($oppose, $destnation['level']);
+            $opposeCrewType = GameUnitConst::byId($oppose['crewtype']);
+
+            $josaYi = JosaUtil::pick($opposeCrewType->name, '이');
+            $josaWa = JosaUtil::pick($generalCrewType->name, '와');
+            $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 ".$generalCrewType->name."{$josaWa} <Y>{$oppose['name']}</>의 ".$opposeCrewType->name."{$josaYi} 대결합니다.";
+            $josaUl = JosaUtil::pick($opposeCrewType->name, '을');
+            $josaRo = JosaUtil::pick($generalCrewType->name, '로');
+            $log[] = "<C>●</>".$generalCrewType->name."{$josaRo} <Y>{$oppose['name']}</>의 ".$opposeCrewType->name."{$josaUl} <M>공격</>합니다.";
+            $josaUl = JosaUtil::pick($generalCrewType->name, '을');
+            $opplog[] = "<C>●</>".$opposeCrewType->name."{$josaRo} <Y>{$general['name']}</>의 ".$generalCrewType->name."{$josaUl} <M>수비</>합니다.";
+
+            $oppAtmos = 0;
+            if($oppose['item'] == 3) {
+                //탁주 사용
+                $oppAtmos += 3;
+                $query = "update general set item=0 where no='{$oppose['no']}'";
+                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+                $josaUl = JosaUtil::pick($oppose['item'], '을');
+                $opplog[] = "<C>●</><C>".getItemName($oppose['item'])."</>{$josaUl} 사용!";
+                $oppose['item'] = 0;
+            } elseif($oppose['item'] >= 14 && $oppose['item'] <= 16) {
+                //의적주, 두강주, 보령압주 사용
+                $oppAtmos += 5;
+            } elseif($oppose['item'] >= 19 && $oppose['item'] <= 20) {
+                //춘화첩, 초선화 사용
+                $oppAtmos += 7;
+            }
+            $oppTrain = 0;
+            if($oppose['item'] == 4) {
+                //청주 사용
+                $oppTrain += 3;
+                $query = "update general set item=0 where no='{$oppose['no']}'";
+                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+                $josaUl = JosaUtil::pick($oppose['item'], '을');
+                $opplog[] = "<C>●</><C>".getItemName($oppose['item'])."</>{$josaUl} 사용!";
+                $oppose['item'] = 0;
+            } elseif($oppose['item'] >= 12 && $oppose['item'] <= 13) {
+                //과실주, 이강주 사용
+                $oppTrain += 5;
+            } elseif($oppose['item'] >= 17 && $oppose['item'] <= 18) {
+                //철벽서, 단결도 사용
+                $oppTrain += 7;
+            }
+
+            $general['train'] += 1; //훈련 상승
+            if($general['train'] > GameConst::$maxTrainByWar) { $general['train'] = GameConst::$maxTrainByWar; }
+            $oppose['train'] += 1; //훈련 상승
+            if($oppose['train'] > GameConst::$maxTrainByWar) { $oppose['train'] = GameConst::$maxTrainByWar; }
+
+            $query = "update general set recwar='{$general['turntime']}',train='{$general['train']}',warnum=warnum+1 where no='{$general['no']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $query = "update general set recwar='{$general['turntime']}',train='{$oppose['train']}',warnum=warnum+1 where no='{$oppose['no']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+            //특기보정 : 저격(수극), 활무기저격
+            $snipe = false;
+            $snipeItem = false;
+            if(!$snipe && $general['special2'] == 70 && Util::randBool(1/3)){
+                $snipe = true;
+            }
+            if(!$snipe && in_array($general['weap'], [10, 14, 18, 22]) && Util::randBool(1/5)){
+                $snipe = true;
+            }
+            if(!$snipe && $general['item'] == 2){
+                if(Util::randBool(1/5)){
+                    $snipe = true;
+                    $snipeItem = true;
+                }
+                //수극을 사용했지만 저격 실패한 케이스도 '필요하면' 넣을 것.(밸런스)       
+                
+            }
+            if($snipe) {
+                //수극 사용
+                if($snipeItem) {
+                    $josaUl = JosaUtil::pick($general['item'], '을');
+                    $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
+                    $general['item'] = 0;
+                    $db->update('general', ['item'=>0], 'no=%i', $general['no']);
+                }
+                $log[] = "<C>●</>상대를 <C>저격</>했다!";
+                $batlog[] = "<C>●</>상대를 <C>저격</>했다!";
+                $opplog[] = "<C>●</>상대에게 <R>저격</>당했다!";
+                $oppbatlog[] = "<C>●</>상대에게 <R>저격</>당했다!";
+                // 부상
+                $oppose['injury'] += rand() % 41 + 20;   // 20 ~ 60
+                if($oppose['injury'] > 80) { $oppose['injury'] = 80; }
+            }
+            else if($snipeItem) {
+                $db->update('general', ['item'=>0], 'no=%i', $general['no']);
+                $josaYi = JosaUtil::pick($general['item'], '이');
+                $batlog[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaYi} 빗나갑니다!";
+                $general['item'] = 0;
+            }
+
+            //특기보정 : 저격(수극), 활무기저격
+            $snipe = false;
+            $snipeItem = false;
+            if(!$snipe && $oppose['special2'] == 70 && Util::randBool(1/3)){
+                $snipe = true;
+            }
+            if(!$snipe && in_array($oppose['weap'], [10, 14, 18, 22]) && Util::randBool(1/5)){
+                $snipe = true;
+            }
+            if(!$snipe && $oppose['item'] == 2){
+                if(Util::randBool(1/5)){
+                    $snipe = true;
+                    $snipeItem = true;
+                }
+                //수극을 사용했지만 저격 실패한 케이스도 '필요하면' 넣을 것.(밸런스)       
+            }
+            if($snipe) {
+                //수극 사용
+                if($snipeItem) {
+                    $josaUl = JosaUtil::pick($oppose['item'], '을');
+                    $opplog[] = "<C>●</><C>".getItemName($oppose['item'])."</>{$josaUl} 사용!";
+                    $oppose['item'] = 0;
+                    $db->update('general', ['item'=>0], 'no=%i', $oppose['no']);
+                }
+                $oppbatlog[] = "<C>●</>상대를 <C>저격</>했다!";
+                $opplog[] = "<C>●</>상대를 <C>저격</>했다!";
+                $batlog[] = "<C>●</>상대에게 <R>저격</>당했다!";
+                $log[] = "<C>●</>상대에게 <R>저격</>당했다!";
+                // 부상
+                $general['injury'] += rand() % 41 + 20;   // 20 ~ 60
+                if($general['injury'] > 80) { $general['injury'] = 80; }
+            }
+            else if($snipeItem) {
+                $db->update('general', ['item'=>0], 'no=%i', $oppose['no']);
+                $josaYi = JosaUtil::pick($oppose['item'], '이');
+                $oppbatlog[] = "<C>●</><C>".getItemName($oppose['item'])."</>{$josaYi} 빗나갑니다!";
+                $oppose['item'] = 0;
+            }
+
+            $mykillnum = 0; $mydeathnum = 0;
+            $opkillnum = 0; $opdeathnum = 0;
+            while($phase < $warphase) {
+                $phase++;
+
+                $myAtt = $generalCrewType->getComputedAttack($general, $nation['tech']);
+                $myDef = $generalCrewType->getComputedDefence($general, $nation['tech']);
+
+                $opAtt = $opposeCrewType->getComputedAttack($oppose, $destnation['tech']);
+                $opDef = $opposeCrewType->getComputedDefence($oppose, $destnation['tech']);
+                // 감소할 병사 수
+                $myCrew = GameConst::$armperphase + $opAtt - $myDef;
+                $opCrew = GameConst::$armperphase + $myAtt - $opDef;
+                if($myCrew <= 0) { $myCrew = rand() % 90 + 10; }
+                if($opCrew <= 0) { $opCrew = rand() % 90 + 10; }
+                //훈련 사기따라
+                $myCrew = getCrew($myCrew, CharAtmos($oppose['atmos']+$oppAtmos+$oppAtmosBonus, $oppose['personal']), CharTrain($general['train']+$genTrain+$genTrainBonus, $general['personal']));
+                $opCrew = getCrew($opCrew, CharAtmos($general['atmos']+$genAtmos+$genAtmosBonus, $general['personal']), CharTrain($oppose['train']+$oppTrain+$oppTrainBonus, $oppose['personal']));
+                //숙련도 따라
+                $genDexAtt = getGenDex($general, $general['crewtype']);
+                $genDexDef = getGenDex($general, $oppose['crewtype']);
+                $oppDexAtt = getGenDex($oppose, $oppose['crewtype']);
+                $oppDexDef = getGenDex($oppose, $general['crewtype']);
+                $opCrew *= getDexLog($genDexAtt, $oppDexDef);
+                $myCrew *= getDexLog($oppDexAtt, $genDexDef);
+
+                $myAvoid = 1;
+                $opAvoid = 1;
+                // 병종간 특성
+                if($generalCrewType->magicCoef) {
+                    $int = Util::round(getGeneralIntel($general, true, true, true, false));
+                    $ratio2 = $int / 100 * $generalCrewType->magicCoef;
+
+                    // 특기보정 : 신산
+                    if($general['special2'] == 41) { $ratio2 += 0.2; }
+
+                    if(Util::randBool($ratio2)) {
+                        $ratio = rand() % 100;
+                        // 특기보정 : 귀병, 신산, 환술, 신중
+                        if($general['special2'] == 40) { $ratio += 20; }
+                        if($general['special2'] == 41) { $ratio += 20; }
+                        if($general['special2'] == 42) { $ratio += 10; }
+                        if($general['special2'] == 44) { $ratio += 100; }
+                        if($ratio >= 30) {
+                            // 특기보정 : 환술, 집중
+                            if($general['special2'] == 42) { $opCrew *= 1.3; }
+                            if($general['special2'] == 43) { $opCrew *= 1.5; }
+                            $type = rand() % 5; // 0~4
+                            switch($type) {
+                            case 0:
+                                $ratio = rand() % 100;
+                                // 특기보정 : 반계
+                                if($oppose['special2'] == 45 && $ratio > 70) {
+                                    $batlog[] = "<C>●</><D>위보</>를 <R>역으로</> 당했다!";
+                                    $oppbatlog[] = "<C>●</><C>반계</>로 상대의 <D>위보</>를 되돌렸다!";
+                                    $myCrew *= 1.2;
+                                } else {
+                                    $batlog[] = "<C>●</><D>위보</>를 <C>성공</>했다!";
+                                    $oppbatlog[] = "<C>●</><D>위보</>에 당했다!";
+                                    $opCrew *= 1.2;
+                                }
+                                break;
+                            case 1:
+                                $ratio = rand() % 100;
+                                // 특기보정 : 반계
+                                if($oppose['special2'] == 45 && $ratio > 70) {
+                                    $batlog[] = "<C>●</><D>매복</>을 <R>역으로</> 당했다!";
+                                    $oppbatlog[] = "<C>●</><C>반계</>로 상대의 <D>매복</>을 되돌렸다!";
+                                    $myCrew *= 1.4;
+                                } else {
+                                    $batlog[] = "<C>●</><D>매복</>을 <C>성공</>했다!";
+                                    $oppbatlog[] = "<C>●</><D>매복</>에 당했다!";
+                                    $opCrew *= 1.4;
+                                }
+                                break;
+                            case 2:
+                                $ratio = rand() % 100;
+                                // 특기보정 : 반계
+                                if($oppose['special2'] == 45 && $ratio > 70) {
+                                    $batlog[] = "<C>●</><D>반목</>을 <R>역으로</> 당했다!";
+                                    $oppbatlog[] = "<C>●</><C>반계</>로 상대의 <D>반목</>을 되돌렸다!";
+                                    $myCrew *= 1.6;
+                                } else {
+                                    $batlog[] = "<C>●</><D>반목</>을 <C>성공</>했다!";
+                                    $oppbatlog[] = "<C>●</><D>반목</>에 당했다!";
+                                    $opCrew *= 1.6;
+                                    // 특기보정 : 반계
+                                    if($general['special2'] == 45) { $opCrew *= 2; }
+                                }
+                                break;
+                            case 3:
+                                $ratio = rand() % 100;
+                                // 특기보정 : 반계
+                                if($oppose['special2'] == 45 && $ratio > 70) {
+                                    $batlog[] = "<C>●</><D>화계</>를 <R>역으로</> 당했다!";
+                                    $oppbatlog[] = "<C>●</><C>반계</>로 상대의 <D>화계</>를 되돌렸다!";
+                                    $myCrew *= 1.8;
+                                } else {
+                                    $batlog[] = "<C>●</><D>화계</>를 <C>성공</>했다!";
+                                    $oppbatlog[] = "<C>●</><D>화계</>에 당했다!";
+                                    $opCrew *= 1.8;
+                                }
+                                break;
+                            case 4:
+                                $ratio = rand() % 100;
+                                // 특기보정 : 반계
+                                if($oppose['special2'] == 45 && $ratio > 70) {
+                                    $batlog[] = "<C>●</><D>혼란</>을 <R>역으로</> 당했다!";
+                                    $oppbatlog[] = "<C>●</><C>반계</>로 상대의 <D>혼란</>을 되돌렸다!";
+                                    $myCrew *= 2.0;
+                                } else {
+                                    $batlog[] = "<C>●</><D>혼란</>을 <C>성공</>했다!";
+                                    $oppbatlog[] = "<C>●</><D>혼란</>에 당했다!";
+                                    $opCrew *= 2.0;
+                                }
+                                break;
+                            }
+                        } else {
+                            $type = rand() % 5; // 0~4
+                            switch($type) {
+                            case 0:
+                                $batlog[] = "<C>●</><D>위보</>를 <R>실패</>했다!";
+                                $oppbatlog[] = "<C>●</><D>위보</>를 간파했다!";
+                                $opCrew /= 1.1;   $myCrew *= 1.1;
+                                break;
+                            case 1:
+                                $batlog[] = "<C>●</><D>매복</>을 <R>실패</>했다!";
+                                $oppbatlog[] = "<C>●</><D>매복</>을 간파했다!";
+                                $opCrew /= 1.2;   $myCrew *= 1.2;
+                                break;
+                            case 2:
+                                $batlog[] = "<C>●</><D>반목</>을 <R>실패</>했다!";
+                                $oppbatlog[] = "<C>●</><D>반목</>을 간파했다!";
+                                $opCrew /= 1.3;   $myCrew *= 1.3;
+                                break;
+                            case 3:
+                                $batlog[] = "<C>●</><D>화계</>를 <R>실패</>했다!";
+                                $oppbatlog[] = "<C>●</><D>화계</>를 간파했다!";
+                                $opCrew /= 1.4;   $myCrew *= 1.4;
+                                break;
+                            case 4:
+                                $batlog[] = "<C>●</><D>혼란</>을 <R>실패</>했다!";
+                                $oppbatlog[] = "<C>●</><D>혼란</>을 간파했다!";
+                                $opCrew /= 1.5;   $myCrew *= 1.5;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                // 상대 장수 병종간 특성
+                if($opposeCrewType->magicCoef) {
+                    $int = Util::round(getGeneralIntel($oppose, true, true, true, false));
+                    $ratio2 = $int / 100 * $opposeCrewType->magicCoef;
+
+                    // 특기보정 : 신산
+                    if($oppose['special2'] == 41) { $ratio2 += 0.2; }
+
+                    if(Util::randBool($ratio2)) {
+                        $ratio = rand() % 100;
+                        // 특기보정 : 귀병, 신산, 환술, 신중
+                        if($oppose['special2'] == 40) { $ratio += 20; }
+                        if($oppose['special2'] == 41) { $ratio += 20; }
+                        if($oppose['special2'] == 42) { $ratio += 10; }
+                        if($oppose['special2'] == 44) { $ratio += 100; }
+                        if($ratio >= 30) {
+                            // 특기보정 : 환술, 집중
+                            if($oppose['special2'] == 42) { $myCrew *= 1.3; }
+                            if($oppose['special2'] == 43) { $myCrew *= 1.5; }
+                            $type = rand() % 5; // 0~4
+                            switch($type) {
+                            case 0:
+                                $ratio = rand() % 100;
+                                // 특기보정 : 반계
+                                if($general['special2'] == 45 && $ratio > 70) {
+                                    $oppbatlog[] = "<C>●</><D>위보</>를 <R>역으로</> 당했다!";
+                                    $batlog[] = "<C>●</><C>반계</>로 상대의 <D>위보</>를 되돌렸다!";
+                                    $opCrew *= 1.2;
+                                } else {
+                                    $oppbatlog[] = "<C>●</><D>위보</>를 <C>성공</>했다!";
+                                    $batlog[] = "<C>●</><D>위보</>에 당했다!";
+                                    $myCrew *= 1.2;
+                                }
+                                break;
+                            case 1:
+                                $ratio = rand() % 100;
+                                // 특기보정 : 반계
+                                if($general['special2'] == 45 && $ratio > 70) {
+                                    $oppbatlog[] = "<C>●</><D>매복</>을 <R>역으로</> 당했다!";
+                                    $batlog[] = "<C>●</><C>반계</>로 상대의 <D>매복</>을 되돌렸다!";
+                                    $opCrew *= 1.4;
+                                } else {
+                                    $oppbatlog[] = "<C>●</><D>매복</>을 <C>성공</>했다!";
+                                    $batlog[] = "<C>●</><D>매복</>에 당했다!";
+                                    $myCrew *= 1.4;
+                                }
+                                break;
+                            case 2:
+                                $ratio = rand() % 100;
+                                // 특기보정 : 반계
+                                if($general['special2'] == 45 && $ratio > 70) {
+                                    $oppbatlog[] = "<C>●</><D>반목</>을 <R>역으로</> 당했다!";
+                                    $batlog[] = "<C>●</><C>반계</>로 상대의 <D>반목</>을 되돌렸다!";
+                                    $opCrew *= 1.6;
+                                } else {
+                                    $oppbatlog[] = "<C>●</><D>반목</>을 <C>성공</>했다!";
+                                    $batlog[] = "<C>●</><D>반목</>에 당했다!";
+                                    $myCrew *= 1.6;
+                                    // 특기보정 : 반계
+                                    if($oppose['special2'] == 45) { $myCrew *= 2; }
+                                }
+                                break;
+                            case 3:
+                                $ratio = rand() % 100;
+                                // 특기보정 : 반계
+                                if($general['special2'] == 45 && $ratio > 70) {
+                                    $oppbatlog[] = "<C>●</><D>화계</>를 <R>역으로</> 당했다!";
+                                    $batlog[] = "<C>●</><C>반계</>로 상대의 <D>화계</>을 되돌렸다!";
+                                    $opCrew *= 1.8;
+                                } else {
+                                    $oppbatlog[] = "<C>●</><D>화계</>를 <C>성공</>했다!";
+                                    $batlog[] = "<C>●</><D>화계</>에 당했다!";
+                                    $myCrew *= 1.8;
+                                }
+                                break;
+                            case 4:
+                                $ratio = rand() % 100;
+                                // 특기보정 : 반계
+                                if($general['special2'] == 45 && $ratio > 70) {
+                                    $oppbatlog[] = "<C>●</><D>혼란</>을 <R>역으로</> 당했다!";
+                                    $batlog[] = "<C>●</><C>반계</>로 상대의 <D>혼란</>을 되돌렸다!";
+                                    $opCrew *= 2.0;
+                                } else {
+                                    $oppbatlog[] = "<C>●</><D>혼란</>을 <C>성공</>했다!";
+                                    $batlog[] = "<C>●</><D>혼란</>에 당했다!";
+                                    $myCrew *= 2.0;
+                                }
+                                break;
+                            }
+                        } else {
+                            $type = rand() % 5; // 0~4
+                            switch($type) {
+                            case 0:
+                                $oppbatlog[] = "<C>●</><D>위보</>를 <R>실패</>했다!";
+                                $batlog[] = "<C>●</><D>위보</>를 간파했다!";
+                                $myCrew /= 1.1;   $opCrew *= 1.1;
+                                break;
+                            case 1:
+                                $oppbatlog[] = "<C>●</><D>매복</>을 <R>실패</>했다!";
+                                $batlog[] = "<C>●</><D>매복</>을 간파했다!";
+                                $myCrew /= 1.2;   $opCrew *= 1.2;
+                                break;
+                            case 2:
+                                $oppbatlog[] = "<C>●</><D>반목</>을 <R>실패</>했다!";
+                                $batlog[] = "<C>●</><D>반목</>을 간파했다!";
+                                $myCrew /= 1.3;   $opCrew *= 1.3;
+                                break;
+                            case 3:
+                                $oppbatlog[] = "<C>●</><D>화계</>를 <R>실패</>했다!";
+                                $batlog[] = "<C>●</><D>화계</>를 간파했다!";
+                                $myCrew /= 1.4;   $opCrew *= 1.4;
+                                break;
+                            case 4:
+                                $oppbatlog[] = "<C>●</><D>혼란</>을 <R>실패</>했다!";
+                                $batlog[] = "<C>●</><D>혼란</>을 간파했다!";
+                                $myCrew /= 1.5;   $opCrew *= 1.5;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                // 특기보정: 돌격
+                //XXX: 목우!!!!
+                if($oppose['crewtype'] == 43 && $general['special2'] != 60) { // 목우
+                    $r = 0;
+                    $r += $oppose['atmos'] + $oppAtmos + $oppAtmosBonus;
+                    $r += $oppose['train'] + $oppTrain + $oppTrainBonus;
+                    $ratio = rand() % 400;  // 최대 50% 저지
+                    if($ratio < $r && $opAvoid == 1) {
+                        $batlog[] = "<C>●</><R>저지</>당했다!</>";
+                        $oppbatlog[] = "<C>●</>상대를 <C>저지</>했다!</>";
+                        $opAvoid = 0;
+                        continue;
+                    }
+                }
+
+                $opCrew *= $generalCrewType->getAttackCoef($opposeCrewType);
+                $myCrew *= $generalCrewType->getDefenceCoef($opposeCrewType);
+
+                //군주 공격 보정 10%
+                if($general['level'] == 12) {
+                    $opCrew = $opCrew * 1.10;
+                //참모, 장군 공격 보정 5%
+                } elseif($general['level'] == 11 || $general['level'] == 10 || $general['level'] == 8 || $general['level'] == 6) {
+                    $opCrew = $opCrew * 1.05;
+                }
+
+                //상대장수 관직 보정
+                //군주 방어 보정 10%
+                if($oppose['level'] == 12) {
+                    $opCrew = $opCrew * 0.90;
+                //참모, 모사 방어 보정 5%
+                } elseif($oppose['level'] == 11 || $oppose['level'] == 9 || $oppose['level'] == 7 || $oppose['level'] == 5) {
+                    $opCrew = $opCrew * 0.95;
+                } elseif($oppose['level'] == 4 && $oppose['no'] == $city['gen1']) { // 태수 보정
+                    $opCrew = $opCrew * 0.95;
+                } elseif($oppose['level'] == 3 && $oppose['no'] == $city['gen2']) { // 군사 보정
+                    $opCrew = $opCrew * 0.95;
+                } elseif($oppose['level'] == 2 && $oppose['no'] == $city['gen3']) { // 시중 보정
+                    $opCrew = $opCrew * 0.95;
+                }
+
+                //레벨 보정
+                $myCrew = $myCrew * (max(1, 100 - $general['explevel']/3)/100);
+                $opCrew = $opCrew / (max(1, 100 - $general['explevel']/3)/100);
+                $myCrew = $myCrew / (max(1, 100 -  $oppose['explevel']/3)/100);
+                $opCrew = $opCrew * (max(1, 100 -  $oppose['explevel']/3)/100);
+
+                // 특기보정 : 기병, 돌격, 무쌍, 보병, 견고, 척사, 의술(청낭서, 태평청령)
+                if($general['special2'] == 52) { $opCrew *= 1.20; }
+                if($general['special2'] == 60) { $opCrew *= 1.10; }
+                if($general['special2'] == 61) { $opCrew *= 1.10; }
+                if($general['special2'] == 50) { $myCrew *= 0.90; }
+                if($general['special2'] == 62) { $myCrew *= 0.90; }
+                if($general['special2'] == 75) {
+                    if($opposeCrewType->reqCities || $opposeCrewType->reqRegions)
+                    {
+                        $opCrew *= 1.1; $myCrew *= 0.9;
+                    }
+                }
+                $ratio = rand() % 100; // 0 ~ 99
+                if(($general['special2'] == 73 || $general['item'] == 23 || $general['item'] == 24) && $ratio > 80 && $myAvoid == 1) {
+                    $batlog[] = "<C>●</><C>치료</>했다!</>";
+                    $myCrew /= 1.5; // 66%만 소모
+                    $myAvoid = 0;
+                }
+
+                // 상대 특기보정 : 기병, 무쌍, 보병, 견고, 척사, 의술(청낭서, 태평청령)
+                if($oppose['special2'] == 52) { $myCrew *= 1.10; }
+                if($oppose['special2'] == 61) { $myCrew *= 1.10; }
+                if($oppose['special2'] == 50) { $opCrew *= 0.80; }
+                if($oppose['special2'] == 62) { $myCrew *= 1.10; }
+                if($oppose['special2'] == 75) {
+                    if($generalCrewType->reqCities || $generalCrewType->reqRegions)
+                    {
+                        $myCrew *= 1.1; $opCrew *= 0.9;
+                    }
+                }
+                $ratio = rand() % 100; // 0 ~ 99
+                if(($oppose['special2'] == 73 || $oppose['item'] == 23 || $oppose['item'] == 24) && $ratio > 80 && $opAvoid == 1) {
+                    $oppbatlog[] = "<C>●</><C>치료</>했다!</>";
+                    $opCrew /= 1.5; // 66%만 소모
+                    $opAvoid = 0;
+                }
+
+                //크리
+                $rd = rand() % 100; // 0 ~ 99
+                $ratio = $generalCrewType->getCriticalRatio($general);
+                // 특기보정 : 무쌍, 필살
+                if($general['special2'] == 61) { $ratio += 10; }
+                if($general['special2'] == 71) { $ratio += 20; }
+                if($ratio >= $rd && $myAvoid == 1) {
+                    $batlog[] = "<C>●</><C>필살</>공격!</>";
+                    $oppbatlog[] = "<C>●</>상대의 <R>필살</>공격!</>";
+                    $opCrew = CriticalScore2($opCrew);
+                    $myAvoid = 0;
+
+                    // 특기보정 : 격노
+                    if($oppose['special2'] == 74) {
+                        if(rand() % 100 < 50) {
+                            $batlog[] = "<C>●</>필살 공격에 상대가 <R>격노</>했다!</>";
+                            $oppbatlog[] = "<C>●</>상대의 필살 공격에 <C>격노</>했다!</>";
+                            $myCrew = CriticalScore2($myCrew);
+                            $opAvoid = 0;
+                        }
+                    }
+                }
+                //크리
+                $rd = rand() % 100; // 0 ~ 99
+                $ratio = $opposeCrewType->getCriticalRatio($oppose);
+                // 특기보정 : 필살
+                if($oppose['special2'] == 71) { $ratio += 20; }
+                if($ratio >= $rd && $opAvoid == 1) {
+                    $oppbatlog[] = "<C>●</><C>필살</>공격!</>";
+                    $batlog[] = "<C>●</>상대의 <R>필살</>공격!</>";
+                    $myCrew = CriticalScore2($myCrew);
+                    $opAvoid = 0;
+
+                    // 특기보정 : 격노
+                    if($general['special2'] == 74) {
+                        if(rand() % 100 < 33) {
+                            $oppbatlog[] = "<C>●</>필살 공격에 상대가 <R>진노</>했다!</>";
+                            $batlog[] = "<C>●</>상대의 필살 공격에 <C>진노</>했다!</>";
+                            $opCrew = CriticalScore2($opCrew);
+                            $myAvoid = 0;
+                            $warphase++;
+                        } elseif(rand() % 100 < 33) {
+                            $oppbatlog[] = "<C>●</>필살 공격에 상대가 <R>격노</>했다!</>";
+                            $batlog[] = "<C>●</>상대의 필살 공격에 <C>격노</>했다!</>";
+                            $opCrew = CriticalScore2($opCrew);
+                            $myAvoid = 0;
+                        }
+                    }
+                }
+
+                //회피
+                $ratio = rand() % 100; // 0 ~ 99
+                $ratio2 = $generalCrewType->avoid;   //회피율
+                $ratio2 = Util::round($ratio2 * $general['train'] / 100); //훈련 반영
+                //특기보정 : 돌격, 궁병
+                if($oppose['special2'] == 60) { $ratio2 -= 100; }
+                if($general['special2'] == 51) { $ratio2 += 20; }
+                //도구 보정 : 둔갑천서, 태평요술
+                if($general['item'] == 26 || $general['item'] == 25) { $ratio2 += 20; }
+                LogText('avoid1', [date("Ymd_His"), $generalCrewType->id, $general['train'], $ratio2]);
+                if($ratio < $ratio2 && $myAvoid == 1) {
+                    // 특기보정 : 격노
+                    if($oppose['special2'] == 74 && rand() % 100 < 50) {
+                        $batlog[] = "<C>●</>회피 시도에 상대가 <R>격노</>했다!</>";
+                        $oppbatlog[] = "<C>●</>상대의 회피 시도에 <C>격노</>했다!</>";
+                        $myCrew = CriticalScore2($myCrew);
+                        $opAvoid = 0;
+                    } else {
+                        LogText('avoid1', true);
+                        $batlog[] = "<C>●</><C>회피</>했다!</>";
+                        $oppbatlog[] = "<C>●</>상대가 <R>회피</>했다!</>";
+                        $myCrew /= 5; // 20%만 소모
+                        $myAvoid = 0;
+                    }
+                }
+                //회피
+                $ratio = rand() % 100; // 0 ~ 99
+                $ratio2 = $opposeCrewType->avoid;   //회피율
+                $ratio2 = Util::round($ratio2 * $oppose['train'] / 100); //훈련 반영
+                // 특기보정 : 돌격, 궁병
+                if($general['special2'] == 60) { $ratio2 -= 100; }
+                if($oppose['special2'] == 51) { $ratio2 += 20; }
+                //도구 보정 : 둔갑천서, 태평요술
+                if($oppose['item'] == 26 || $oppose['item'] == 25) { $ratio2 += 20; }
+                LogText('avoid2', [date("Ymd_His"), $opposeCrewType->id, $oppose['train'], $ratio2]);
+                if($ratio < $ratio2 && $opAvoid == 1) {
+                    // 특기보정 : 격노
+                    if($general['special2'] == 74 && rand() % 100 < 33) {
+                        $oppbatlog[] = "<C>●</>회피 시도에 상대가 <R>진노</>했다!</>";
+                        $batlog[] = "<C>●</>상대의 회피 시도에 <C>진노</>했다!</>";
+                        $opCrew = CriticalScore2($opCrew);
+                        $myAvoid = 0;
+                        $warphase++;
+                    } elseif($general['special2'] == 74 && rand() % 100 < 33) {
+                        $oppbatlog[] = "<C>●</>회피 시도에 상대가 <R>격노</>했다!</>";
+                        $batlog[] = "<C>●</>상대의 회피 시도에 <C>격노</>했다!</>";
+                        $opCrew = CriticalScore2($opCrew);
+                        $myAvoid = 0;
+                    } else {
+                        LogText('avoid2', true);
+                        $oppbatlog[] = "<C>●</><C>회피</>했다!</>";
+                        $batlog[] = "<C>●</>상대가 <R>회피</>했다!</>";
+                        $opCrew /= 5; // 20%만 소모
+                        $opAvoid = 0;
+                    }
+                }
+
+                //랜타추가
+                $opCrew *= (rand() % 21 + 90)/100; // 90~110%
+                $myCrew *= (rand() % 21 + 90)/100; // 90~110%
+
+                //특기보정 : 위압
+                if($general['special2'] == 63 && $phase == 1 && $general['crew'] >= 1000 && $general['atmos'] >= 90 && $general['train'] >= 90) {
+                    $batlog[] = "<C>●</>상대에게 <C>위압</>을 줬다!</>";
+                    $oppbatlog[] = "<C>●</>상대에게 <R>위압</>받았다!</>";
+                    $myCrew = 0;
+                }
+                //특기보정: 위압
+                if($oppose['special2'] == 63 && $phase == 1 && $oppose['crew'] >= 1000 && $oppose['atmos'] >= 90 && $oppose['train'] >= 90) {
+                    $batlog[] = "<C>●</>상대에게 <R>위압</>받았다!</>";
+                    $oppbatlog[] = "<C>●</>상대에게 <C>위압</>을 줬다!</>";
+                    $opCrew = 0;
+                }
+
+                $general['crew'] -= Util::round($myCrew);
+                $oppose['crew'] -= Util::round($opCrew);
+                $tempMyCrew = $myCrew; $tempOpCrew = $opCrew;
+                $tempGeneralCrew = $general['crew']; $tempOpposeCrew = $oppose['crew'];
+                if($general['crew'] <= 0 && $oppose['crew'] <= 0) {
+                    $r1 = $tempGeneralCrew / $tempMyCrew;
+                    $r2 = $tempOpposeCrew / $tempOpCrew;
+
+                    if($r1 > $r2) {
+                        $offset = Util::round($tempOpposeCrew*$tempMyCrew/$tempOpCrew);
+                        $myCrew += $offset;
+                        $general['crew'] -= $offset;
+                        $opCrew += $tempOpposeCrew;
+                        $oppose['crew'] = 0;
+                    } else {
+                        $offset = Util::round($tempGeneralCrew*$tempOpCrew/$tempMyCrew);
+                        $opCrew += $offset;
+                        $oppose['crew'] -= $offset;
+                        $myCrew += $tempGeneralCrew;
+                        $general['crew'] = 0;
+                    }
+                } elseif($general['crew'] * $oppose['crew'] <= 0) {
+                    if($oppose['crew'] < 0) {
+                        $offset = Util::round($tempOpposeCrew*$tempMyCrew/$tempOpCrew);
+                        $myCrew += $offset;
+                        $general['crew'] -= $offset;
+                        $opCrew += $tempOpposeCrew;
+                        $oppose['crew'] = 0;
+                    }
+                    if($general['crew'] < 0) {
+                        $offset = Util::round($tempGeneralCrew*$tempOpCrew/$tempMyCrew);
+                        $opCrew += $offset;
+                        $oppose['crew'] -= $offset;
+                        $myCrew += $tempGeneralCrew;
+                        $general['crew'] = 0;
+                    }
+                }
+
+                $exp += $opCrew;
+                $opexp += $myCrew;
+                $general['crew'] = Util::round($general['crew']);
+                $oppose['crew'] = Util::round($oppose['crew']);
+                $myCrew = Util::round($myCrew);
+                $opCrew = Util::round($opCrew);
+                $batlog[] = "<C>●</> $phase : <Y1>【{$general['name']}】</> <C>{$general['crew']} (-$myCrew)</> VS <C>{$oppose['crew']} (-$opCrew)</> <Y1>【{$oppose['name']}】</>";
+                $oppbatlog[] = "<C>●</> $phase : <Y1>【{$oppose['name']}】</> <C>{$oppose['crew']} (-$opCrew)</> VS <C>{$general['crew']} (-$myCrew)</> <Y1>【{$general['name']}】</>";
+
+                $mykillnum += $opCrew; $mydeathnum += $myCrew;
+                $opkillnum += $myCrew; $opdeathnum += $opCrew;
+
+                // 중간 쌀 체크
+                $myRice = Util::round($exp / 50);
+                // 성격 보정
+                $myRice = CharExperience($myRice, $general['personal']);
+                // 쌀 소모
+                $myRice = ($myRice * 5 * getCrewtypeRice($generalCrewType, $nation['tech']));
+                // 결과 쌀
+                $myRice = $general['rice'] - $myRice;
+
+                // 중간 쌀 체크
+                $opRice = Util::round($opexp / 50 * 0.8);
+                // 성격 보정
+                $opRice = CharExperience($opRice, $oppose['personal']);
+                // 쌀 소모
+                $opRice = ($opRice * 5 * getCrewtypeRice($opposeCrewType, $destnation['tech']));
+                // 결과 쌀
+                $opRice = $oppose['rice'] - $opRice;
+
+                if($opRice <= Util::round($oppose['crew']/100)) { break; }
+                if($myRice <= Util::round($general['crew']/100)) { break; }
+
+                if($oppose['crew'] <= 0) { break; }
+                if($general['crew'] <= 0) { break; }
+            }
+
+            $render_attacker = [
+                'crewtype' => mb_substr($generalCrewType->name, 0, 2),
+                'name'=> $general['name'],
+                'remain_crew' => $general['crew'],
+                'killed_crew' => -$mydeathnum
+            ];
+            $render_defender = [
+                'crewtype' => mb_substr($opposeCrewType->name, 0, 2),
+                'name'=> $oppose['name'],
+                'remain_crew' => $oppose['crew'],
+                'killed_crew' => -$opdeathnum
+            ];
+
+            $res = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
+                'year'=>$year,
+                'month'=>$month,
+                'war_type'=>'attack',
+                'war_type_str'=>'→',
+                'me' => $render_attacker,
+                'you' => $render_defender,
+            ]));
+
+            $oppres = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
+                'year'=>$year,
+                'month'=>$month,
+                'war_type'=>'defense',
+                'war_type_str'=>'←',
+                'me' => $render_defender,
+                'you' => $render_attacker,
+            ]));
+
+            $log[] = $res;
+            $batlog[] = $res;
+            $batres[] = $res;
+            $opplog[] = $oppres;
+            $oppbatlog[] = $oppres;
+            $oppbatres[] = $oppres;
+
+            $deadAmount['att'] = $deadAmount['att'] + $mydeathnum;
+            $deadAmount['def'] = $deadAmount['def'] + $opdeathnum;
+
+            // 상대장수 부상
+            $ratio = rand() % 100;
+            if($ratio >= 95) {
+                $opplog[] = "<C>●</>전투중 <R>부상</>당했다!";
+                $oppose['injury'] += rand() % 71 + 10;   // 10 ~ 80
+                if($oppose['injury'] > 80) { $oppose['injury'] = 80; }
+            }
+            // 병사수 변경
+            $query = "update general set injury='{$oppose['injury']}',crew='{$oppose['crew']}',killcrew=killcrew+'$opkillnum',deathcrew=deathcrew+'$opdeathnum' where no='{$oppose['no']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            // 숙련도 증가
+            addGenDex($oppose['no'], $general['atmos'], $general['train'], $oppose['crewtype'], $opkillnum * 0.9);
+            addGenDex($oppose['no'], $general['atmos'], $general['train'], $general['crewtype'], $opdeathnum * 0.9);
+            // 죽은수 기술로 누적
+            $num = Util::round($mydeathnum * 0.01);
+            // 국가보정
+            if($nation['type'] == 3 || $nation['type'] == 13)                                                                   { $num *= 1.1; }
+            if($nation['type'] == 5 || $nation['type'] == 6 || $nation['type'] == 7 || $nation['type'] == 8 || $nation['type'] == 12) { $num *= 0.9; }
+            // 부드러운 기술 제한
+            if(TechLimit($admin['startyear'], $year, $nation['tech'])) { $num = intdiv($num, 4); }
+            $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$gencount' where nation='{$nation['nation']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+            // 장수 부상
+            $ratio = rand() % 100;
+            if($ratio >= 95) {
+                $log[] = "<C>●</>전투중 <R>부상</>당했다!";
+                $general['injury'] += rand() % 71 + 10;   // 10 ~ 80
+                if($general['injury'] > 80) { $general['injury'] = 80; }
+            }
+            // 병사수 변경
+            $query = "update general set injury='{$general['injury']}',crew='{$general['crew']}',killcrew=killcrew+'$mykillnum',deathcrew=deathcrew+'$mydeathnum' where no='{$general['no']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            // 숙련도 증가
+            addGenDex($general['no'], $general['atmos'], $general['train'], $general['crewtype'], $mykillnum);
+            addGenDex($general['no'], $general['atmos'], $general['train'], $oppose['crewtype'], $mydeathnum);
+            // 죽은수 기술로 누적
+            $num = Util::round($opdeathnum * 0.01);
+            // 국가보정
+            if($destnation['type'] == 3 || $destnation['type'] == 13)                                                                               { $num *= 1.1; }
+            if($destnation['type'] == 5 || $destnation['type'] == 6 || $destnation['type'] == 7 || $destnation['type'] == 8 || $destnation['type'] == 12) { $num *= 0.9; }
+            // 부드러운 기술 제한
+            if(TechLimit($admin['startyear'], $year, $destnation['tech'])) { $num = intdiv($num, 4); }
+            $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$destgencount' where nation='{$destnation['nation']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            //양국 평균 기술가격
+            //$techRatio = (getTechCost($nation['tech']) + getTechCost($destnation['tech'])) / 2;
+            $techRatio = 1.0;
+            // 죽은수 도시 재정으로 누적 60%
+            $num = Util::round(($mykillnum+$mydeathnum) * 0.6 * $techRatio);
+            // 국가보정
+            if($destnation['type'] == 1)                            { $num *= 1.1; }
+            if($destnation['type'] == 9 || $destnation['type'] == 10) { $num *= 0.9; }
+            $query = "update city set dead=dead+'$num' where city='{$city['city']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            // 죽은수 도시 재정으로 누적 40%
+            $num = Util::round(($mykillnum+$mydeathnum) * 0.4 * $techRatio);
+            // 국가보정
+            if($nation['type'] == 1)                        { $num *= 1.1; }
+            if($nation['type'] == 9 || $nation['type'] == 10) { $num *= 0.9; }
+            $query = "update city set dead=dead+'$num' where city='{$general['city']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+            // 상대 병사 소진이나 쌀 소진시 다음 장수
+            if($oppose['crew'] <= 0 || ($opRice <= Util::round($oppose['crew']/100) && $general['crew'] > 0)) {
+                if($opRice <= Util::round($oppose['crew']/100)) {
+                    $josaYi = JosaUtil::pick($opposeCrewType->name, '이');
+                    $alllog[] = "<C>●</>{$month}월:<Y>{$oppose['name']}</>의 {$opposeCrewType->name}{$josaYi} 패퇴했습니다.";
+                    $log[] = "<C>●</><Y>{$oppose['name']}</>의 {$opposeCrewType->name}{$josaYi} 패퇴했습니다.";
+                    $opplog[] = "<C>●</>군량 부족으로 패퇴합니다.";
+                } else {
+                    $josaYi = JosaUtil::pick($opposeCrewType->name, '이');
+                    $alllog[] = "<C>●</>{$month}월:<Y>{$oppose['name']}</>의 {$opposeCrewType->name}{$josaYi} 전멸했습니다.";
+                    $log[] = "<C>●</><Y>{$oppose['name']}</>의 {$opposeCrewType->name}{$josaYi} 전멸했습니다.";
+                    $opplog[] = "<C>●</>전멸했습니다.";
+                }
+                $opposecount--;
+
+                $general['atmos'] *= 1.1; //사기 증가
+                if($general['atmos'] > GameConst::$maxAtmosByWar) { $general['atmos'] = GameConst::$maxAtmosByWar; }
+
+                $query = "update general set atmos='{$general['atmos']}',killnum=killnum+1 where no='{$general['no']}'";
+                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+                $exp2++;
+                // 상대장수 경험 등등 증가
+                $opexp = Util::round($opexp / 50 * 0.8);
+                // 성격 보정
+                $opexp = CharExperience($opexp, $oppose['personal']);
+                // 쌀 소모
+                $oppose['rice'] -= ($opexp * 5 * getCrewtypeRice($opposeCrewType, $destnation['tech']));
+                if($oppose['rice'] < 0) { $oppose['rice'] = 0; }
+
+                $query = "update general set deathnum=deathnum+1,rice='{$oppose['rice']}',experience=experience+'$opexp',dedication=dedication+'$opexp' where no='{$oppose['no']}'";
+                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+                $opexp = 0;
+
+                pushGenLog($oppose, $opplog);
+                pushBatLog($oppose, $oppbatlog);
+                pushBatRes($oppose, $oppbatres);
+                $oppose = null;
+                $opplog = [];
+                $oppbatlog = [];
+                $oppbatres = [];
+            // 공격 장수 병사 소진이나 쌀 소진시 실패 처리
+            } elseif($general['crew'] <= 0 || $myRice <= Util::round($general['crew']/100)) {
+                if($myRice <= Util::round($general['crew']/100)) {
+                    $josaYi = JosaUtil::pick($generalCrewType->name, '이');
+                    $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 {$generalCrewType->name}{$josaYi} 퇴각했습니다.";
+                    $log[] = "<C>●</>군량 부족으로 퇴각합니다.";
+                    $opplog[] = "<C>●</><Y>{$general['name']}</>의 {$generalCrewType->name}{$josaYi} 퇴각했습니다.";
+                } else {
+                    $josaYi = JosaUtil::pick($generalCrewType->name, '이');
+                    $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 {$generalCrewType->name}{$josaYi} 퇴각했습니다.";
+                    $log[] = "<C>●</>퇴각했습니다.";
+                    $opplog[] = "<C>●</><Y>{$general['name']}</>의 {$generalCrewType->name}{$josaYi} 퇴각했습니다.";
+                }
+
+                // 경험치 상승
+                if($opposeCrewType->armType == GameUnitConst::T_WIZARD) {   // 귀병
+                    $oppose['intel2']++;
+                } elseif($opposeCrewType->armType == GameUnitConst::T_SIEGE) {   // 차병
+                    $oppose['leader2']++;
+                } else {
+                    $oppose['power2']++;
+                }
+
+                $oppose['atmos'] *= 1.1; //사기 증가
+                if($oppose['atmos'] > GameConst::$maxAtmosByWar) { $oppose['atmos'] = GameConst::$maxAtmosByWar; }
+
+                // 상대장수 경험 등등 증가
+                $opexp = Util::round($opexp / 50 * 0.8);
+                // 성격 보정
+                $opexp = CharExperience($opexp, $oppose['personal']);
+                // 쌀 소모
+                $oppose['rice'] -= ($opexp * 5 * getCrewtypeRice($opposeCrewType, $destnation['tech']));
+                if($oppose['rice'] < 0) { $oppose['rice'] = 0; }
+
+                $query = "update general set rice='{$oppose['rice']}',leader2='{$oppose['leader2']}',power2='{$oppose['power2']}',intel2='{$oppose['intel2']}',atmos='{$oppose['atmos']}',experience=experience+'$opexp',dedication=dedication+'$opexp',killnum=killnum+1 where no='{$oppose['no']}'";
+                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+                $query = "update general set deathnum=deathnum+1 where no='{$general['no']}'";
+                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+                $opexp = 0;
+
+                $opplog = checkAbility($oppose, $opplog);
+                pushGenLog($oppose, $opplog);
+                pushBatLog($oppose, $oppbatlog);
+                pushBatRes($oppose, $oppbatres);
+                $opplog = [];
+                $oppbatlog = [];
+                $oppbatres = [];
+    //          $josaYi = JosaUtil::pick($general['name'], '이');
+    //          $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>{$josaYi} }<G>{$city['name']}</> 공략에 실패했습니다. <1>$date</>";
+    //          $log[] = "<C>●</> <G>{$city['name']}</> 공략에 실패했습니다. <1>$date</>";
+                break;
+            } else {
+                // 무승부일때 로그 남김
+                pushGenLog($oppose, $opplog);
+                pushBatLog($oppose, $oppbatlog);
+                pushBatRes($oppose, $oppbatres);
+                $opplog = [];
+                $oppbatlog = [];
+                $oppbatres = [];
+            }
+        }
+    }
+
+    if(isset($oppose)){
+        //마지막 페이즈에 장수가 전멸하지 않은 경우. 쌀 소모 후속 처리
+
+        // 상대장수 경험 등등 증가(페이즈 초과시)
+        $opexp = Util::round($opexp / 50 * 0.8);
+        // 성격 보정
+        $opexp = CharExperience($opexp, $oppose['personal']);
+        // 쌀 소모
+        $oppose['rice'] -= ($opexp * 5 * getCrewtypeRice($opposeCrewType, $destnation['tech']));
+        if($oppose['rice'] < 0) { $oppose['rice'] = 0; }
+
+        $query = "update general set rice='{$oppose['rice']}',experience=experience+'$opexp',dedication=dedication+'$opexp' where no='{$oppose['no']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    }
+
+    // 경험치 상승
+    if($generalCrewType->armType == GameUnitConst::T_WIZARD) {   // 귀병
+        $general['intel2'] += $exp2;
+    } elseif($generalCrewType->armType == GameUnitConst::T_SIEGE) {   // 차병
+        $general['leader2'] += $exp2;
+    } else {
+        $general['power2'] += $exp2;
+    }
+    $query = "update general set leader2='{$general['leader2']}',power2='{$general['power2']}',intel2='{$general['intel2']}' where no='{$general['no']}'";
+    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+    // 공헌, 명성 상승
+    $exp = Util::round($exp / 50);
+    // 성격 보정
+    $exp = CharExperience($exp, $general['personal']);
+    // 쌀 소모
+    $general['rice'] -= ($exp * 5 * getCrewtypeRice($generalCrewType, $nation['tech']));
+    if($general['rice'] < 0) { $general['rice'] = 0; }
+
+    $query = "update general set rice='{$general['rice']}',dedication=dedication+'$exp',experience=experience+'$exp' where no='{$general['no']}'";
+    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+    $log = checkAbility($general, $log);
+    pushGenLog($general, $log);
+    pushBatLog($general, $batlog);
+    pushBatRes($general, $batres);
+    pushGeneralPublicRecord($alllog, $year, $month);
+    pushWorldHistory($history);
+
+    return $deadAmount;
+}
+
+function CriticalScore2($score) {
+    $score = Util::round($score * (rand()%8 + 13)/10);    // 1.3~2.0
+    return $score;
+}
+
+//0 0 : 100 100 이면 최고 무한대 차이
+//30 30 : 100 100 이면 최고 3.3배 차이
+//60 60 : 100 100 이면 최고 1.6배 차이
+function getCrew($crew, $youatmos, $mytrain) {
+    $ratio = $youatmos / $mytrain;
+    $crew = $crew * $ratio;
+
+    return $crew;
+}
+
+function getCrewtypeRice($crewtype, $tech) {
+    $cost = $crewtype->rice / 10;
+    return $cost * getTechCost($tech);
+}
+
+//////////////////////////////////////////////////////////////
+// 표준 공 / 수 반환 수치는 약 0이 되게 (100~550)
+//////////////////////////////////////////////////////////////
+
+function addConflict($city, $nationID, $mykillnum) {
+    $db = DB::db();
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+
+    $nationlist = [];
+    $killnum = [0];
+
+    list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
+
+    $conflict = Json::decode($city['conflict']);
+
+    if(!$conflict || $city['def'] == 0){ // 선타, 막타 보너스
+        $mykillnum *= 1.05;
+    }
+
+    if (!$conflict) {
+        $conflict[$nationID] = $mykillnum;
+    }
+    else if(key_exists($nationID, $conflict)){
+        $conflict[$nationID] += $mykillnum;
+        arsort($conflict);
+    }
+    else{
+        $conflict[$nationID] = $mykillnum;
+        arsort($conflict);
+
+        $nation = getNationStaticInfo($nationID);
+        $josaYi = JosaUtil::pick($nation['name'], '이');
+        pushWorldHistory(["<C>●</>{$year}년 {$month}월:<M><b>【분쟁】</b></><D><b>{$nation['name']}</b></>{$josaYi} <G><b>{$city['name']}</b></> 공략에 가담하여 분쟁이 발생하고 있습니다."]);
+    }
+    
+    $rawConflict = Json::encode($conflict);
+    $city['conflict'] = $rawConflict;
+
+    $db->update('city', [
+        'conflict'=>$rawConflict
+    ], 'city=%i',$city['city']);
+
+    return $city;
+}
+
+function DeleteConflict($nation) {
+    $db = DB::db();
+
+    foreach($db->queryAllLists('SELECT city, conflict FROM city WHERE conflict!=%s', '{}') as list($cityID, $rawConflict)){
+        $conflict = Json::decode($rawConflict);
+
+        if(!$conflict || !is_array($conflict)){
+            continue;
+        }
+        if(!key_exists($nation, $conflict)){
+            continue;
+        }
+
+        unset($conflict[$nation]);
+
+        $db->update('city', [
+            'conflict'=>Json::encode($conflict)
+        ], 'city=%i', $cityID);
+    }
+}
+
+function getConquerNation($city) : int {
+    $conflict = Json::decode($city['conflict']);
+    return Util::array_first_key($conflict);
+}
+
+function ConquerCity($admin, $general, $city, $nation, $destnation) {
+    '@phan-var array<string,mixed> $city';
+    $db = DB::db();
+    $connect=$db->get();
+
+    $alllog = [];
+    $log = [];
+    $history = [];
+
+    if($destnation['nation'] > 0) {
+        $destnationName = "<D><b>{$destnation['name']}</b></>의";
+    } else {
+        $destnationName = "공백지인";
+    }
+
+    $year = $admin['year'];
+    $month = $admin['month'];
+
+    $josaUl = JosaUtil::pick($city['name'], '을');
+    $josaYiNation = JosaUtil::pick($nation['name'], '이');
+    $josaYiGen = JosaUtil::pick($general['name'], '이');
+    $josaYiCity = JosaUtil::pick($city['name'], '이');
+    $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>{$josaYiGen} <G><b>{$city['name']}</b></> 공략에 <S>성공</>했습니다.";
+    $log[] = "<C>●</><G><b>{$city['name']}</b></> 공략에 <S>성공</>했습니다.";
+    $history[] = "<C>●</>{$year}년 {$month}월:<S><b>【지배】</b></><D><b>{$nation['name']}</b></>{$josaYiNation} <G><b>{$city['name']}</b></>{$josaUl} 지배했습니다.";
+    pushGeneralHistory($general, "<C>●</>{$year}년 {$month}월:<G><b>{$city['name']}</b></>{$josaUl} <S>함락</>시킴");
+    pushNationHistory($nation, "<C>●</>{$year}년 {$month}월:<Y>{$general['name']}</>{$josaYiGen} {$destnationName} <G><b>{$city['name']}</b></>{$josaUl} <S>점령</>");
+    pushNationHistory($destnation, "<C>●</>{$year}년 {$month}월:<D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>에 의해 <G><b>{$city['name']}</b></>{$josaYiCity} <span class='ev_highlight'>함락</span>");
+
+    $query = "select city from city where nation='{$city['nation']}'";
+    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $citycount = MYDB_num_rows($result);
+
+    // 국가 멸망시
+    //TODO: 국가 멸망 코드를 별도로 작성
+    if($citycount == 1 && $city['nation'] != 0) {
+        $query = "select nation,name,gold,rice from nation where nation='{$city['nation']}'";
+        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $losenation = MYDB_fetch_array($result);
+
+        $josaYi = JosaUtil::pick($losenation['name'], '이');
+        $josaUl = JosaUtil::pick($losenation['name'], '을');
+        $history[] = "<C>●</>{$year}년 {$month}월:<R><b>【멸망】</b></><D><b>{$losenation['name']}</b></>{$josaYi} 멸망하였습니다.";
+        pushNationHistory($nation, "<C>●</>{$year}년 {$month}월:<D><b>{$losenation['name']}</b></>{$josaUl} 정복");
+
+        $query = "select no, nation from general where nation='{$general['nation']}' and level='12'";
+        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $ruler = MYDB_fetch_array($result);
+
+        //다굴치는 나라들 전방설정을 위해 미리 얻어옴
+        $query = "select you from diplomacy where me='{$losenation['nation']}' and state<2";
+        $dipResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $dipCount = MYDB_num_rows($dipResult);
+
+        $loseGeneralGold = 0;
+        $loseGeneralRice = 0;
+        //멸망국 장수들 역사 기록 및 로그 전달
+        $josaYi = JosaUtil::pick($losenation['name'], '이');
+        $genlog = ["<C>●</><D><b>{$losenation['name']}</b></>{$josaYi} <R>멸망</>했습니다."];
+
+
+        // 국가 백업
+        $oldNation = $db->queryFirstRow('SELECT * FROM nation WHERE nation=%i', $city['nation']);
+        $oldNationGenerals = $db->query('SELECT * FROM general WHERE nation=%i', $city['nation']);
+        $oldNation['generals'] = array_map(function($gen){
+            //다른 코드와는 다르게 공용으로 쓰므로 남겨둠
+            return $gen['no'];
+        }, $oldNationGenerals);
+        $oldNation['aux'] = Json::decode($oldNation['aux']);
+
+        foreach($oldNationGenerals as $gen){
+
+            $loseGold = intdiv($gen['gold'] * (rand()%30+20), 100);
+            $loseRice = intdiv($gen['rice'] * (rand()%30+20), 100);
+            $genlog[1] = "<C>●</>도주하며 금<C>$loseGold</> 쌀<C>$loseRice</>을 분실했습니다.";
+            
+            $query = "update general set gold=gold-{$loseGold},rice=rice-{$loseRice} where no={$gen['no']}";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            
+            pushGenLog($gen, $genlog);
+            
+            pushGeneralHistory($gen, "<C>●</>{$year}년 {$month}월:<D><b>{$losenation['name']}</b></>{$josaYi} <R>멸망</>");
+            pushOldNationStop($gen['no'], $city['nation']);
+
+            $loseGeneralGold += $loseGold;
+            $loseGeneralRice += $loseRice;
+            
+            //모두 등용장 발부
+            if($nation['name'] == "강족" || $nation['name'] == "저족" || $nation['name'] == "흉노족"
+                || $nation['name'] == "남만족" || $nation['name'] == "산월족" || $nation['name'] == "오환족"
+                || $nation['name'] == "왜족") {
+                //등용장 미발부
+            } elseif(Util::randBool(0.5)) {
+                $msg = ScoutMessage::buildScoutMessage($general['no'], $gen['no']);
+                if($msg){
+                    $msg->send(true);
+                }
+            }
+
+            //NPC인 경우 10% 확률로 임관(엔장, 인재, 의병)
+            if($gen['npc'] >= 2 && $gen['npc'] <= 8 && rand() % 100 < 10) {
+                $commissionCommand = EncodeCommand(0, 0, $nation['nation'], 25); //임관
+                $query = "update general set turn0='$commissionCommand' where no={$gen['no']}";
+                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            }
+        }
+        unset($genlog[1]);
+        
+        // 승전국 보상
+        $losenation['gold'] -= GameConst::$basegold;
+        $losenation['rice'] -= GameConst::$baserice;
+        if($losenation['gold'] < 0) { $losenation['gold'] = 0; }
+        if($losenation['rice'] < 0) { $losenation['rice'] = 0; }
+        
+        $losenation['gold'] += $loseGeneralGold;
+        $losenation['rice'] += $loseGeneralRice;
+        
+        $losenation['gold'] = intdiv($losenation['gold'], 2);
+        $losenation['rice'] = intdiv($losenation['gold'], 2);
+        
+        // 기본량 제외 금쌀50% + 장수들 분실 금쌀50% 흡수
+        $query = "update nation set gold=gold+'{$losenation['gold']}',rice=rice+'{$losenation['rice']}' where nation='{$general['nation']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        
+        //아국 수뇌부에게 로그 전달
+        $query = "select no,name,nation from general where nation='{$general['nation']}' and level>='9'";
+        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $gencount = MYDB_num_rows($result);
+        $genlog[0] = "<C>●</><D><b>{$losenation['name']}</b></> 정복으로 금<C>{$losenation['gold']}</> 쌀<C>{$losenation['rice']}</>을 획득했습니다.";
+        for($i=0; $i < $gencount; $i++) {
+            $gen = MYDB_fetch_array($result);
+            pushGenLog($gen, $genlog);
+        }
+        
+        
+        //분쟁기록 모두 지움
+        DeleteConflict($city['nation']);
+        // 전 장수 공헌 명성치 깎음
+        $query = "update general set dedication=dedication*0.5,experience=experience*0.9 where nation='{$city['nation']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        // 전 도시 공백지로
+        $query = "update city set nation='0',gen1='0',gen2='0',gen3='0',conflict='{}',term=0 where nation='{$city['nation']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        // 전 장수 소속 무소속으로, 재야로, 부대 탈퇴
+        $query = "update general set nation='0',belong='0',level='0',troop='0' where nation='{$city['nation']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        // 부대도 삭제
+        $query = "delete from troop where nation='{$city['nation']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        // 외교 삭제
+        $query = "delete from diplomacy where me='{$city['nation']}' or you='{$city['nation']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        
+        $db->insert('ng_old_nations', [
+            'server_id'=>UniqueConst::$serverID,
+            'nation'=>$city['nation'],
+            'data'=>Json::encode($oldNation)
+        ]);
+        // 국가 삭제
+        $query = "delete from nation where nation='{$city['nation']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        // 아까 얻어온 다굴국들 전방설정
+        for($i=0; $i < $dipCount; $i++) {
+            $dip = MYDB_fetch_array($dipResult);
+            //전방설정
+            SetNationFront($dip['you']);
+        }
+    // 멸망이 아니면
+    } else {
+        // 태수,군사,시중은 일반으로...
+        $db->update('general',[
+            'level'=>1
+        ], 'no IN %li',[$city['gen1'], $city['gen2'], $city['gen3']]);
+        
+        //수도였으면 긴급 천도
+        if(isset($destnation['capital']) && $destnation['capital'] == $city['city']) {
+            $minCity = findNextCapital($city['city'], $destnation['nation']);
+
+            $minCityName = CityConst::byID($minCity)->name;
+
+            $josaYi = JosaUtil::pick($destnation['name'], '이');
+            $history[] = "<C>●</>{$year}년 {$month}월:<M><b>【긴급천도】</b></><D><b>{$destnation['name']}</b></>{$josaYi} 수도가 함락되어 <G><b>$minCityName</b></>으로 긴급천도하였습니다.";
+
+            //아국 수뇌부에게 로그 전달
+            $query = "select no,name,nation from general where nation='{$destnation['nation']}' and level>='5'";
+            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            $gencount = MYDB_num_rows($result);
+            $genlog = ["<C>●</>수도가 함락되어 <G><b>$minCityName</b></>으로 <M>긴급천도</>합니다."];
+            for($i=0; $i < $gencount; $i++) {
+                $gen = MYDB_fetch_array($result);
+                pushGenLog($gen, $genlog);
+            }
+            //천도
+            $query = "update nation set capital='$minCity',gold=gold*0.5,rice=rice*0.5 where nation='{$destnation['nation']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            //보급도시로 만듬
+            $query = "update city set supply=1 where city='$minCity'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            //수뇌부 이동
+            $query = "update general set city='$minCity' where nation='{$destnation['nation']}' and level>='5'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            //장수 사기 감소
+            $query = "update general set atmos=atmos*0.8 where nation='{$destnation['nation']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+            refreshNationStaticInfo();
+        }
+    }
+
+    $general['atmos'] *= 1.1; //사기 증가
+    if($general['atmos'] > GameConst::$maxAtmosByWar) { $general['atmos'] = GameConst::$maxAtmosByWar; }
+
+    $conquerNation = getConquerNation($city);
+
+    if($conquerNation == $general['nation']) {
+        // 이동 및 사기 변경
+        $query = "update general set city='{$city['city']}',atmos='{$general['atmos']}',killnum=killnum+1 where no='{$general['no']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        if($city['level'] > 3) {
+            // 도시 소속 변경, 태수,군사,시중 초기화
+            $query = "update city set supply=1,conflict='{}',term=0,agri=agri*0.7,comm=comm*0.7,secu=secu*0.7,def=1000,wall=1000,nation='{$general['nation']}',gen1=0,gen2=0,gen3=0 where city='{$city['city']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        } else {
+            // 도시 소속 변경, 태수,군사,시중 초기화
+            $query = "update city set supply=1,conflict='{}',term=0,agri=agri*0.7,comm=comm*0.7,secu=secu*0.7,def=def2/2,wall=wall2/2,nation='{$general['nation']}',gen1=0,gen2=0,gen3=0 where city='{$city['city']}'";
+            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        }
+        //전방설정
+        SetNationFront($nation['nation']);
+        SetNationFront($destnation['nation']);
+    } else {
+        $query = "select name,nation from nation where nation='$conquerNation'";
+        $conquerResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $conquerNationArray = MYDB_fetch_array($conquerResult);
+        
+
+
+        $josaUl = JosaUtil::pick($city['name'], '을');
+        $josaYi = JosaUtil::pick($conquerNationArray['name'], '이');
+        $history[] = "<C>●</>{$year}년 {$month}월:<Y><b>【분쟁협상】</b></><D><b>{$conquerNationArray['name']}</b></>{$josaYi} 영토분쟁에서 우위를 점하여 <G><b>{$city['name']}</b></>{$josaUl} 양도받았습니다.";
+        pushNationHistory($nation, "<C>●</>{$year}년 {$month}월:<G><b>{$city['name']}</b></>{$josaUl} <D><b>{$conquerNationArray['name']}</b></>에 <Y>양도</>");
+        pushNationHistory($conquerNationArray, "<C>●</>{$year}년 {$month}월:<D><b>{$nation['name']}</b></>에서 <G><b>{$city['name']}</b></>{$josaUl} <S>양도</> 받음");
+        // 이동X 및 사기 변경
+        $query = "update general set atmos='{$general['atmos']}',killnum=killnum+1 where no='{$general['no']}'";
+        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+        $query = [
+            'supply'=>1,
+            'term'=>0,
+            'conflict'=>'{}',
+            'agri'=>$db->sqleval('agri*0.7'),
+            'comm'=>$db->sqleval('comm*0.7'),
+            'secu'=>$db->sqleval('secu*0.7'),
+            'nation'=>$conquerNation,
+            'gen1'=>0,
+            'gen2'=>0,
+            'gen3'=>0
+        ];
+        if($city['level'] > 3) {
+            $query['def'] = 1000;
+            $query['wall'] = 1000;
+        } else {
+            // 도시 소속 변경, 태수,군사,시중 초기화
+            $query['def'] = $db->sqleval('def2/2');
+            $query['wall'] = $db->sqleval('wall2/2');
+        }
+        $db->update('city', $query, 'city=%i', (int)$city['city']);
+        //전방설정
+        SetNationFront($destnation['nation']);
+        SetNationFront($conquerNation);
+    }
+
+    pushGenLog($general, $log);
+    pushGeneralPublicRecord($alllog, $year, $month);
+    pushWorldHistory($history);
+}
+
+function findNextCapital(int $capitalID, int $nationID):int{
+    $distList = searchDistance($capitalID, 99, true);
+
+    $cities = [];
+    foreach(
+        DB::db()->query(
+            'SELECT city, pop FROM city WHERE nation=%i and city!=%i', 
+            $nationID, 
+            $capitalID
+        ) as $row
+    ){
+        $cities[$row['city']] = $row['pop'];
+    };
+
+    
+
+    foreach($distList as $dist=>$distSubList){
+        $maxCityPop = 0;
+        $minCity = 0;
+        
+        foreach($distSubList as $cityID){
+            if(!key_exists($cityID, $cities)){
+                continue;
+            }
+            $cityPop = $cities[$cityID];
+
+            if($cityPop < $maxCityPop){
+                continue;
+            }
+            $minCity = $cityID;
+            $maxCityPop = $cityPop;
+        }
+
+        if($minCity){
+            return $minCity;
+        }
+    }
+    throw new \RuntimeException('도시가 남지 않았는데 긴천을 시도하고 있습니다');
+}

hwe/process_war.php

@@ -2,1541 +2,460 @@
 namespace sammo;
 
 
-function processWar($general, $city) {
-    '@phan-var array<string,int|string|null> $general';
+function processWar(array $rawAttacker, array $rawDefenderCity){
 
     $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();
+    $rawAttackerCity = $db->queryFirstRow('SELECT * FROM city WHERE city = %i', $rawAttacker['city']);
 
-    $templates = new \League\Plates\Engine(__dir__.'/templates');
+    $attackerNationID = $rawAttacker['nation'];
+    $defenderNationID = $rawDefenderCity['nation'];
 
-    $date = substr($general['turntime'],11,5);
+    $rawAttackerNation = $db->queryFirstRow('SELECT nation,`level`,`name`,capital,totaltech,gennum,tech,`type`,gold,rice FROM nation WHERE nation = %i', $attackerNationID);
 
-    $admin = $gameStor->getAll();
-
-    $year = $admin['year'];
-    $month = $admin['month'];
-
-    $log = [];
-    $batlog = [];
-    $batres = [];
-
-    $opplog = [];
-    $oppbatlog = [];
-    $oppbatres = [];
-
-    $alllog = [];
-    $history = [];
-
-    $deadAmount = [
-        'att'=>0,
-        'def'=>0
-    ];
-
-    $generalCrewType = GameUnitConst::byID($general['crewtype']);
-    $warphase = $generalCrewType->speed;   //병종간 페이즈 수 얻기
-
-    // 특기보정 : 돌격
-    if($general['special2'] == 60) { $warphase += 1; }
-
-    $genAtmos = 0;
-    if($general['item'] == 3) {
-        //탁주 사용
-        $genAtmos += 3;
-        $query = "update general set item=0 where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $josaUl = JosaUtil::pick($general['item'], '을');
-        $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
-        $general['item'] = 0;
-    } elseif($general['item'] >= 14 && $general['item'] <= 16) {
-        //의적주, 두강주, 보령압주 사용
-        $genAtmos += 5;
-    } elseif($general['item'] >= 19 && $general['item'] <= 20) {
-        //춘화첩, 초선화 사용
-        $genAtmos += 7;
-    }
-    $genTrain = 0;
-    if($general['item'] == 4) {
-        //청주 사용
-        $genTrain += 3;
-        $query = "update general set item=0 where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $josaUl = JosaUtil::pick($general['item'], '을');
-        $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
-        $general['item'] = 0;
-    } elseif($general['item'] >= 12 && $general['item'] <= 13) {
-        //과실주, 이강주 사용
-        $genTrain += 5;
-    } elseif($general['item'] >= 17 && $general['item'] <= 18) {
-        //철벽서, 단결도 사용
-        $genTrain += 7;
-    }
-
-    // 우선 스케일링
-    $city['def'] *= 10;
-    $city['wall'] *= 10;
-
-    $query = "select level from city where city='{$general['city']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $originCity = MYDB_fetch_array($result);
-
-    $query = "select nation,level,name,capital,tech,type from nation where nation='{$general['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    setLeadershipBonus($general, $nation['level']);
-
-    $query = "select nation,level,name,rice,capital,tech,type from nation where nation='{$city['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $destnation = MYDB_fetch_array($result) ?: [
+    if($defenderNationID == 0){
+        $rawDefenderNation =  [
             'nation'=>0,
+            'name'=>'재야',
             'capital'=>0,
             'level'=>0,
+            'gold'=>0,
             'rice'=>2000,
             'type'=>0,
-        'tech'=>0        
+            'tech'=>0,
+            'totaltech'=>0,
+            'gennum'=>1     
         ];
-
-    //장수수 구함
-    $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;
-    //장수수 구함
-    $query = "select no from general where nation='{$destnation['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $destgencount = MYDB_num_rows($result);
-    if($destgencount < GameConst::$initialNationGenLimit) $destgencount = GameConst::$initialNationGenLimit;
-
-    $genAtmosBonus = 0;   $genTrainBonus = 0;
-    $oppAtmosBonus = 0;   $oppTrainBonus = 0;
-    //공격자 수도보정
-    if($nation['capital'] == $general['city']) { $genAtmosBonus += 5; }
-    //방어자 수도보정
-    //if($destnation['capital'] == $city['city']) { $oppTrainBonus += 5; }
-    //관,진,수진 보정
-    if($city['level']       == 1) { $oppTrainBonus += 5; }   // 방어도시가 수진이면 방어자 방어보정
-    if($originCity['level'] == 2) { $genAtmosBonus += 5; }   // 출병도시가 진이면 공격자 공격보정
-    if($city['level']       == 3) { $oppTrainBonus += 5; }   // 방어도시가 관이면 방어자 방어보정
-
-    $josaRo = JosaUtil::pick($city['name'], '로');
-    $josaYi = JosaUtil::pick($general['name'], '이');
-    $alllog[] = "<C>●</>{$month}월:<D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <G><b>{$city['name']}</b></>{$josaRo} 진격합니다.";
-    $log[] = "<C>●</>{$month}월:<G><b>{$city['name']}</b></>{$josaRo} <M>진격</>합니다. <1>$date</>";
-
-    // 목표 도시내에 목표 국가 소속 장수 중, 병사가 있는 능력치합+병사수 순으로 훈,사 60, 80 이상
-    $query = "select no,name,turntime,personal,special2,crew,crewtype,atmos,train,intel,intel2,book,power,power2,weap,injury,leader,leader2,horse,item,explevel,level,rice,leader+power+intel+weap+horse+book+crew/100 as sum,dex0,dex10,dex20,dex30,dex40 from general where city='{$city['city']}' and nation='{$city['nation']}' and nation!=0 and crew>'0' and rice>round(crew/100) and ((train>=60 and atmos>=60 and mode=1) or (train>=80 and atmos>=80 and mode=2)) order by sum desc";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $opposecount = MYDB_num_rows($result);
-
-    $exp = 0;   //병사 소진 시킨 만큼
-    $opexp = 0;
-    $exp2 = 1;  //능력경험치
-    $phase = 0;
-    while($phase < $warphase) {
-        // 장수가 없어서 도시 공격하려했으나 병량없을시
-        if($opposecount == 0 && $destnation['nation'] > 0 && $destnation['rice'] <= 0 && $city['supply'] == 1) {
-            $general['train'] += 1; //훈련 상승
-            if($general['train'] > GameConst::$maxTrainByWar) { $general['train'] = GameConst::$maxTrainByWar; }
-            $query = "update general set recwar='{$general['turntime']}',train='{$general['train']}',warnum=warnum+1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-            $alllog[] = "<C>●</>{$month}월:병량 부족으로 <G><b>{$city['name']}</b></>의 수비병들이 <R>패퇴</>합니다.";
-            $josaUl = JosaUtil::pick($city['name'], '을');
-            $josaYi = JosaUtil::pick($general['name'], '이');
-            $history[] = "<C>●</>{$year}년 {$month}월:<M><b>【패퇴】</b></><D><b>{$destnation['name']}</b></>{$josaYi} 병량 부족으로 <G><b>{$city['name']}</b></>{$josaUl} 뺏기고 말았습니다.";
-            pushGenLog($general, $log);
-            pushGeneralPublicRecord($alllog, $year, $month);
-            pushWorldHistory($history);
-            $log = [];
-            $alllog = [];
-            $history= [];
-
-            //패퇴시 병량보충
-            $destnation['rice'] += 500;
-            $query = "update nation set rice='{$destnation['rice']}' where nation='{$destnation['nation']}'";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            //내정 피폐
-            $query = "update city set agri=agri*0.5,comm=comm*0.5,secu=secu*0.5 where city='{$city['city']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-            $city = addConflict($city, $general['nation'], 1);//NOTE: 이 경우 두 국가가 분쟁 중인 경우에는 병량패퇴의 이득이 없다.
-
-            ConquerCity($admin, $general, $city, $nation, $destnation);
-            break;
-        // 장수가 없어서 도시 공격
-        } elseif($opposecount == 0) {
-            $opposeCrewType = GameUnitConst::byId(GameUnitConst::T_CASTLE);
-            $josaRo = JosaUtil::pick($generalCrewType->name, '로');
-            $josaYi = JosaUtil::pick($general['name'], '이');
-            $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>{$josaYi} {$generalCrewType->name}{$josaRo} 성벽을 공격합니다.";
-            $log[] = "<C>●</>{$generalCrewType->name}{$josaRo} 성벽을 <M>공격</>합니다.";
-
-            $general['train'] += 1; //훈련 상승
-            if($general['train'] > GameConst::$maxTrainByWar) { $general['train'] = GameConst::$maxTrainByWar; }
-            $query = "update general set recwar='{$general['turntime']}',train='{$general['train']}',warnum=warnum+1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-            $mykillnum = 0; $mydeathnum = 0;
-            while($phase < $warphase) {
-                $phase++;
-
-                $myAtt = $generalCrewType->getComputedAttack($general, $nation['tech']);
-                $myDef = $generalCrewType->getComputedDefence($general, $nation['tech']);
-                $cityAtt = $opposeCrewType->getComputedAttack($city, $destnation['tech']);
-                $cityDef = $opposeCrewType->getComputedDefence($city, $destnation['tech']);
-
-                // 감소할 병사 수
-                $cityCrew = GameConst::$armperphase + $myAtt - $cityDef;
-                $myCrew = GameConst::$armperphase + $cityAtt - $myDef;
-                if($cityCrew <= 0) { $cityCrew = rand() % 90 + 10; }
-                if($myCrew <= 0) { $myCrew = rand() % 90 + 10; }
-
-                //훈련 사기따라
-                $myCrew = getCrew($myCrew, $admin['city_rate']+$oppAtmosBonus, CharTrain($general['train']+$genTrain+$genTrainBonus, $general['personal']));
-                $cityCrew = getCrew($cityCrew, CharAtmos($general['atmos']+$genAtmos+$genAtmosBonus, $general['personal']), $admin['city_rate']+$oppTrainBonus);
-                //숙련도 따라
-                $genDexAtt = getGenDex($general, $general['crewtype']);
-                $genDexDef = getGenDex($general, 40);
-                $cityCrew *= getDexLog($genDexAtt, ($admin['city_rate']-60)*7200);
-                $myCrew *= getDexLog(($admin['city_rate']-60)*7200, $genDexDef);
-
-                $cityCrew *= $generalCrewType->getAttackCoef($opposeCrewType);
-                $myCrew *= $generalCrewType->getDefenceCoef($opposeCrewType);
-
-                $avoid = 1;
-                // 병종간 특성
-                if($generalCrewType->magicCoef) {
-                    $int = Util::round(getGeneralIntel($general, true, true, true, false));
-                    $ratio2 = $int / 100 * $generalCrewType->magicCoef;
-
-                    // 특기보정 : 신산
-                    if($general['special2'] == 41) { $ratio2 += 0.2; }
-
-                    if(Util::randBool($ratio2)) {
-                        $ratio = rand() % 100; // 0~99
-                        // 특기보정 : 귀병, 신산, 환술, 신중
-                        if($general['special2'] == 40) { $ratio += 20; }
-                        if($general['special2'] == 41) { $ratio += 20; }
-                        if($general['special2'] == 42) { $ratio += 10; }
-                        if($general['special2'] == 44) { $ratio += 100; }
-                        if($ratio >= 30) {
-                            // 특기보정 : 환술, 집중
-                            if($general['special2'] == 42) { $cityCrew *= 1.3; }
-                            if($general['special2'] == 43) { $cityCrew *= 1.5; }
-                            $type = rand() % 3;
-                            switch($type) {
-                            case 0:
-                                $batlog[] = "<C>●</><D>급습</>을 <C>성공</>했다!";
-                                $cityCrew *= 1.2;
-                                break;
-                            case 1:
-                                $batlog[] = "<C>●</><D>위보</>를 <C>성공</>했다!";
-                                $cityCrew *= 1.4;
-                                break;
-                            case 2:
-                                $batlog[] = "<C>●</><D>혼란</>을 <C>성공</>했다!";
-                                $cityCrew *= 1.6;
-                                break;
-                            }
-                        } else {
-                            $type = rand() % 3;
-                            switch($type) {
-                            case 0:
-                                $batlog[] = "<C>●</><D>급습</>을 <R>실패</>했다!";
-                                $cityCrew /= 1.2;   $myCrew *= 1.2;
-                                break;
-                            case 1:
-                                $batlog[] = "<C>●</><D>위보</>를 <R>실패</>했다!";
-                                $cityCrew /= 1.4;   $myCrew *= 1.4;
-                                break;
-                            case 2:
-                                $batlog[] = "<C>●</><D>혼란</>을 <R>실패</>했다!";
-                                $cityCrew /= 1.6;   $myCrew *= 1.6;
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                //군주 공격 보정 10%
-                if($general['level'] == 12) {
-                    $cityCrew = $cityCrew * 1.10;
-                //참모, 장군 공격 보정 5%
-                } elseif($general['level'] == 11 || $general['level'] == 10 || $general['level'] == 8 || $general['level'] == 6) {
-                    $cityCrew = $cityCrew * 1.05;
-                }
-                //레벨 보정
-                $cityCrew = $cityCrew * (100 + $general['explevel']/6)/100;
-
-                // 특기보정 : 공성, 기병, 돌격, 무쌍, 보병, 견고, 의술(청낭서,태평청령)
-                if($general['special2'] == 53) { $cityCrew *= 2.00; }
-                if($general['special2'] == 52) { $cityCrew *= 1.20; }
-                if($general['special2'] == 60) { $cityCrew *= 1.10; }
-                if($general['special2'] == 61) { $cityCrew *= 1.10; }
-                if($general['special2'] == 50) { $myCrew *= 0.90; }
-                if($general['special2'] == 62) { $myCrew *= 0.90; }
-                $ratio = rand() % 100; // 0 ~ 99
-                if(($general['special2'] == 73 || $general['item'] == 23 || $general['item'] == 24) && $ratio > 80 && $avoid == 1) {
-                    $batlog[] = "<C>●</><C>치료</>했다!</>";
-                    $myCrew /= 1.5; // 66%만 소모
-                    $avoid = 0;
-                }
-
-                //크리
-                $rd = rand() % 100; // 0 ~ 99
-                $ratio = $generalCrewType->getCriticalRatio($general);
-                // 특기보정 : 무쌍, 필살
-                if($general['special2'] == 61) { $ratio += 10; }
-                if($general['special2'] == 71) { $ratio += 20; }
-                if($ratio >= $rd && $avoid == 1) {
-                    $batlog[] = "<C>●</><C>필살</>공격!</>";
-                    $cityCrew = CriticalScore2($cityCrew);
-                    $avoid = 0;
-                }
-                //회피
-                $ratio = rand() % 100; // 0 ~ 99
-                $ratio2 = $generalCrewType->avoid;   //회피율
-                $ratio2 = Util::round($ratio2 * $general['train'] / 100); //훈련 반영
-                //특기보정 : 궁병
-                if($general['special2'] == 51) { $ratio2 += 20; }
-                //도구 보정 : 둔갑천서, 태평요술
-                if($general['item'] == 26 || $general['item'] == 25) { $ratio2 += 20; }
-                LogText('avoid0', [date("Ymd_His"), $generalCrewType->id, $general['train'], $ratio2]);
-                if($ratio < $ratio2 && $avoid == 1) {
-                    LogText('avoid0', true);
-                    $batlog[] = "<C>●</><C>회피</>했다!</>";
-                    $myCrew /= 5; // 20%만 소모
-                    $avoid = 0;
-                }
-
-                //랜타추가
-                $cityCrew *= (rand() % 21 + 90)/100; // 90~110%
-                $myCrew *= (rand() % 21 + 90)/100; // 90~110%
-
-                //특기보정 : 위압
-                if($general['special2'] == 63 && $phase == 1 && $general['crew'] >= 1000 && $general['atmos'] >= 90 && $general['train'] >= 90) {
-                    $batlog[] = "<C>●</>상대에게 <C>위압</>을 줬다!</>";
-                    $myCrew = 0;
-                }
-
-                $general['crew'] -= Util::round($myCrew);
-                $city['def'] -= Util::round($cityCrew);
-                $city['wall'] -= Util::round($cityCrew);
-
-                $tempMyCrew = $myCrew; $tempCityCrew = $cityCrew;
-                $tempGeneralCrew = $general['crew']; $tempCityDef = $city['def'];
-
-                if($city['wall'] <= 0) { $city['wall'] = 0; }
-
-                if($general['crew'] <= 0 && $city['def'] <= 0) {
-                    $r1 = $tempGeneralCrew / $tempMyCrew;
-                    $r2 = $tempCityDef / $tempCityCrew;
-
-                    if($r1 > $r2) {
-                        $offset = Util::round($tempCityDef*$tempMyCrew/$tempCityCrew);
-                        $myCrew += $offset;
-                        $general['crew'] -= $offset;
-                        $cityCrew += $tempCityDef;
-                        $city['def'] = 0;
-                    } else {
-                        $offset = Util::round($tempGeneralCrew*$tempCityCrew/$tempMyCrew);
-                        $cityCrew += $offset;
-                        $city['def'] -= $offset;
-                        $myCrew += $tempGeneralCrew;
-                        $general['crew'] = 0;
-                    }
-                } elseif($general['crew'] * $city['def'] <= 0) {
-                    if($city['def'] < 0) {
-                        $offset = Util::round($tempCityDef*$tempMyCrew/$tempCityCrew);
-                        $myCrew += $offset;
-                        $general['crew'] -= $offset;
-                        $cityCrew += $tempCityDef;
-                        $city['def'] = 0;
-                    }
-                    if($general['crew'] < 0) {
-                        $offset = Util::round($tempGeneralCrew*$tempCityCrew/$tempMyCrew);
-                        $cityCrew += $offset;
-                        $city['def'] -= $offset;
-                        $myCrew += $tempGeneralCrew;
-                        $general['crew'] = 0;
-                    }
-                }
-
-                $exp += $cityCrew;
-                $opexp += $myCrew;
-                $general['crew'] = Util::round($general['crew']);
-                $cityCrew = Util::round($cityCrew);
-                $myCrew = Util::round($myCrew);
-                $batlog[] = "<C>●</> $phase : <Y1>【{$general['name']}】</> <C>{$general['crew']} (-$myCrew)</> VS <C>{$city['def']} (-$cityCrew)</> <Y1>【{$city['name']}】</>";
-
-                $mykillnum += $cityCrew; $mydeathnum += $myCrew;
-
-                // 중간 쌀 체크
-                $myRice = Util::round($exp / 50);
-                // 성격 보정
-                $myRice = CharExperience($myRice, $general['personal']);
-                // 쌀 소모
-                $myRice = ($myRice * 5 * getCrewtypeRice($generalCrewType, $nation['tech']));
-                // 결과 쌀
-                $myRice = $general['rice'] - $myRice;
-
-                if($myRice <= Util::round($general['crew']/100)) { break; }
-
-                if($city['def'] <= 0) { break; }
-                if($general['crew'] <= 0) { break; }
-            }
-
-            $render_attacker = [
-                'crewtype' => mb_substr($generalCrewType->name, 0, 2),
-                'name'=> $general['name'],
-                'remain_crew' => $general['crew'],
-                'killed_crew' => -$mydeathnum
-            ];
-            $render_defender = [
-                'crewtype' => '성벽',
-                'name'=> $city['name'],
-                'remain_crew' => $city['def'],
-                'killed_crew' => -$mykillnum
-            ];
-
-            $res = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
-                'year'=>$year,
-                'month'=>$month,
-                'war_type'=>'siege',
-                'war_type_str'=>'→',
-                'me' => $render_attacker,
-                'you' => $render_defender,
-            ]));
-
-            $log[] = $res;//TODO: $log를 출력할 때 date에 대해선 숨겨야 함.
-            $batlog[] = $res;
-            $batres[] = $res;
-            $deadAmount['att'] = $deadAmount['att'] + $mydeathnum;
-            $deadAmount['def'] = $deadAmount['def'] + $mykillnum;
-
-            // 도시쌀 소모 계산
-            $opexp = Util::round($opexp / 50 * 0.8);
-            $rice = Util::round($opexp * 5 * getCrewtypeRice($opposeCrewType, 0) * ($admin['city_rate']/100 - 0.2));
-            $destnation['rice'] -= $rice;
-            if($destnation['rice'] < 0) { $destnation['rice'] = 0; }
-            $query = "update nation set rice='{$destnation['rice']}' where nation='{$destnation['nation']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-            pushAdminLog(["성벽 쌀 소모 : $rice"]);
-
-            //원래대로 스케일링
-            $city['def'] = Util::round($city['def'] / 10);
-            $city['wall'] = Util::round($city['wall'] / 10);
-            //내정 감소
-            $dec = Util::round($cityCrew / 10);
-            $city['agri'] -= $dec;
-            $city['comm'] -= $dec;
-            $city['secu'] -= $dec;
-            if($city['agri'] < 0) { $city['agri'] = 0; }
-            if($city['comm'] < 0) { $city['comm'] = 0; }
-            if($city['secu'] < 0) { $city['secu'] = 0; }
-            // 병사수 변경
-            $query = "update general set crew='{$general['crew']}',killcrew=killcrew+'$mykillnum',deathcrew=deathcrew+'$mydeathnum' where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            // 숙련도 증가
-            addGenDex($general['no'], $general['atmos'], $general['train'], $general['crewtype'], $mykillnum);
-            addGenDex($general['no'], $general['atmos'], $general['train'], 40, $mydeathnum);
-            // 죽은수 기술로 누적
-            $num = Util::round($mydeathnum * 0.01);
-            // 국가보정
-            if($nation['type'] == 3 || $nation['type'] == 13)                                                                   { $num *= 1.1; }
-            if($nation['type'] == 5 || $nation['type'] == 6 || $nation['type'] == 7 || $nation['type'] == 8 || $nation['type'] == 12) { $num *= 0.9; }
-            // 부드러운 기술 제한
-            if(TechLimit($admin['startyear'], $year, $nation['tech'])) { $num = intdiv($num, 4); }
-            $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$gencount' where nation='{$nation['nation']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            // 죽은수 기술로 누적
-            $num = Util::round($mykillnum * 0.01);
-            // 국가보정
-            if($destnation['type'] == 3 || $destnation['type'] == 13){ 
-                $num *= 1.1; 
-            }
-            if($destnation['type'] == 5 || $destnation['type'] == 6 || $destnation['type'] == 7 || $destnation['type'] == 8 || $destnation['type'] == 12) {
-                $num *= 0.9;
-            }
-            // 부드러운 기술 제한
-            if(TechLimit($admin['startyear'], $year, $destnation['tech'])) { $num = intdiv($num, 4); }
-            $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$destgencount' where nation='{$destnation['nation']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            //양국 평균 기술가격
-            //$techRatio = (getTechCost($nation['tech']) + getTechCost($destnation['tech'])) / 2;
-            $techRatio = 1.0;
-            // 죽은수 도시 재정으로 누적 60%
-            $num = Util::round(($mykillnum+$mydeathnum) * 0.6 * $techRatio);
-            // 국가보정
-            if($destnation['type'] == 1)                            { $num *= 1.1; }
-            if($destnation['type'] == 9 || $destnation['type'] == 10) { $num *= 0.9; }
-            $query = "update city set dead=dead+'$num',def='{$city['def']}',wall='{$city['wall']}',agri='{$city['agri']}',comm='{$city['comm']}',secu='{$city['secu']}' where city='{$city['city']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            // 죽은수 도시 재정으로 누적 40%
-            $num = Util::round(($mykillnum+$mydeathnum) * 0.4 * $techRatio);
-            // 국가보정
-            if($nation['type'] == 1)                        { $num *= 1.1; }
-            if($nation['type'] == 9 || $nation['type'] == 10) { $num *= 0.9; }
-            $query = "update city set dead=dead+'$num' where city='{$general['city']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-            //분쟁현황에 추가
-            $city = addConflict($city, $general['nation'], $mykillnum);
-
-            // 병사 소진시 성 함락
-            if($city['def'] <= 0) {
-                $exp += 1000;
-                $exp2++;
-
-                pushGenLog($general, $log);
-                pushBatLog($general, $batlog);
-                pushBatRes($general, $batres);
-                pushGeneralPublicRecord($alllog, $year, $month);
-                pushWorldHistory($history, $year, $month);
-                $log = [];
-                $batlog = [];
-                $batres = [];
-                $alllog = [];
-                $history = [];
-
-                ConquerCity($admin, $general, $city, $nation, $destnation);
-                break;
-            // 공격 장수 병사 소진시 실패 처리
-            } elseif($general['crew'] <= 0) {
-                $josaYi = JosaUtil::pick($generalCrewType->name, '이');
-                $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 {$generalCrewType->name}{$josaYi} 퇴각했습니다.";
-                $log[] = "<C>●</>퇴각했습니다.";
-
-                $query = "update general set deathnum=deathnum+1 where no='{$general['no']}'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-                break;
-            } elseif($myRice <= Util::round($general['crew']/100)) {
-                $josaYi = JosaUtil::pick($generalCrewType->name, '이');
-                $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 {$generalCrewType->name}{$josaYi} 퇴각했습니다.";
-                $log[] = "<C>●</>군량 부족으로 퇴각합니다.";
-
-                $query = "update general set deathnum=deathnum+1 where no='{$general['no']}'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-                break;
-            }
-        // 장수 대결
-        } else {
-            $oppose = MYDB_fetch_array($result);
-            setLeadershipBonus($oppose, $destnation['level']);
-            $opposeCrewType = GameUnitConst::byId($oppose['crewtype']);
-
-            $josaYi = JosaUtil::pick($opposeCrewType->name, '이');
-            $josaWa = JosaUtil::pick($generalCrewType->name, '와');
-            $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 ".$generalCrewType->name."{$josaWa} <Y>{$oppose['name']}</>의 ".$opposeCrewType->name."{$josaYi} 대결합니다.";
-            $josaUl = JosaUtil::pick($opposeCrewType->name, '을');
-            $josaRo = JosaUtil::pick($generalCrewType->name, '로');
-            $log[] = "<C>●</>".$generalCrewType->name."{$josaRo} <Y>{$oppose['name']}</>의 ".$opposeCrewType->name."{$josaUl} <M>공격</>합니다.";
-            $josaUl = JosaUtil::pick($generalCrewType->name, '을');
-            $opplog[] = "<C>●</>".$opposeCrewType->name."{$josaRo} <Y>{$general['name']}</>의 ".$generalCrewType->name."{$josaUl} <M>수비</>합니다.";
-
-            $oppAtmos = 0;
-            if($oppose['item'] == 3) {
-                //탁주 사용
-                $oppAtmos += 3;
-                $query = "update general set item=0 where no='{$oppose['no']}'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-                $josaUl = JosaUtil::pick($oppose['item'], '을');
-                $opplog[] = "<C>●</><C>".getItemName($oppose['item'])."</>{$josaUl} 사용!";
-                $oppose['item'] = 0;
-            } elseif($oppose['item'] >= 14 && $oppose['item'] <= 16) {
-                //의적주, 두강주, 보령압주 사용
-                $oppAtmos += 5;
-            } elseif($oppose['item'] >= 19 && $oppose['item'] <= 20) {
-                //춘화첩, 초선화 사용
-                $oppAtmos += 7;
-            }
-            $oppTrain = 0;
-            if($oppose['item'] == 4) {
-                //청주 사용
-                $oppTrain += 3;
-                $query = "update general set item=0 where no='{$oppose['no']}'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-                $josaUl = JosaUtil::pick($oppose['item'], '을');
-                $opplog[] = "<C>●</><C>".getItemName($oppose['item'])."</>{$josaUl} 사용!";
-                $oppose['item'] = 0;
-            } elseif($oppose['item'] >= 12 && $oppose['item'] <= 13) {
-                //과실주, 이강주 사용
-                $oppTrain += 5;
-            } elseif($oppose['item'] >= 17 && $oppose['item'] <= 18) {
-                //철벽서, 단결도 사용
-                $oppTrain += 7;
-            }
-
-            $general['train'] += 1; //훈련 상승
-            if($general['train'] > GameConst::$maxTrainByWar) { $general['train'] = GameConst::$maxTrainByWar; }
-            $oppose['train'] += 1; //훈련 상승
-            if($oppose['train'] > GameConst::$maxTrainByWar) { $oppose['train'] = GameConst::$maxTrainByWar; }
-
-            $query = "update general set recwar='{$general['turntime']}',train='{$general['train']}',warnum=warnum+1 where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            $query = "update general set recwar='{$general['turntime']}',train='{$oppose['train']}',warnum=warnum+1 where no='{$oppose['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-            //특기보정 : 저격(수극), 활무기저격
-            $snipe = false;
-            $snipeItem = false;
-            if(!$snipe && $general['special2'] == 70 && Util::randBool(1/3)){
-                $snipe = true;
-            }
-            if(!$snipe && in_array($general['weap'], [10, 14, 18, 22]) && Util::randBool(1/5)){
-                $snipe = true;
-            }
-            if(!$snipe && $general['item'] == 2){
-                if(Util::randBool(1/5)){
-                    $snipe = true;
-                    $snipeItem = true;
-                }
-                //수극을 사용했지만 저격 실패한 케이스도 '필요하면' 넣을 것.(밸런스)       
-                
-            }
-            if($snipe) {
-                //수극 사용
-                if($snipeItem) {
-                    $josaUl = JosaUtil::pick($general['item'], '을');
-                    $log[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용!";
-                    $general['item'] = 0;
-                    $db->update('general', ['item'=>0], 'no=%i', $general['no']);
-                }
-                $log[] = "<C>●</>상대를 <C>저격</>했다!";
-                $batlog[] = "<C>●</>상대를 <C>저격</>했다!";
-                $opplog[] = "<C>●</>상대에게 <R>저격</>당했다!";
-                $oppbatlog[] = "<C>●</>상대에게 <R>저격</>당했다!";
-                // 부상
-                $oppose['injury'] += rand() % 41 + 20;   // 20 ~ 60
-                if($oppose['injury'] > 80) { $oppose['injury'] = 80; }
-            }
-            else if($snipeItem) {
-                $db->update('general', ['item'=>0], 'no=%i', $general['no']);
-                $josaYi = JosaUtil::pick($general['item'], '이');
-                $batlog[] = "<C>●</><C>".getItemName($general['item'])."</>{$josaYi} 빗나갑니다!";
-                $general['item'] = 0;
-            }
-
-            //특기보정 : 저격(수극), 활무기저격
-            $snipe = false;
-            $snipeItem = false;
-            if(!$snipe && $oppose['special2'] == 70 && Util::randBool(1/3)){
-                $snipe = true;
-            }
-            if(!$snipe && in_array($oppose['weap'], [10, 14, 18, 22]) && Util::randBool(1/5)){
-                $snipe = true;
-            }
-            if(!$snipe && $oppose['item'] == 2){
-                if(Util::randBool(1/5)){
-                    $snipe = true;
-                    $snipeItem = true;
-                }
-                //수극을 사용했지만 저격 실패한 케이스도 '필요하면' 넣을 것.(밸런스)       
-            }
-            if($snipe) {
-                //수극 사용
-                if($snipeItem) {
-                    $josaUl = JosaUtil::pick($oppose['item'], '을');
-                    $log[] = "<C>●</><C>".getItemName($oppose['item'])."</>{$josaUl} 사용!";
-                    $oppose['item'] = 0;
-                    $db->update('general', ['item'=>0], 'no=%i', $oppose['no']);
-                }
-                $oppbatlog[] = "<C>●</>상대를 <C>저격</>했다!";
-                $opplog[] = "<C>●</>상대를 <C>저격</>했다!";
-                $batlog[] = "<C>●</>상대에게 <R>저격</>당했다!";
-                $log[] = "<C>●</>상대에게 <R>저격</>당했다!";
-                // 부상
-                $general['injury'] += rand() % 41 + 20;   // 20 ~ 60
-                if($general['injury'] > 80) { $general['injury'] = 80; }
-            }
-            else if($snipeItem) {
-                $db->update('general', ['item'=>0], 'no=%i', $oppose['no']);
-                $josaYi = JosaUtil::pick($oppose['item'], '이');
-                $batlog[] = "<C>●</><C>".getItemName($oppose['item'])."</>{$josaYi} 빗나갑니다!";
-                $oppose['item'] = 0;
-            }
-
-            $mykillnum = 0; $mydeathnum = 0;
-            $opkillnum = 0; $opdeathnum = 0;
-            while($phase < $warphase) {
-                $phase++;
-
-                $myAtt = $generalCrewType->getComputedAttack($general, $nation['tech']);
-                $myDef = $generalCrewType->getComputedDefence($general, $nation['tech']);
-
-                $opAtt = $opposeCrewType->getComputedAttack($oppose, $destnation['tech']);
-                $opDef = $opposeCrewType->getComputedAttack($oppose, $destnation['tech']);
-                // 감소할 병사 수
-                $myCrew = GameConst::$armperphase + $opAtt - $myDef;
-                $opCrew = GameConst::$armperphase + $myAtt - $opDef;
-                if($myCrew <= 0) { $myCrew = rand() % 90 + 10; }
-                if($opCrew <= 0) { $opCrew = rand() % 90 + 10; }
-                //훈련 사기따라
-                $myCrew = getCrew($myCrew, CharAtmos($oppose['atmos']+$oppAtmos+$oppAtmosBonus, $oppose['personal']), CharTrain($general['train']+$genTrain+$genTrainBonus, $general['personal']));
-                $opCrew = getCrew($opCrew, CharAtmos($general['atmos']+$genAtmos+$genAtmosBonus, $general['personal']), CharTrain($oppose['train']+$oppTrain+$oppTrainBonus, $oppose['personal']));
-                //숙련도 따라
-                $genDexAtt = getGenDex($general, $general['crewtype']);
-                $genDexDef = getGenDex($general, $oppose['crewtype']);
-                $oppDexAtt = getGenDex($oppose, $oppose['crewtype']);
-                $oppDexDef = getGenDex($oppose, $general['crewtype']);
-                $opCrew *= getDexLog($genDexAtt, $oppDexDef);
-                $myCrew *= getDexLog($oppDexAtt, $genDexDef);
-
-                $myAvoid = 1;
-                $opAvoid = 1;
-                // 병종간 특성
-                if($generalCrewType->magicCoef) {
-                    $int = Util::round(getGeneralIntel($general, true, true, true, false));
-                    $ratio2 = $int / 100 * $generalCrewType->magicCoef;
-
-                    // 특기보정 : 신산
-                    if($general['special2'] == 41) { $ratio2 += 0.2; }
-
-                    if(Util::randBool($ratio2)) {
-                        $ratio = rand() % 100;
-                        // 특기보정 : 귀병, 신산, 환술, 신중
-                        if($general['special2'] == 40) { $ratio += 20; }
-                        if($general['special2'] == 41) { $ratio += 20; }
-                        if($general['special2'] == 42) { $ratio += 10; }
-                        if($general['special2'] == 44) { $ratio += 100; }
-                        if($ratio >= 30) {
-                            // 특기보정 : 환술, 집중
-                            if($general['special2'] == 42) { $opCrew *= 1.3; }
-                            if($general['special2'] == 43) { $opCrew *= 1.5; }
-                            $type = rand() % 5; // 0~4
-                            switch($type) {
-                            case 0:
-                                $ratio = rand() % 100;
-                                // 특기보정 : 반계
-                                if($oppose['special2'] == 45 && $ratio > 70) {
-                                    $batlog[] = "<C>●</><D>위보</>를 <R>역으로</> 당했다!";
-                                    $oppbatlog[] = "<C>●</><C>반계</>로 상대의 <D>위보</>를 되돌렸다!";
-                                    $myCrew *= 1.2;
-                                } else {
-                                    $batlog[] = "<C>●</><D>위보</>를 <C>성공</>했다!";
-                                    $oppbatlog[] = "<C>●</><D>위보</>에 당했다!";
-                                    $opCrew *= 1.2;
-                                }
-                                break;
-                            case 1:
-                                $ratio = rand() % 100;
-                                // 특기보정 : 반계
-                                if($oppose['special2'] == 45 && $ratio > 70) {
-                                    $batlog[] = "<C>●</><D>매복</>을 <R>역으로</> 당했다!";
-                                    $oppbatlog[] = "<C>●</><C>반계</>로 상대의 <D>매복</>을 되돌렸다!";
-                                    $myCrew *= 1.4;
-                                } else {
-                                    $batlog[] = "<C>●</><D>매복</>을 <C>성공</>했다!";
-                                    $oppbatlog[] = "<C>●</><D>매복</>에 당했다!";
-                                    $opCrew *= 1.4;
-                                }
-                                break;
-                            case 2:
-                                $ratio = rand() % 100;
-                                // 특기보정 : 반계
-                                if($oppose['special2'] == 45 && $ratio > 70) {
-                                    $batlog[] = "<C>●</><D>반목</>을 <R>역으로</> 당했다!";
-                                    $oppbatlog[] = "<C>●</><C>반계</>로 상대의 <D>반목</>을 되돌렸다!";
-                                    $myCrew *= 1.6;
-                                } else {
-                                    $batlog[] = "<C>●</><D>반목</>을 <C>성공</>했다!";
-                                    $oppbatlog[] = "<C>●</><D>반목</>에 당했다!";
-                                    $opCrew *= 1.6;
-                                    // 특기보정 : 반계
-                                    if($general['special2'] == 45) { $opCrew *= 2; }
-                                }
-                                break;
-                            case 3:
-                                $ratio = rand() % 100;
-                                // 특기보정 : 반계
-                                if($oppose['special2'] == 45 && $ratio > 70) {
-                                    $batlog[] = "<C>●</><D>화계</>를 <R>역으로</> 당했다!";
-                                    $oppbatlog[] = "<C>●</><C>반계</>로 상대의 <D>화계</>를 되돌렸다!";
-                                    $myCrew *= 1.8;
-                                } else {
-                                    $batlog[] = "<C>●</><D>화계</>를 <C>성공</>했다!";
-                                    $oppbatlog[] = "<C>●</><D>화계</>에 당했다!";
-                                    $opCrew *= 1.8;
-                                }
-                                break;
-                            case 4:
-                                $ratio = rand() % 100;
-                                // 특기보정 : 반계
-                                if($oppose['special2'] == 45 && $ratio > 70) {
-                                    $batlog[] = "<C>●</><D>혼란</>을 <R>역으로</> 당했다!";
-                                    $oppbatlog[] = "<C>●</><C>반계</>로 상대의 <D>혼란</>을 되돌렸다!";
-                                    $myCrew *= 2.0;
-                                } else {
-                                    $batlog[] = "<C>●</><D>혼란</>을 <C>성공</>했다!";
-                                    $oppbatlog[] = "<C>●</><D>혼란</>에 당했다!";
-                                    $opCrew *= 2.0;
-                                }
-                                break;
-                            }
-                        } else {
-                            $type = rand() % 5; // 0~4
-                            switch($type) {
-                            case 0:
-                                $batlog[] = "<C>●</><D>위보</>를 <R>실패</>했다!";
-                                $oppbatlog[] = "<C>●</><D>위보</>를 간파했다!";
-                                $opCrew /= 1.1;   $myCrew *= 1.1;
-                                break;
-                            case 1:
-                                $batlog[] = "<C>●</><D>매복</>을 <R>실패</>했다!";
-                                $oppbatlog[] = "<C>●</><D>매복</>을 간파했다!";
-                                $opCrew /= 1.2;   $myCrew *= 1.2;
-                                break;
-                            case 2:
-                                $batlog[] = "<C>●</><D>반목</>을 <R>실패</>했다!";
-                                $oppbatlog[] = "<C>●</><D>반목</>을 간파했다!";
-                                $opCrew /= 1.3;   $myCrew *= 1.3;
-                                break;
-                            case 3:
-                                $batlog[] = "<C>●</><D>화계</>를 <R>실패</>했다!";
-                                $oppbatlog[] = "<C>●</><D>화계</>를 간파했다!";
-                                $opCrew /= 1.4;   $myCrew *= 1.4;
-                                break;
-                            case 4:
-                                $batlog[] = "<C>●</><D>혼란</>을 <R>실패</>했다!";
-                                $oppbatlog[] = "<C>●</><D>혼란</>을 간파했다!";
-                                $opCrew /= 1.5;   $myCrew *= 1.5;
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                // 상대 장수 병종간 특성
-                if($opposeCrewType->magicCoef) {
-                    $int = Util::round(getGeneralIntel($oppose, true, true, true, false));
-                    $ratio2 = $int / 100 * $opposeCrewType->magicCoef;
-
-                    // 특기보정 : 신산
-                    if($oppose['special2'] == 41) { $ratio2 += 0.2; }
-
-                    if(Util::randBool($ratio2)) {
-                        $ratio = rand() % 100;
-                        // 특기보정 : 귀병, 신산, 환술, 신중
-                        if($oppose['special2'] == 40) { $ratio += 20; }
-                        if($oppose['special2'] == 41) { $ratio += 20; }
-                        if($oppose['special2'] == 42) { $ratio += 10; }
-                        if($oppose['special2'] == 44) { $ratio += 100; }
-                        if($ratio >= 30) {
-                            // 특기보정 : 환술, 집중
-                            if($oppose['special2'] == 42) { $myCrew *= 1.3; }
-                            if($oppose['special2'] == 43) { $myCrew *= 1.5; }
-                            $type = rand() % 5; // 0~4
-                            switch($type) {
-                            case 0:
-                                $ratio = rand() % 100;
-                                // 특기보정 : 반계
-                                if($general['special2'] == 45 && $ratio > 70) {
-                                    $oppbatlog[] = "<C>●</><D>위보</>를 <R>역으로</> 당했다!";
-                                    $batlog[] = "<C>●</><C>반계</>로 상대의 <D>위보</>를 되돌렸다!";
-                                    $opCrew *= 1.2;
-                                } else {
-                                    $oppbatlog[] = "<C>●</><D>위보</>를 <C>성공</>했다!";
-                                    $batlog[] = "<C>●</><D>위보</>에 당했다!";
-                                    $myCrew *= 1.2;
-                                }
-                                break;
-                            case 1:
-                                $ratio = rand() % 100;
-                                // 특기보정 : 반계
-                                if($general['special2'] == 45 && $ratio > 70) {
-                                    $oppbatlog[] = "<C>●</><D>매복</>을 <R>역으로</> 당했다!";
-                                    $batlog[] = "<C>●</><C>반계</>로 상대의 <D>매복</>을 되돌렸다!";
-                                    $opCrew *= 1.4;
-                                } else {
-                                    $oppbatlog[] = "<C>●</><D>매복</>을 <C>성공</>했다!";
-                                    $batlog[] = "<C>●</><D>매복</>에 당했다!";
-                                    $myCrew *= 1.4;
-                                }
-                                break;
-                            case 2:
-                                $ratio = rand() % 100;
-                                // 특기보정 : 반계
-                                if($general['special2'] == 45 && $ratio > 70) {
-                                    $oppbatlog[] = "<C>●</><D>반목</>을 <R>역으로</> 당했다!";
-                                    $batlog[] = "<C>●</><C>반계</>로 상대의 <D>반목</>을 되돌렸다!";
-                                    $opCrew *= 1.6;
-                                } else {
-                                    $oppbatlog[] = "<C>●</><D>반목</>을 <C>성공</>했다!";
-                                    $batlog[] = "<C>●</><D>반목</>에 당했다!";
-                                    $myCrew *= 1.6;
-                                    // 특기보정 : 반계
-                                    if($oppose['special2'] == 45) { $myCrew *= 2; }
-                                }
-                                break;
-                            case 3:
-                                $ratio = rand() % 100;
-                                // 특기보정 : 반계
-                                if($general['special2'] == 45 && $ratio > 70) {
-                                    $oppbatlog[] = "<C>●</><D>화계</>를 <R>역으로</> 당했다!";
-                                    $batlog[] = "<C>●</><C>반계</>로 상대의 <D>화계</>을 되돌렸다!";
-                                    $opCrew *= 1.8;
-                                } else {
-                                    $oppbatlog[] = "<C>●</><D>화계</>를 <C>성공</>했다!";
-                                    $batlog[] = "<C>●</><D>화계</>에 당했다!";
-                                    $myCrew *= 1.8;
-                                }
-                                break;
-                            case 4:
-                                $ratio = rand() % 100;
-                                // 특기보정 : 반계
-                                if($general['special2'] == 45 && $ratio > 70) {
-                                    $oppbatlog[] = "<C>●</><D>혼란</>을 <R>역으로</> 당했다!";
-                                    $batlog[] = "<C>●</><C>반계</>로 상대의 <D>혼란</>을 되돌렸다!";
-                                    $opCrew *= 2.0;
-                                } else {
-                                    $oppbatlog[] = "<C>●</><D>혼란</>을 <C>성공</>했다!";
-                                    $batlog[] = "<C>●</><D>혼란</>에 당했다!";
-                                    $myCrew *= 2.0;
-                                }
-                                break;
-                            }
-                        } else {
-                            $type = rand() % 5; // 0~4
-                            switch($type) {
-                            case 0:
-                                $oppbatlog[] = "<C>●</><D>위보</>를 <R>실패</>했다!";
-                                $batlog[] = "<C>●</><D>위보</>를 간파했다!";
-                                $myCrew /= 1.1;   $opCrew *= 1.1;
-                                break;
-                            case 1:
-                                $oppbatlog[] = "<C>●</><D>매복</>을 <R>실패</>했다!";
-                                $batlog[] = "<C>●</><D>매복</>을 간파했다!";
-                                $myCrew /= 1.2;   $opCrew *= 1.2;
-                                break;
-                            case 2:
-                                $oppbatlog[] = "<C>●</><D>반목</>을 <R>실패</>했다!";
-                                $batlog[] = "<C>●</><D>반목</>을 간파했다!";
-                                $myCrew /= 1.3;   $opCrew *= 1.3;
-                                break;
-                            case 3:
-                                $oppbatlog[] = "<C>●</><D>화계</>를 <R>실패</>했다!";
-                                $batlog[] = "<C>●</><D>화계</>를 간파했다!";
-                                $myCrew /= 1.4;   $opCrew *= 1.4;
-                                break;
-                            case 4:
-                                $oppbatlog[] = "<C>●</><D>혼란</>을 <R>실패</>했다!";
-                                $batlog[] = "<C>●</><D>혼란</>을 간파했다!";
-                                $myCrew /= 1.5;   $opCrew *= 1.5;
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                // 특기보정: 돌격
-                //XXX: 목우!!!!
-                if($oppose['crewtype'] == 43 && $general['special2'] != 60) { // 목우
-                    $r = 0;
-                    $r += $oppose['atmos'] + $oppAtmos + $oppAtmosBonus;
-                    $r += $oppose['train'] + $oppTrain + $oppTrainBonus;
-                    $ratio = rand() % 400;  // 최대 50% 저지
-                    if($ratio < $r && $opAvoid == 1) {
-                        $batlog[] = "<C>●</><R>저지</>당했다!</>";
-                        $oppbatlog[] = "<C>●</>상대를 <C>저지</>했다!</>";
-                        $opAvoid = 0;
-                        continue;
-                    }
-                }
-
-                $opCrew *= $generalCrewType->getAttackCoef($opposeCrewType);
-                $myCrew *= $generalCrewType->getDefenceCoef($opposeCrewType);
-
-                //군주 공격 보정 10%
-                if($general['level'] == 12) {
-                    $opCrew = $opCrew * 1.10;
-                //참모, 장군 공격 보정 5%
-                } elseif($general['level'] == 11 || $general['level'] == 10 || $general['level'] == 8 || $general['level'] == 6) {
-                    $opCrew = $opCrew * 1.05;
-                }
-
-                //상대장수 관직 보정
-                //군주 방어 보정 10%
-                if($oppose['level'] == 12) {
-                    $opCrew = $opCrew * 0.90;
-                //참모, 모사 방어 보정 5%
-                } elseif($oppose['level'] == 11 || $oppose['level'] == 9 || $oppose['level'] == 7 || $oppose['level'] == 5) {
-                    $opCrew = $opCrew * 0.95;
-                } elseif($oppose['level'] == 4 && $oppose['no'] == $city['gen1']) { // 태수 보정
-                    $opCrew = $opCrew * 0.95;
-                } elseif($oppose['level'] == 3 && $oppose['no'] == $city['gen2']) { // 군사 보정
-                    $opCrew = $opCrew * 0.95;
-                } elseif($oppose['level'] == 2 && $oppose['no'] == $city['gen3']) { // 시중 보정
-                    $opCrew = $opCrew * 0.95;
-                }
-
-                //레벨 보정
-                $myCrew = $myCrew * (max(1, 100 - $general['explevel']/3)/100);
-                $opCrew = $opCrew / (max(1, 100 - $general['explevel']/3)/100);
-                $myCrew = $myCrew / (max(1, 100 -  $oppose['explevel']/3)/100);
-                $opCrew = $opCrew * (max(1, 100 -  $oppose['explevel']/3)/100);
-
-                // 특기보정 : 기병, 돌격, 무쌍, 보병, 견고, 척사, 의술(청낭서, 태평청령)
-                if($general['special2'] == 52) { $opCrew *= 1.20; }
-                if($general['special2'] == 60) { $opCrew *= 1.10; }
-                if($general['special2'] == 61) { $opCrew *= 1.10; }
-                if($general['special2'] == 50) { $myCrew *= 0.90; }
-                if($general['special2'] == 62) { $myCrew *= 0.90; }
-                if($general['special2'] == 75) {
-                    if($opposeCrewType->reqCities || $opposeCrewType->reqRegions)
-                    {
-                        $opCrew *= 1.1; $myCrew *= 0.9;
-                    }
-                }
-                $ratio = rand() % 100; // 0 ~ 99
-                if(($general['special2'] == 73 || $general['item'] == 23 || $general['item'] == 24) && $ratio > 80 && $myAvoid == 1) {
-                    $batlog[] = "<C>●</><C>치료</>했다!</>";
-                    $myCrew /= 1.5; // 66%만 소모
-                    $myAvoid = 0;
-                }
-
-                // 상대 특기보정 : 기병, 무쌍, 보병, 견고, 척사, 의술(청낭서, 태평청령)
-                if($oppose['special2'] == 52) { $myCrew *= 1.10; }
-                if($oppose['special2'] == 61) { $myCrew *= 1.10; }
-                if($oppose['special2'] == 50) { $opCrew *= 0.80; }
-                if($oppose['special2'] == 62) { $myCrew *= 1.10; }
-                if($oppose['special2'] == 75) {
-                    if($generalCrewType->reqCities || $generalCrewType->reqRegions)
-                    {
-                        $myCrew *= 1.1; $opCrew *= 0.9;
-                    }
-                }
-                $ratio = rand() % 100; // 0 ~ 99
-                if(($oppose['special2'] == 73 || $oppose['item'] == 23 || $oppose['item'] == 24) && $ratio > 80 && $opAvoid == 1) {
-                    $oppbatlog[] = "<C>●</><C>치료</>했다!</>";
-                    $opCrew /= 1.5; // 66%만 소모
-                    $opAvoid = 0;
-                }
-
-                //크리
-                $rd = rand() % 100; // 0 ~ 99
-                $ratio = $generalCrewType->getCriticalRatio($general);
-                // 특기보정 : 무쌍, 필살
-                if($general['special2'] == 61) { $ratio += 10; }
-                if($general['special2'] == 71) { $ratio += 20; }
-                if($ratio >= $rd && $myAvoid == 1) {
-                    $batlog[] = "<C>●</><C>필살</>공격!</>";
-                    $oppbatlog[] = "<C>●</>상대의 <R>필살</>공격!</>";
-                    $opCrew = CriticalScore2($opCrew);
-                    $myAvoid = 0;
-
-                    // 특기보정 : 격노
-                    if($oppose['special2'] == 74) {
-                        if(rand() % 100 < 50) {
-                            $batlog[] = "<C>●</>필살 공격에 상대가 <R>격노</>했다!</>";
-                            $oppbatlog[] = "<C>●</>상대의 필살 공격에 <C>격노</>했다!</>";
-                            $myCrew = CriticalScore2($myCrew);
-                            $opAvoid = 0;
-                        }
-                    }
-                }
-                //크리
-                $rd = rand() % 100; // 0 ~ 99
-                $ratio = $opposeCrewType->getCriticalRatio($oppose);
-                // 특기보정 : 필살
-                if($oppose['special2'] == 71) { $ratio += 20; }
-                if($ratio >= $rd && $opAvoid == 1) {
-                    $oppbatlog[] = "<C>●</><C>필살</>공격!</>";
-                    $batlog[] = "<C>●</>상대의 <R>필살</>공격!</>";
-                    $myCrew = CriticalScore2($myCrew);
-                    $opAvoid = 0;
-
-                    // 특기보정 : 격노
-                    if($general['special2'] == 74) {
-                        if(rand() % 100 < 33) {
-                            $oppbatlog[] = "<C>●</>필살 공격에 상대가 <R>진노</>했다!</>";
-                            $batlog[] = "<C>●</>상대의 필살 공격에 <C>진노</>했다!</>";
-                            $opCrew = CriticalScore2($opCrew);
-                            $myAvoid = 0;
-                            $warphase++;
-                        } elseif(rand() % 100 < 33) {
-                            $oppbatlog[] = "<C>●</>필살 공격에 상대가 <R>격노</>했다!</>";
-                            $batlog[] = "<C>●</>상대의 필살 공격에 <C>격노</>했다!</>";
-                            $opCrew = CriticalScore2($opCrew);
-                            $myAvoid = 0;
-                        }
-                    }
-                }
-
-                //회피
-                $ratio = rand() % 100; // 0 ~ 99
-                $ratio2 = $generalCrewType->avoid;   //회피율
-                $ratio2 = Util::round($ratio2 * $general['train'] / 100); //훈련 반영
-                //특기보정 : 돌격, 궁병
-                if($oppose['special2'] == 60) { $ratio2 -= 100; }
-                if($general['special2'] == 51) { $ratio2 += 20; }
-                //도구 보정 : 둔갑천서, 태평요술
-                if($general['item'] == 26 || $general['item'] == 25) { $ratio2 += 20; }
-                LogText('avoid1', [date("Ymd_His"), $generalCrewType->id, $general['train'], $ratio2]);
-                if($ratio < $ratio2 && $myAvoid == 1) {
-                    // 특기보정 : 격노
-                    if($oppose['special2'] == 74 && rand() % 100 < 50) {
-                        $batlog[] = "<C>●</>회피 시도에 상대가 <R>격노</>했다!</>";
-                        $oppbatlog[] = "<C>●</>상대의 회피 시도에 <C>격노</>했다!</>";
-                        $myCrew = CriticalScore2($myCrew);
-                        $opAvoid = 0;
-                    } else {
-                        LogText('avoid1', true);
-                        $batlog[] = "<C>●</><C>회피</>했다!</>";
-                        $oppbatlog[] = "<C>●</>상대가 <R>회피</>했다!</>";
-                        $myCrew /= 5; // 20%만 소모
-                        $myAvoid = 0;
-                    }
-                }
-                //회피
-                $ratio = rand() % 100; // 0 ~ 99
-                $ratio2 = $opposeCrewType->avoid;   //회피율
-                $ratio2 = Util::round($ratio2 * $oppose['train'] / 100); //훈련 반영
-                // 특기보정 : 돌격, 궁병
-                if($general['special2'] == 60) { $ratio2 -= 100; }
-                if($oppose['special2'] == 51) { $ratio2 += 20; }
-                //도구 보정 : 둔갑천서, 태평요술
-                if($oppose['item'] == 26 || $oppose['item'] == 25) { $ratio2 += 20; }
-                LogText('avoid2', [date("Ymd_His"), $opposeCrewType->id, $oppose['train'], $ratio2]);
-                if($ratio < $ratio2 && $opAvoid == 1) {
-                    // 특기보정 : 격노
-                    if($general['special2'] == 74 && rand() % 100 < 33) {
-                        $oppbatlog[] = "<C>●</>회피 시도에 상대가 <R>진노</>했다!</>";
-                        $batlog[] = "<C>●</>상대의 회피 시도에 <C>진노</>했다!</>";
-                        $opCrew = CriticalScore2($opCrew);
-                        $myAvoid = 0;
-                        $warphase++;
-                    } elseif($general['special2'] == 74 && rand() % 100 < 33) {
-                        $oppbatlog[] = "<C>●</>회피 시도에 상대가 <R>격노</>했다!</>";
-                        $batlog[] = "<C>●</>상대의 회피 시도에 <C>격노</>했다!</>";
-                        $opCrew = CriticalScore2($opCrew);
-                        $myAvoid = 0;
-                    } else {
-                        LogText('avoid2', true);
-                        $oppbatlog[] = "<C>●</><C>회피</>했다!</>";
-                        $batlog[] = "<C>●</>상대가 <R>회피</>했다!</>";
-                        $opCrew /= 5; // 20%만 소모
-                        $opAvoid = 0;
-                    }
-                }
-
-                //랜타추가
-                $opCrew *= (rand() % 21 + 90)/100; // 90~110%
-                $myCrew *= (rand() % 21 + 90)/100; // 90~110%
-
-                //특기보정 : 위압
-                if($general['special2'] == 63 && $phase == 1 && $general['crew'] >= 1000 && $general['atmos'] >= 90 && $general['train'] >= 90) {
-                    $batlog[] = "<C>●</>상대에게 <C>위압</>을 줬다!</>";
-                    $oppbatlog[] = "<C>●</>상대에게 <R>위압</>받았다!</>";
-                    $myCrew = 0;
-                }
-                //특기보정: 위압
-                if($oppose['special2'] == 63 && $phase == 1 && $oppose['crew'] >= 1000 && $oppose['atmos'] >= 90 && $oppose['train'] >= 90) {
-                    $batlog[] = "<C>●</>상대에게 <R>위압</>받았다!</>";
-                    $oppbatlog[] = "<C>●</>상대에게 <C>위압</>을 줬다!</>";
-                    $opCrew = 0;
-                }
-
-                $general['crew'] -= Util::round($myCrew);
-                $oppose['crew'] -= Util::round($opCrew);
-                $tempMyCrew = $myCrew; $tempOpCrew = $opCrew;
-                $tempGeneralCrew = $general['crew']; $tempOpposeCrew = $oppose['crew'];
-                if($general['crew'] <= 0 && $oppose['crew'] <= 0) {
-                    $r1 = $tempGeneralCrew / $tempMyCrew;
-                    $r2 = $tempOpposeCrew / $tempOpCrew;
-
-                    if($r1 > $r2) {
-                        $offset = Util::round($tempOpposeCrew*$tempMyCrew/$tempOpCrew);
-                        $myCrew += $offset;
-                        $general['crew'] -= $offset;
-                        $opCrew += $tempOpposeCrew;
-                        $oppose['crew'] = 0;
-                    } else {
-                        $offset = Util::round($tempGeneralCrew*$tempOpCrew/$tempMyCrew);
-                        $opCrew += $offset;
-                        $oppose['crew'] -= $offset;
-                        $myCrew += $tempGeneralCrew;
-                        $general['crew'] = 0;
-                    }
-                } elseif($general['crew'] * $oppose['crew'] <= 0) {
-                    if($oppose['crew'] < 0) {
-                        $offset = Util::round($tempOpposeCrew*$tempMyCrew/$tempOpCrew);
-                        $myCrew += $offset;
-                        $general['crew'] -= $offset;
-                        $opCrew += $tempOpposeCrew;
-                        $oppose['crew'] = 0;
-                    }
-                    if($general['crew'] < 0) {
-                        $offset = Util::round($tempGeneralCrew*$tempOpCrew/$tempMyCrew);
-                        $opCrew += $offset;
-                        $oppose['crew'] -= $offset;
-                        $myCrew += $tempGeneralCrew;
-                        $general['crew'] = 0;
-                    }
-                }
-
-                $exp += $opCrew;
-                $opexp += $myCrew;
-                $general['crew'] = Util::round($general['crew']);
-                $oppose['crew'] = Util::round($oppose['crew']);
-                $myCrew = Util::round($myCrew);
-                $opCrew = Util::round($opCrew);
-                $batlog[] = "<C>●</> $phase : <Y1>【{$general['name']}】</> <C>{$general['crew']} (-$myCrew)</> VS <C>{$oppose['crew']} (-$opCrew)</> <Y1>【{$oppose['name']}】</>";
-                $oppbatlog[] = "<C>●</> $phase : <Y1>【{$oppose['name']}】</> <C>{$oppose['crew']} (-$opCrew)</> VS <C>{$general['crew']} (-$myCrew)</> <Y1>【{$general['name']}】</>";
-
-                $mykillnum += $opCrew; $mydeathnum += $myCrew;
-                $opkillnum += $myCrew; $opdeathnum += $opCrew;
-
-                // 중간 쌀 체크
-                $myRice = Util::round($exp / 50);
-                // 성격 보정
-                $myRice = CharExperience($myRice, $general['personal']);
-                // 쌀 소모
-                $myRice = ($myRice * 5 * getCrewtypeRice($generalCrewType, $nation['tech']));
-                // 결과 쌀
-                $myRice = $general['rice'] - $myRice;
-
-                // 중간 쌀 체크
-                $opRice = Util::round($opexp / 50 * 0.8);
-                // 성격 보정
-                $opRice = CharExperience($opRice, $oppose['personal']);
-                // 쌀 소모
-                $opRice = ($opRice * 5 * getCrewtypeRice($opposeCrewType, $destnation['tech']));
-                // 결과 쌀
-                $opRice = $oppose['rice'] - $opRice;
-
-                if($opRice <= Util::round($oppose['crew']/100)) { break; }
-                if($myRice <= Util::round($general['crew']/100)) { break; }
-
-                if($oppose['crew'] <= 0) { break; }
-                if($general['crew'] <= 0) { break; }
-            }
-
-            $render_attacker = [
-                'crewtype' => mb_substr($generalCrewType->name, 0, 2),
-                'name'=> $general['name'],
-                'remain_crew' => $general['crew'],
-                'killed_crew' => -$mydeathnum
-            ];
-            $render_defender = [
-                'crewtype' => mb_substr($opposeCrewType->name, 0, 2),
-                'name'=> $oppose['name'],
-                'remain_crew' => $oppose['crew'],
-                'killed_crew' => -$opdeathnum
-            ];
-
-            $res = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
-                'year'=>$year,
-                'month'=>$month,
-                'war_type'=>'attack',
-                'war_type_str'=>'→',
-                'me' => $render_attacker,
-                'you' => $render_defender,
-            ]));
-
-            $oppres = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
-                'year'=>$year,
-                'month'=>$month,
-                'war_type'=>'defense',
-                'war_type_str'=>'←',
-                'me' => $render_defender,
-                'you' => $render_attacker,
-            ]));
-
-            $log[] = $res;
-            $batlog[] = $res;
-            $batres[] = $res;
-            $opplog[] = $oppres;
-            $oppbatlog[] = $oppres;
-            $oppbatres[] = $oppres;
-
-            $deadAmount['att'] = $deadAmount['att'] + $mydeathnum;
-            $deadAmount['def'] = $deadAmount['def'] + $opdeathnum;
-
-            // 상대장수 부상
-            $ratio = rand() % 100;
-            if($ratio >= 95) {
-                $opplog[] = "<C>●</>전투중 <R>부상</>당했다!";
-                $oppose['injury'] += rand() % 71 + 10;   // 10 ~ 80
-                if($oppose['injury'] > 80) { $oppose['injury'] = 80; }
-            }
-            // 병사수 변경
-            $query = "update general set injury='{$oppose['injury']}',crew='{$oppose['crew']}',killcrew=killcrew+'$opkillnum',deathcrew=deathcrew+'$opdeathnum' where no='{$oppose['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            // 숙련도 증가
-            addGenDex($oppose['no'], $general['atmos'], $general['train'], $oppose['crewtype'], $opkillnum * 0.9);
-            addGenDex($oppose['no'], $general['atmos'], $general['train'], $general['crewtype'], $opdeathnum * 0.9);
-            // 죽은수 기술로 누적
-            $num = Util::round($mydeathnum * 0.01);
-            // 국가보정
-            if($nation['type'] == 3 || $nation['type'] == 13)                                                                   { $num *= 1.1; }
-            if($nation['type'] == 5 || $nation['type'] == 6 || $nation['type'] == 7 || $nation['type'] == 8 || $nation['type'] == 12) { $num *= 0.9; }
-            // 부드러운 기술 제한
-            if(TechLimit($admin['startyear'], $year, $nation['tech'])) { $num = intdiv($num, 4); }
-            $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$gencount' where nation='{$nation['nation']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-            // 장수 부상
-            $ratio = rand() % 100;
-            if($ratio >= 95) {
-                $log[] = "<C>●</>전투중 <R>부상</>당했다!";
-                $general['injury'] += rand() % 71 + 10;   // 10 ~ 80
-                if($general['injury'] > 80) { $general['injury'] = 80; }
-            }
-            // 병사수 변경
-            $query = "update general set injury='{$general['injury']}',crew='{$general['crew']}',killcrew=killcrew+'$mykillnum',deathcrew=deathcrew+'$mydeathnum' where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            // 숙련도 증가
-            addGenDex($general['no'], $general['atmos'], $general['train'], $general['crewtype'], $mykillnum);
-            addGenDex($general['no'], $general['atmos'], $general['train'], $oppose['crewtype'], $mydeathnum);
-            // 죽은수 기술로 누적
-            $num = Util::round($opdeathnum * 0.01);
-            // 국가보정
-            if($destnation['type'] == 3 || $destnation['type'] == 13)                                                                               { $num *= 1.1; }
-            if($destnation['type'] == 5 || $destnation['type'] == 6 || $destnation['type'] == 7 || $destnation['type'] == 8 || $destnation['type'] == 12) { $num *= 0.9; }
-            // 부드러운 기술 제한
-            if(TechLimit($admin['startyear'], $year, $destnation['tech'])) { $num = intdiv($num, 4); }
-            $query = "update nation set totaltech=totaltech+'$num',tech=totaltech/'$destgencount' where nation='{$destnation['nation']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            //양국 평균 기술가격
-            //$techRatio = (getTechCost($nation['tech']) + getTechCost($destnation['tech'])) / 2;
-            $techRatio = 1.0;
-            // 죽은수 도시 재정으로 누적 60%
-            $num = Util::round(($mykillnum+$mydeathnum) * 0.6 * $techRatio);
-            // 국가보정
-            if($destnation['type'] == 1)                            { $num *= 1.1; }
-            if($destnation['type'] == 9 || $destnation['type'] == 10) { $num *= 0.9; }
-            $query = "update city set dead=dead+'$num' where city='{$city['city']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-            // 죽은수 도시 재정으로 누적 40%
-            $num = Util::round(($mykillnum+$mydeathnum) * 0.4 * $techRatio);
-            // 국가보정
-            if($nation['type'] == 1)                        { $num *= 1.1; }
-            if($nation['type'] == 9 || $nation['type'] == 10) { $num *= 0.9; }
-            $query = "update city set dead=dead+'$num' where city='{$general['city']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-            // 상대 병사 소진이나 쌀 소진시 다음 장수
-            if($oppose['crew'] <= 0 || ($opRice <= Util::round($oppose['crew']/100) && $general['crew'] > 0)) {
-                if($opRice <= Util::round($oppose['crew']/100)) {
-                    $josaYi = JosaUtil::pick($opposeCrewType->name, '이');
-                    $alllog[] = "<C>●</>{$month}월:<Y>{$oppose['name']}</>의 {$opposeCrewType->name}{$josaYi} 패퇴했습니다.";
-                    $log[] = "<C>●</><Y>{$oppose['name']}</>의 {$opposeCrewType->name}{$josaYi} 패퇴했습니다.";
-                    $opplog[] = "<C>●</>군량 부족으로 패퇴합니다.";
-                } else {
-                    $josaYi = JosaUtil::pick($opposeCrewType->name, '이');
-                    $alllog[] = "<C>●</>{$month}월:<Y>{$oppose['name']}</>의 {$opposeCrewType->name}{$josaYi} 전멸했습니다.";
-                    $log[] = "<C>●</><Y>{$oppose['name']}</>의 {$opposeCrewType->name}{$josaYi} 전멸했습니다.";
-                    $opplog[] = "<C>●</>전멸했습니다.";
-                }
-                $opposecount--;
-
-                $general['atmos'] *= 1.1; //사기 증가
-                if($general['atmos'] > GameConst::$maxAtmosByWar) { $general['atmos'] = GameConst::$maxAtmosByWar; }
-
-                $query = "update general set atmos='{$general['atmos']}',killnum=killnum+1 where no='{$general['no']}'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-                $exp2++;
-                // 상대장수 경험 등등 증가
-                $opexp = Util::round($opexp / 50 * 0.8);
-                // 성격 보정
-                $opexp = CharExperience($opexp, $oppose['personal']);
-                // 쌀 소모
-                $oppose['rice'] -= ($opexp * 5 * getCrewtypeRice($opposeCrewType, $destnation['tech']));
-                if($oppose['rice'] < 0) { $oppose['rice'] = 0; }
-
-                $query = "update general set deathnum=deathnum+1,rice='{$oppose['rice']}',experience=experience+'$opexp',dedication=dedication+'$opexp' where no='{$oppose['no']}'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-                $opexp = 0;
-
-                pushGenLog($oppose, $opplog);
-                pushBatLog($oppose, $oppbatlog);
-                pushBatRes($oppose, $oppbatres);
-                $oppose = null;
-                $opplog = [];
-                $oppbatlog = [];
-                $oppbatres = [];
-            // 공격 장수 병사 소진이나 쌀 소진시 실패 처리
-            } elseif($general['crew'] <= 0 || $myRice <= Util::round($general['crew']/100)) {
-                if($myRice <= Util::round($general['crew']/100)) {
-                    $josaYi = JosaUtil::pick($generalCrewType->name, '이');
-                    $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 {$generalCrewType->name}{$josaYi} 퇴각했습니다.";
-                    $log[] = "<C>●</>군량 부족으로 퇴각합니다.";
-                    $opplog[] = "<C>●</><Y>{$general['name']}</>의 {$generalCrewType->name}{$josaYi} 퇴각했습니다.";
-                } else {
-                    $josaYi = JosaUtil::pick($generalCrewType->name, '이');
-                    $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 {$generalCrewType->name}{$josaYi} 퇴각했습니다.";
-                    $log[] = "<C>●</>퇴각했습니다.";
-                    $opplog[] = "<C>●</><Y>{$general['name']}</>의 {$generalCrewType->name}{$josaYi} 퇴각했습니다.";
-                }
-
-                // 경험치 상승
-                if($opposeCrewType->armType == GameUnitConst::T_WIZARD) {   // 귀병
-                    $oppose['intel2']++;
-                } elseif($opposeCrewType->armType == GameUnitConst::T_SIEGE) {   // 차병
-                    $oppose['leader2']++;
-                } else {
-                    $oppose['power2']++;
-                }
-
-                $oppose['atmos'] *= 1.1; //사기 증가
-                if($oppose['atmos'] > GameConst::$maxAtmosByWar) { $oppose['atmos'] = GameConst::$maxAtmosByWar; }
-
-                // 상대장수 경험 등등 증가
-                $opexp = Util::round($opexp / 50 * 0.8);
-                // 성격 보정
-                $opexp = CharExperience($opexp, $oppose['personal']);
-                // 쌀 소모
-                $oppose['rice'] -= ($opexp * 5 * getCrewtypeRice($opposeCrewType, $destnation['tech']));
-                if($oppose['rice'] < 0) { $oppose['rice'] = 0; }
-
-                $query = "update general set rice='{$oppose['rice']}',leader2='{$oppose['leader2']}',power2='{$oppose['power2']}',intel2='{$oppose['intel2']}',atmos='{$oppose['atmos']}',experience=experience+'$opexp',dedication=dedication+'$opexp',killnum=killnum+1 where no='{$oppose['no']}'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-                $query = "update general set deathnum=deathnum+1 where no='{$general['no']}'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-                $opexp = 0;
-
-                $opplog = checkAbility($oppose, $opplog);
-                pushGenLog($oppose, $opplog);
-                pushBatLog($oppose, $oppbatlog);
-                pushBatRes($oppose, $oppbatres);
-                $opplog = [];
-                $oppbatlog = [];
-                $oppbatres = [];
-    //          $josaYi = JosaUtil::pick($general['name'], '이');
-    //          $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>{$josaYi} }<G>{$city['name']}</> 공략에 실패했습니다. <1>$date</>";
-    //          $log[] = "<C>●</> <G>{$city['name']}</> 공략에 실패했습니다. <1>$date</>";
-                break;
-            } else {
-                // 무승부일때 로그 남김
-                pushGenLog($oppose, $opplog);
-                pushBatLog($oppose, $oppbatlog);
-                pushBatRes($oppose, $oppbatres);
-                $opplog = [];
-                $oppbatlog = [];
-                $oppbatres = [];
-            }
-        }
-    }
-
-    if(isset($oppose)){
-        //마지막 페이즈에 장수가 전멸하지 않은 경우. 쌀 소모 후속 처리
-
-        // 상대장수 경험 등등 증가(페이즈 초과시)
-        $opexp = Util::round($opexp / 50 * 0.8);
-        // 성격 보정
-        $opexp = CharExperience($opexp, $oppose['personal']);
-        // 쌀 소모
-        $oppose['rice'] -= ($opexp * 5 * getCrewtypeRice($opposeCrewType, $destnation['tech']));
-        if($oppose['rice'] < 0) { $oppose['rice'] = 0; }
-
-        $query = "update general set rice='{$oppose['rice']}',experience=experience+'$opexp',dedication=dedication+'$opexp' where no='{$oppose['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    }
-
-    // 경험치 상승
-    if($generalCrewType->armType == GameUnitConst::T_WIZARD) {   // 귀병
-        $general['intel2'] += $exp2;
-    } elseif($generalCrewType->armType == GameUnitConst::T_SIEGE) {   // 차병
-        $general['leader2'] += $exp2;
-    } else {
-        $general['power2'] += $exp2;
-    }
-    $query = "update general set leader2='{$general['leader2']}',power2='{$general['power2']}',intel2='{$general['intel2']}' where no='{$general['no']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-    // 공헌, 명성 상승
-    $exp = Util::round($exp / 50);
-    // 성격 보정
-    $exp = CharExperience($exp, $general['personal']);
-    // 쌀 소모
-    $general['rice'] -= ($exp * 5 * getCrewtypeRice($generalCrewType, $nation['tech']));
-    if($general['rice'] < 0) { $general['rice'] = 0; }
-
-    $query = "update general set rice='{$general['rice']}',dedication=dedication+'$exp',experience=experience+'$exp' where no='{$general['no']}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-    $log = checkAbility($general, $log);
-    pushGenLog($general, $log);
-    pushBatLog($general, $batlog);
-    pushBatRes($general, $batres);
-    pushGeneralPublicRecord($alllog, $year, $month);
-    pushWorldHistory($history);
-
-    return $deadAmount;
-}
-
-function CriticalScore2($score) {
-    $score = Util::round($score * (rand()%8 + 13)/10);    // 1.3~2.0
-    return $score;
-}
-
-//0 0 : 100 100 이면 최고 무한대 차이
-//30 30 : 100 100 이면 최고 3.3배 차이
-//60 60 : 100 100 이면 최고 1.6배 차이
-function getCrew($crew, $youatmos, $mytrain) {
-    $ratio = $youatmos / $mytrain;
-    $crew = $crew * $ratio;
-
-    return $crew;
-}
-
-function getCrewtypeRice($crewtype, $tech) {
-    $cost = $crewtype->rice / 10;
-    return $cost * getTechCost($tech);
-}
-
-//////////////////////////////////////////////////////////////
-// 표준 공 / 수 반환 수치는 약 0이 되게 (100~550)
-//////////////////////////////////////////////////////////////
-
-function getRate($admin, $type, $dtype) {
-    $t = "{$dtype}{$type}";
-    return $admin[$t];
-}
-
-function addConflict($city, $nationID, $mykillnum) {
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-
-    $nationlist = [];
-    $killnum = [0];
-
-    list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
-
-    $conflict = Json::decode($city['conflict']);
-
-    if(!$conflict || $city['def'] == 0){ // 선타, 막타 보너스
-        $mykillnum *= 1.05;
-    }
-
-    if (!$conflict) {
-        $conflict[$nationID] = $mykillnum;
-    }
-    else if(key_exists($nationID, $conflict)){
-        $conflict[$nationID] += $mykillnum;
-        arsort($conflict);
     }
     else{
-        $conflict[$nationID] = $mykillnum;
-        arsort($conflict);
-
-        $nation = getNationStaticInfo($nationID);
-        $josaYi = JosaUtil::pick($nation['name'], '이');
-        pushWorldHistory(["<C>●</>{$year}년 {$month}월:<M><b>【분쟁】</b></><D><b>{$nation['name']}</b></>{$josaYi} <G><b>{$city['name']}</b></> 공략에 가담하여 분쟁이 발생하고 있습니다."]);
+        $rawDefenderNation = $db->queryFirstRow('SELECT nation,`level`,`name`,capital,totaltech,gennum,tech,`type`,gold,rice FROM nation WHERE nation = %i', $defenderNationID);
     }
 
-    $rawConflict = Json::encode($conflict);
-    $city['conflict'] = $rawConflict;
+    $gameStor = KVStorage::getStorage($db, 'game_env');
+    [$startYear, $year, $month, $cityRate] = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'city_rate']);
+
+    $attacker = new WarUnitGeneral($rawAttacker, $rawAttackerCity, $rawAttackerNation, true, $year, $month);
+
+    $city = new WarUnitCity($rawDefenderCity, $rawDefenderNation, $year, $month, $cityRate);
+
+    $defenderList = $db->query('SELECT no,name,nation,turntime,personal,special2,crew,crewtype,atmos,train,intel,intel2,book,power,power2,weap,injury,leader,leader2,horse,item,explevel,experience,dedication,level,gold,rice,dex0,dex10,dex20,dex30,dex40,warnum,killnum,deathnum,killcrew,deathcrew,recwar,mode FROM general WHERE nation=%i AND city=%i AND nation!=0 and crew > 0 and rice>(crew/100) and ((train>=60 and atmos>=60 and mode=1) or (train>=80 and atmos>=80 and mode=2))', $city->getVar('nation'), $city->getVar('city'));
+
+    if(!$defenderList){
+        $defenderList = [];
+    }
+
+    usort($defenderList, function($lhs, $rhs){
+        return -(extractBattleOrder($lhs) <=> extractBattleOrder($rhs));
+    });
+
+    $iterDefender = new \ArrayIterator($defenderList);
+    $iterDefender->rewind();
+
+    $getNextDefender = function(?WarUnit $prevDefender, bool $reqNext) use ($iterDefender, $rawDefenderCity, $rawDefenderNation, $year, $month, $db) {
+        if($prevDefender !== null){
+            $prevDefender->applyDB($db);
+        }
+
+        if(!$reqNext){
+            return null;
+        }
+
+        if(!$iterDefender->valid()){
+            return null;
+        }
+
+        $rawGeneral = $iterDefender->current();
+        if(extractBattleOrder($rawGeneral) <= 0){
+            return null;
+        }
+
+        $retVal = new WarUnitGeneral($rawGeneral, $rawDefenderCity, $rawDefenderNation, false, $year, $month);
+        $iterDefender->next();
+        return $retVal;
+    };
+
+    $conquerCity = processWar_NG($attacker, $getNextDefender, $city, $year - $startYear);
+
+    $attacker->applyDB($db);
+
+    //NOTE: $rawAttackerNation과 $rawDefenderNation은 전투중에 '바뀌지 않음'을 전제로 하고 있다. (현재 구현도 그렇게 되어있음)
+
+    $rawDefenderCity = $city->getRaw();
+    $updateAttackerNation = [];
+    $updateDefenderNation = [];
+
+    if($city->getVar('supply')){
+        if($city->getPhase() > 0){
+            $rice = $city->getKilled() / 100 * 0.8;
+            $rice *= $city->getCrewType()->rice;
+            $rice *= getTechCost($rawDefenderNation['tech']);
+            $rice *= $cityRate / 100 - 0.2;
+            Util::setRound($rice);
+    
+            $updateDefenderNation['rice'] = max(0, $rawDefenderNation['rice'] - $rice);
+        }
+        else if($conquerCity){
+            $updateDefenderNation['rice'] = $rawDefenderNation['rice'] + 500;
+        }
+    }
+
+    $totalDead = $attacker->getKilled() + $attacker->getDead();
 
     $db->update('city', [
-        'conflict'=>$rawConflict
-    ], 'city=%i',$city['city']);
+        'dead' => $db->sqleval('dead + %i', $totalDead * 0.4)
+    ], 'city=%i', $rawAttackerCity['city']);
 
-    return $city;
+    $db->update('city', [
+        'dead' => $db->sqleval('dead + %i', $totalDead * 0.6)
+    ], 'city=%i', $rawDefenderCity['city']);
+
+    $attackerIncTech = $attacker->getDead() * 0.01 * getNationTechMultiplier($rawAttackerNation['type']);
+    $defenderIncTech = $attacker->getKilled() * 0.01 * getNationTechMultiplier($rawDefenderNation['type']);
+
+    if(TechLimit($startYear, $year, $rawAttackerNation['tech'])){
+        $attackerIncTech /= 4;
+    }
+    if(TechLimit($startYear, $year, $rawDefenderNation['tech'])){
+        $defenderIncTech /= 4;
+    }
+
+    $attackerTotalTech = $rawAttackerNation['totaltech'] + $attackerIncTech;
+    $defenderTotalTech = $rawDefenderNation['totaltech'] + $defenderIncTech;
+
+    $updateAttackerNation['totaltech'] = Util::round($attackerTotalTech);
+    $updateDefenderNation['totaltech'] = Util::round($defenderTotalTech);
+
+    $updateAttackerNation['tech'] = Util::round($attackerTotalTech / max(GameConst::$initialNationGenLimit, $rawAttackerNation['gennum']));
+    $updateDefenderNation['tech'] = Util::round($defenderTotalTech / max(GameConst::$initialNationGenLimit, $rawDefenderNation['gennum']));
+
+    $db->update('nation', $updateAttackerNation, 'nation=%i', $attackerNationID);
+    $db->update('nation', $updateDefenderNation, 'nation=%i', $defenderNationID);
+
+    $db->update('diplomacy', [
+        'dead'=>$db->sqleval('dead + %i', $attacker->getDead() * getTechCost($rawAttackerNation['tech']))
+    ], 'me = %i and you = %i', $attackerNationID, $defenderNationID);
+
+    $db->update('diplomacy', [
+        'dead'=>$db->sqleval('dead + %i', $attacker->getKilled() * getTechCost($rawDefenderNation['tech']))
+    ], 'me = %i and you = %i', $defenderNationID, $attackerNationID);
+
+    if(!$conquerCity){
+        return;
+    }
+
+    //XXX: 새 도시점령 코드 작성하기 전까지 유지
+    $rawAttackerCity = $db->queryFirstRow('SELECT * FROM city WHERE city = %i', $rawAttacker['city']);
+    $rawAttackerNation = $db->queryFirstRow('SELECT nation,`level`,`name`,capital,totaltech,gennum,tech,`type`,gold,rice FROM nation WHERE nation = %i', $attackerNationID);
+
+    if($defenderNationID !== 0){
+        $rawDefenderNation = $db->queryFirstRow('SELECT nation,`level`,`name`,capital,totaltech,gennum,tech,`type`,gold,rice FROM nation WHERE nation = %i', $defenderNationID);
+    }
+    
+    ConquerCity([
+        'startyear'=>$startYear,
+        'year'=>$year,
+        'month'=>$month,
+        'city_rate'=>$cityRate
+    ], $attacker->getRaw(), $city->getRaw(), $rawAttackerNation, $rawDefenderNation);
+}
+
+function extractBattleOrder($general){
+    if($general['crew'] == 0){
+        return 0;
+    }
+
+    if($general['rice'] <= $general['crew'] / 100){
+        return 0;
+    }
+
+    if($general['mode'] == 0){
+        return 0;
+    }
+
+    if($general['mode'] == 1 && ($general['train'] < 60 || $general['atmos'] < 60)){
+        return 0;
+    }
+
+    if($general['mode'] == 2 && ($general['train'] < 80 || $general['atmos'] < 80)){
+        return 0;
+    }
+
+    return (
+        $general['leader'] +
+        $general['power'] +
+        $general['intel'] +
+        $general['weap'] +
+        $general['horse'] +
+        $general['book'] +
+        $general['crew'] / 100
+    );
+}
+
+function processWar_NG(
+    WarUnitGeneral $attacker,
+    callable $getNextDefender, 
+    WarUnitCity $city,
+    int $relYear
+):bool{
+    $templates = new \League\Plates\Engine(__dir__.'/templates');
+
+    $logger = $attacker->getLogger();
+
+    $attacker->useBattleInitItem();
+    
+    $date = substr($attacker->getVar('turntime'),11,5);
+
+    $attackerNationUpdate = [];
+    $defenderNationUpdate = [];
+
+    $defender = ($getNextDefender)(null, true);
+    $conquerCity = false;
+    
+    $josaRo = JosaUtil::pick($city->getName(), '로');
+    $josaYi = JosaUtil::pick($attacker->getName(), '이');
+
+    $logger->pushGlobalActionLog("<D><b>{$attacker->getNationVar('name')}</b></>의 <Y>{$attacker->getName()}</>{$josaYi} <G><b>{$city->getName()}</b></>{$josaRo} 진격합니다.");
+    $logger->pushGeneralActionLog("<G><b>{$city->getName()}</b></>{$josaRo} <M>진격</>합니다. <1>$date</>");
+
+    for($currPhase = 0; $currPhase < $attacker->getMaxPhase(); $currPhase+=1){
+        if($defender === null){
+            $defender = $city;
+            
+            if($city->getNationVar('rice') <= 0 && $city->getVar('supply')){
+                //병량 패퇴
+                $attacker->setOppose($defender);
+                $defender->setOppose($attacker);
+
+                $attacker->addTrain(1);
+
+                $attacker->addWin();
+                $defender->addLose();
+                $defender->heavyDecreseWealth();
+
+                $logger->pushGlobalActionLog("병량 부족으로 <G><b>{$defender->getName()}</b></>의 수비병들이 <R>패퇴</>합니다.");
+                $josaUl = JosaUtil::pick($defender->getName(), '을');
+                $josaYi = JosaUtil::pick($defender->getNationVar('name'), '이');
+                $logger->pushGlobalHistoryLog("<M><b>【패퇴】</b></><D><b>{$defender->getNationVar('name')}</b></>{$josaYi} 병량 부족으로 <G><b>{$defender->getName()}</b></>{$josaUl} 뺏기고 말았습니다.");
+
+                $conquerCity = true;
+                break;
+            }
+        }
+
+        if($defender->getPhase() == 0){
+            $defender->setPrePhase($currPhase);
+
+            $attacker->addTrain(1);
+            $defender->addTrain(1);
+
+            if($defender instanceof WarUnitGeneral){
+                $josaWa = JosaUtil::pick($attacker->getCrewTypeName(), '와');
+                $josaYi = JosaUtil::pick($defender->getCrewTypeName(), '이');
+                $logger->pushGlobalActionLog("<Y>{$attacker->getName()}</>의 {$attacker->getCrewTypeName()}{$josaWa} <Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 대결합니다.");
+                $josaRo = JosaUtil::pick($attacker->getCrewTypeName(), '로');
+                $josaUl = JosaUtil::pick($defender->getCrewTypeName(), '을');
+                $attacker->getLogger()->pushGeneralActionLog("{$attacker->getCrewTypeName()}{$josaRo} <Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaUl} <M>공격</>합니다.");
+                $josaRo = JosaUtil::pick($defender->getCrewTypeName(), '로');
+                $josaUl = JosaUtil::pick($attacker->getCrewTypeName(), '을');
+                $defender->getLogger()->pushGeneralActionLog("{$defender->getCrewTypeName()}{$josaRo} <Y>{$attacker->getName()}</>의 {$attacker->getCrewTypeName()}{$josaUl} <M>수비</>합니다.");
+            }
+            else{
+                $josaYi = JosaUtil::pick($attacker->getName(), '이');
+                $josaRo = JosaUtil::pick($attacker->getCrewTypeName(), '로');
+                $logger->pushGlobalActionLog("<Y>{$attacker->getName()}</>{$josaYi} {$attacker->getCrewTypeName()}{$josaRo} 성벽을 공격합니다.");
+                $logger->pushGeneralActionLog("{$attacker->getCrewTypeName()}{$josaRo} 성벽을 <M>공격</>합니다.", ActionLogger::PLAIN);
+            }
+
+            $defender->useBattleInitItem();
+
+            $attacker->setOppose($defender);
+            $defender->setOppose($attacker);
+
+            foreach(Util::zip(
+                $attacker->checkBattleBeginSkill(),
+                $defender->checkBattleBeginSkill()
+                ) as $b){
+                //doNothing
+            }
+
+            $attacker->checkBattleBeginItem();
+            $defender->checkBattleBeginItem();
+
+            $attacker->applyBattleBeginSkillAndItem();
+            $defender->applyBattleBeginSkillAndItem();
+        }
+
+        $attacker->beginPhase();
+        $defender->beginPhase();
+
+        foreach(Util::zip(
+            $attacker->checkPreActiveSkill(),
+            $defender->checkPreActiveSkill()
+            ) as $b){
+            //doNothing
+        }
+
+        foreach(Util::zip(
+            $attacker->checkActiveSkill(),
+            $defender->checkActiveSkill()
+            ) as $b){
+            //doNothing
+        }
+        //NOTE: 마법은 checkActiveSkill, checkPostActiveSkill 내에서 반영
+
+        foreach(Util::zip(
+            $attacker->checkPostActiveSkill(),
+            $defender->checkPostActiveSkill()
+            ) as $b){
+            //doNothing
+        }
+        //NOTE: 반계류 등의 스킬을 post에서 반영
+
+        foreach(Util::zip(
+            $attacker->applyActiveSkill(),
+            $defender->applyActiveSkill()
+            ) as $b){
+            //doNothing
+        }
+
+        $deadDefender = $attacker->calcDamage();
+        $deadAttacker = $defender->calcDamage();
+
+        $attackerHP = $attacker->getHP();
+        $defenderHP = $defender->getHP();
+
+        if($deadAttacker > $attackerHP || $deadDefender > $defenderHP){
+            $deadAttackerRatio = $deadAttacker / max(1, $attackerHP);
+            $deadDefenderRatio = $deadDefender / max(1, $defenderHP);
+
+            if($deadDefenderRatio > $deadAttackerRatio){
+                //수비자가 더 병력 부족
+                $deadAttacker /= $deadDefenderRatio;
+                $deadDefender = $defenderHP;
+            }
+            else{
+                //공격자가 더 병력 부족
+                $deadDefender /= $deadAttackerRatio;
+                $deadAttacker = $attackerHP;
+            }
+        }
+
+        $deadAttacker = min(ceil($deadAttacker), $attackerHP);
+        $deadDefender = min(ceil($deadDefender), $defenderHP);        
+
+        $attacker->decreaseHP($deadAttacker);
+        $defender->decreaseHP($deadDefender);
+
+        $attacker->increaseKilled($deadDefender);
+        $defender->increaseKilled($deadAttacker);
+
+        $phaseNickname = $currPhase + 1;
+
+        if($deadAttacker > 0 || $deadDefender > 0){
+            $attacker->getLogger()->pushGeneralBattleDetailLog(
+                "$phaseNickname : <Y1>【{$attacker->getName()}】</> <C>{$attacker->getHP()} (-$deadAttacker)</> VS <C>{$defender->getHP()} (-$deadDefender)</> <Y1>【{$defender->getName()}】</>"
+            );
+    
+            $defender->getLogger()->pushGeneralBattleDetailLog(
+                "$phaseNickname : <Y1>【{$defender->getName()}】</> <C>{$defender->getHP()} (-$deadDefender)</> VS <C>{$attacker->getHP()} (-$deadAttacker)</> <Y1>【{$attacker->getName()}】</>"
+            );
+        }
+        
+
+        $attacker->addPhase();
+        $defender->addPhase();
+
+        if(!$attacker->continueWar($noRice)){
+            $attacker->logBattleResult();
+            $defender->logBattleResult();
+
+            $attacker->addLose();
+            $defender->addWin();
+            
+            $attacker->tryWound();
+            $defender->tryWound();
+
+            $josaYi = JosaUtil::pick($attacker->getCrewTypeName(), '이');
+            $logger->pushGlobalActionLog("<Y>{$attacker->getName()}</>의 {$attacker->getCrewTypeName()}{$josaYi} 퇴각했습니다.");
+            if($noRice){
+                $attacker->getLogger()->pushGeneralActionLog("군량 부족으로 퇴각합니다.", ActionLogger::PLAIN);
+            }
+            else{
+                $attacker->getLogger()->pushGeneralActionLog("퇴각했습니다.", ActionLogger::PLAIN);
+            }
+            $defender->getLogger()->pushGeneralActionLog("<Y>{$attacker->getName()}</>의 {$attacker->getCrewTypeName()}{$josaYi} 퇴각했습니다.", ActionLogger::PLAIN);
+
+            break;
+        }
+
+        if(!$defender->continueWar($noRice)){
+
+            $attacker->logBattleResult();
+            $defender->logBattleResult();
+
+            $attacker->addWin();
+            $defender->addLose();
+
+            $attacker->tryWound();
+            $defender->tryWound();
+
+            if($defender === $city){
+                $attacker->addLevelExp(1000);
+                $conquerCity = true;
+                break;
+            }
+
+            $josaYi = JosaUtil::pick($defender->getCrewTypeName(), '이');
+            
+            if($noRice){
+                $logger->pushGlobalActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.");
+            $attacker->getLogger()->pushGeneralActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 패퇴했습니다.", ActionLogger::PLAIN);
+                $defender->getLogger()->pushGeneralActionLog("군량 부족으로 패퇴합니다.", ActionLogger::PLAIN);
+            }
+            else{
+                $logger->pushGlobalActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 전멸했습니다.");
+            $attacker->getLogger()->pushGeneralActionLog("<Y>{$defender->getName()}</>의 {$defender->getCrewTypeName()}{$josaYi} 전멸했습니다.", ActionLogger::PLAIN);
+                $defender->getLogger()->pushGeneralActionLog("전멸했습니다.", ActionLogger::PLAIN);
+            }
+
+            if($currPhase + 1 == $attacker->getMaxPhase()){
+                break;
+            }
+
+            $defender->finishBattle();
+            $defender = ($getNextDefender)($defender, true);
+
+            if($defender !== null && !($defender instanceof WarUnitGeneral)){
+                throw new \RuntimeException('다음 수비자를 받아오는데 실패');
+            }
+            
+        }
+        
+    }
+
+    $attacker->finishBattle();
+    $defender->finishBattle();
+
+    if($currPhase == $attacker->getMaxPhase()){
+        //마지막 페이즈의 전투 마무리
+        $attacker->logBattleResult();
+        $defender->logBattleResult();
+
+        $attacker->tryWound();
+        $defender->tryWound();
+    }
+    
+    if($defender instanceof WarUnitCity){
+        $newConflict = $defender->addConflict();
+        if($newConflict){
+            $nationName = $attacker->getNationVar('name');
+            $josaYi = JosaUtil::pick($nationName, '이');
+            $logger->pushGlobalHistoryLog("<M><b>【분쟁】</b></><D><b>{$nationName}</b></>{$josaYi} <G><b>{$defender->getName()}</b></> 공략에 가담하여 분쟁이 발생하고 있습니다.");
+        }
+    }
+
+    ($getNextDefender)($defender, false);
+
+    return $conquerCity;
 }
 
 function DeleteConflict($nation) {
@@ -1594,31 +513,19 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) {
     pushNationHistory($nation, "<C>●</>{$year}년 {$month}월:<Y>{$general['name']}</>{$josaYiGen} {$destnationName} <G><b>{$city['name']}</b></>{$josaUl} <S>점령</>");
     pushNationHistory($destnation, "<C>●</>{$year}년 {$month}월:<D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>에 의해 <G><b>{$city['name']}</b></>{$josaYiCity} <span class='ev_highlight'>함락</span>");
 
-    $query = "select city from city where nation='{$city['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $citycount = MYDB_num_rows($result);
+    $citycount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation = %i', $city['nation']);
+    $renewFront = false;
 
     // 국가 멸망시
     //TODO: 국가 멸망 코드를 별도로 작성
     if($citycount == 1 && $city['nation'] != 0) {
-        $query = "select nation,name,gold,rice from nation where nation='{$city['nation']}'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $losenation = MYDB_fetch_array($result);
+        $losenation = $destnation;
 
         $josaYi = JosaUtil::pick($losenation['name'], '이');
         $josaUl = JosaUtil::pick($losenation['name'], '을');
         $history[] = "<C>●</>{$year}년 {$month}월:<R><b>【멸망】</b></><D><b>{$losenation['name']}</b></>{$josaYi} 멸망하였습니다.";
         pushNationHistory($nation, "<C>●</>{$year}년 {$month}월:<D><b>{$losenation['name']}</b></>{$josaUl} 정복");
 
-        $query = "select no, nation from general where nation='{$general['nation']}' and level='12'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $ruler = MYDB_fetch_array($result);
-
-        //다굴치는 나라들 전방설정을 위해 미리 얻어옴
-        $query = "select you from diplomacy where me='{$losenation['nation']}' and state<2";
-        $dipResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $dipCount = MYDB_num_rows($dipResult);
-
         $loseGeneralGold = 0;
         $loseGeneralRice = 0;
         //멸망국 장수들 역사 기록 및 로그 전달
@@ -1653,11 +560,7 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) {
             $loseGeneralRice += $loseRice;
             
             //모두 등용장 발부
-            if($nation['name'] == "강족" || $nation['name'] == "저족" || $nation['name'] == "흉노족"
-                || $nation['name'] == "남만족" || $nation['name'] == "산월족" || $nation['name'] == "오환족"
-                || $nation['name'] == "왜족") {
-                //등용장 미발부
-            } elseif(Util::randBool(0.5)) {
+            if(Util::randBool(0.5)) {
                 $msg = ScoutMessage::buildScoutMessage($general['no'], $gen['no']);
                 if($msg){
                     $msg->send(true);
@@ -1665,7 +568,7 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) {
             }
 
             //NPC인 경우 10% 확률로 임관(엔장, 인재, 의병)
-            if($gen['npc'] >= 2 && $gen['npc'] <= 4 && rand() % 100 < 10) {
+            if($gen['npc'] >= 2 && $gen['npc'] <= 8 && rand() % 100 < 10) {
                 $commissionCommand = EncodeCommand(0, 0, $nation['nation'], 25); //임관
                 $query = "update general set turn0='$commissionCommand' where no={$gen['no']}";
                 MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1726,12 +629,7 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) {
         // 국가 삭제
         $query = "delete from nation where nation='{$city['nation']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        // 아까 얻어온 다굴국들 전방설정
-        for($i=0; $i < $dipCount; $i++) {
-            $dip = MYDB_fetch_array($dipResult);
-            //전방설정
-            SetNationFront($dip['you']);
-        }
+        $renewFront = true;
     // 멸망이 아니면
     } else {
         // 태수,군사,시중은 일반으로...
@@ -1774,14 +672,11 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) {
         }
     }
 
-    $general['atmos'] *= 1.1; //사기 증가
-    if($general['atmos'] > GameConst::$maxAtmosByWar) { $general['atmos'] = GameConst::$maxAtmosByWar; }
-
     $conquerNation = getConquerNation($city);
 
     if($conquerNation == $general['nation']) {
-        // 이동 및 사기 변경
-        $query = "update general set city='{$city['city']}',atmos='{$general['atmos']}',killnum=killnum+1 where no='{$general['no']}'";
+        // 이동
+        $query = "update general set city='{$city['city']}' where no='{$general['no']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         if($city['level'] > 3) {
             // 도시 소속 변경, 태수,군사,시중 초기화
@@ -1800,16 +695,11 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) {
         $conquerResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $conquerNationArray = MYDB_fetch_array($conquerResult);
 
-
-
         $josaUl = JosaUtil::pick($city['name'], '을');
         $josaYi = JosaUtil::pick($conquerNationArray['name'], '이');
         $history[] = "<C>●</>{$year}년 {$month}월:<Y><b>【분쟁협상】</b></><D><b>{$conquerNationArray['name']}</b></>{$josaYi} 영토분쟁에서 우위를 점하여 <G><b>{$city['name']}</b></>{$josaUl} 양도받았습니다.";
         pushNationHistory($nation, "<C>●</>{$year}년 {$month}월:<G><b>{$city['name']}</b></>{$josaUl} <D><b>{$conquerNationArray['name']}</b></>에 <Y>양도</>");
         pushNationHistory($conquerNationArray, "<C>●</>{$year}년 {$month}월:<D><b>{$nation['name']}</b></>에서 <G><b>{$city['name']}</b></>{$josaUl} <S>양도</> 받음");
-        // 이동X 및 사기 변경
-        $query = "update general set atmos='{$general['atmos']}',killnum=killnum+1 where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
         $query = [
             'supply'=>1,
@@ -1837,6 +727,15 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) {
         SetNationFront($conquerNation);
     }
 
+    if($renewFront){
+        foreach(getAllNationStaticInfo() as $nation){
+            if($nation['level'] <= 0){
+                continue;
+            }
+            SetNationFront($nation['nation']);
+        }
+    }
+
     pushGenLog($general, $log);
     pushGeneralPublicRecord($alllog, $year, $month);
     pushWorldHistory($history);

hwe/processing.php

@@ -1609,11 +1609,11 @@ function command_53($turn, $command) {
     $result = MYDB_query($query, $connect) or Error("command_53 ".MYDB_error($connect),"");
     $me = MYDB_fetch_array($result);
 
-    $query = "select round(avg(power)) as power,round(avg(gennum)) as gennum from nation where level>=1";
+    $query = "select avg(power) as power,avg(gennum) as gennum from nation where level>=1";
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
     $avgNation = MYDB_fetch_array($result);
 
-    $query = "select round(std(power)) as power,round(std(gennum)) as gennum from nation where level>=1";
+    $query = "select std(power) as power,std(gennum) as gennum from nation where level>=1";
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
     $stdNation = MYDB_fetch_array($result);
     
@@ -1633,13 +1633,13 @@ function command_53($turn, $command) {
     $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
     $count = MYDB_num_rows($result);
 
-    $cond1 = $avgNation['power']+$stdNation['power'];
-    $cond2 = $avgNation['gennum']+$stdNation['gennum'];
+    $cond1 = (-0.25 * $stdNation['power']) + $avgNation['power'];
+    $cond2 = (-0.67 * $stdNation['gennum']) + $avgNation['gennum'];
     
     for($i=1; $i <= $count; $i++) {
         $nation = MYDB_fetch_array($result);
 
-        if($myNation['power']+$nation['power'] > $cond1 || $myNation['gennum']+$nation['gennum'] > $cond2 || !isNeighbor($me['nation'], $nation['nation'])) {
+        if(($myNation['power']+$nation['power'])/2 > $cond1 || ($myNation['gennum']+$nation['gennum'])/2 > $cond2 || !isNeighbor($me['nation'], $nation['nation'])) {
             echo "<option style=color:{$nation['color']};background-color:red; value={$nation['nation']}>【 {$nation['name']} 】</option>";
         } else {
             echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";
@@ -1661,8 +1661,8 @@ function command_53($turn, $command) {
 제한 조건<br>
 - 인접 국가<br>
 - 양국 모두 외교제한 없음<br>
-- 양국 국력의 합이 평균+표준편차(현재 {$cond1}) 이하<br>
-- 양국 장수수의 합이 평균+표준편차(현재 {$cond2}) 이하<br>
+- 두 국가의 국력 평균이 상위 60%(현재 ".round($cond1,2).") 이하.<br>
+- 두 국가의 장수수 평균이 상위 75%(현재 ".round($cond2,1).") 이하.<br>
 ";
     ender(1);
 }

hwe/sammo/ActionLogger.php

@@ -43,6 +43,16 @@ class ActionLogger{
     }
 
     public function rollback(){
+        $backup = [
+            'generalHistoryLog'=>$this->generalHistoryLog,
+            'generalActionLog'=>$this->generalActionLog,
+            'generalBattleResultLog'=>$this->generalBattleResultLog,
+            'generalBattleDetailLog'=>$this->generalBattleDetailLog,
+            'nationalHistoryLog'=>$this->nationalHistoryLog,
+            'globalHistoryLog'=>$this->globalHistoryLog,
+            'globalActionLog'=>$this->globalActionLog,
+        ];
+        
         $this->generalHistoryLog = [];
         $this->generalActionLog = [];
         $this->generalBattleResultLog = [];
@@ -50,6 +60,8 @@ class ActionLogger{
         $this->nationalHistoryLog = [];
         $this->globalHistoryLog = [];
         $this->globalActionLog = [];
+
+        return $backup;
     }
 
     public function flush(){
@@ -69,12 +81,12 @@ class ActionLogger{
         }
 
         if($this->generalBattleResultLog){
-            pushGenLog(['no'=>$this->generalId], $this->generalBattleResultLog);
+            pushBatRes(['no'=>$this->generalId], $this->generalBattleResultLog);
             $this->generalBattleResultLog = [];
         }
 
         if($this->generalBattleDetailLog){
-            pushGenLog(['no'=>$this->generalId], $this->generalBattleDetailLog);
+            pushBatLog(['no'=>$this->generalId], $this->generalBattleDetailLog);
             $this->generalBattleDetailLog = [];
         }
 
@@ -143,7 +155,7 @@ class ActionLogger{
         $this->generalBattleResultLog[] = $text;
     }
 
-    public function pushGeneralBattleDetailLog($text, int $formatType = self::RAWTEXT){
+    public function pushGeneralBattleDetailLog($text, int $formatType = self::PLAIN){
         if(!$text){
             return;
         }
@@ -243,4 +255,55 @@ class ActionLogger{
         return $text;
     }
 
+    public function pushBattleResultTemplate(
+        WarUnit $me,
+        WarUnit $oppose
+    ){
+        if($me instanceof WarUnitCity){
+            return;
+        }
+
+        $templates = new \League\Plates\Engine(__dir__.'/../templates');
+
+        $render_me = [
+            'crewtype' => $me->getCrewTypeShortName(),
+            'name' => $me->getName(),
+            'remain_crew' => $me->getHP(),
+            'killed_crew' => -$me->getDeadCurrentBattle()
+        ];
+
+        $render_oppose = [
+            'crewtype' => $oppose->getCrewTypeShortName(),
+            'name' => $oppose->getName(),
+            'remain_crew' => $oppose->getHP(),
+            'killed_crew' => -$oppose->getDeadCurrentBattle()
+        ];
+
+        if(!$me->isAttacker()){
+            $warType = 'defense';
+            $warTypeStr = '←';
+        }
+        else if($oppose instanceof WarUnitCity){
+            $warType = 'siege';
+            $warTypeStr = '→';
+        }
+        else{
+            $warType = 'attack';
+            $warTypeStr = '→';
+        }
+
+        $res = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
+            'year'=>$this->year,
+            'month'=>$this->month,
+            'war_type'=>$warType,
+            'war_type_str'=>$warTypeStr,
+            'me' => $render_me,
+            'you' => $render_oppose,
+        ]));
+
+        $this->pushGeneralBattleResultLog($res, self::EVENT_YEAR_MONTH);
+        $this->pushGeneralBattleDetailLog($res, self::EVENT_YEAR_MONTH);
+        $this->pushGeneralActionLog($res, self::EVENT_YEAR_MONTH);
+    }
+
 }

hwe/sammo/DiplomaticMessage.php

@@ -181,7 +181,7 @@ class DiplomaticMessage extends Message{
         $josaWa = JosaUtil::pick($this->src->nationName, '와');
         pushGeneralHistory(
             ['no'=>$this->dest->generalID],
-            ["<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->src->nationName}</b></>{$josaWa} 통합 시도"]
+            "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->src->nationName}</b></>{$josaWa} 통합 시도"
         );
         pushGenLog(
             ['no'=>$this->dest->generalID],
@@ -200,7 +200,7 @@ class DiplomaticMessage extends Message{
         $josaWa = JosaUtil::pick($this->dest->nationName, '와');
         pushGeneralHistory(
             ['no'=>$this->src->generalID],
-            ["<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->dest->nationName}</b></>{$josaWa} 통합 시도"]
+            "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->dest->nationName}</b></>{$josaWa} 통합 시도"
         );
         $josaYi = JosaUtil::pick($this->dest->nationName, '이');
         pushGenLog(

hwe/sammo/Engine/Diplomacy.php

@@ -29,12 +29,12 @@ class Diplomacy{
         $db = DB::db();
         $gameStor = KVStorage::getStorage($db, 'game_env');
         $srcNation = $db->queryFirstRow(
-            'SELECT nation, `name`, `power`, capital, gold, rice, surlimit, color, `level` FROM nation WHERE nation=%i',
+            'SELECT nation, `name`, `power`, capital, gold, rice, gennum, surlimit, color, `level` FROM nation WHERE nation=%i',
             $srcNationID
         );
 
         $destNation = $db->queryFirstRow(
-            'SELECT nation, `name`, `power`, capital, gold, rice, surlimit, color, `level` FROM nation WHERE nation=%i',
+            'SELECT nation, `name`, `power`, capital, gold, rice, gennum, surlimit, color, `level` FROM nation WHERE nation=%i',
             $destNationID
         );
 

hwe/sammo/Event/Action/RaiseInvader.php

@@ -90,13 +90,13 @@ class RaiseInvader extends \sammo\Event\Action{
 
         if($npcEachCount < 0){
             $npcEachCount = 
-                $db->queryFirstField('SELECT count(no) from general where npc<5') / count(self::INVADER_LIST);
+                $db->queryFirstField('SELECT count(no) from general where npc < 9') / count(self::INVADER_LIST);
             $npcEachCount /= -1 * $this->npcEachCount;
         }
 
         $specAvg = $this->specAvg;
         if($specAvg < 0){
-            $specAvg = $db->queryFirstField('SELECT avg(sum(`leader` + `power` + `intel`)) from general where npc<5');
+            $specAvg = $db->queryFirstField('SELECT avg(sum(`leader` + `power` + `intel`)) from general where npc < 9');
             $specAvg /= -1 * $this->specAvg;
         }