튜토리얼 버튼을 전투 시뮬레이터로 변경

This reverts commit 568e1b2923.

.gitignore

@@ -45,3 +45,4 @@ test.php
 
 phpinfo.php
 vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/*
+*.sqlite3

composer.json

@@ -19,7 +19,8 @@
         "pguardiario/phpuri": "^1.0",
         "symfony/lock": "^4.1",
         "ezyang/htmlpurifier": "^4.10",
-        "xemlock/htmlpurifier-html5": "^0.1.7"
+        "xemlock/htmlpurifier-html5": "^0.1.7",
+        "catfan/medoo": "^1.5"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "43da7d5e9d8441faa4311f32b16ee1c0",
+    "content-hash": "3fceaf3c2925068c7e757ab12036e29e",
     "packages": [
         {
             "name": "brandonwamboldt/utilphp",
@@ -52,6 +52,65 @@
             ],
             "time": "2015-02-02T17:56:14+00:00"
         },
+        {
+            "name": "catfan/medoo",
+            "version": "v1.5.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/catfan/Medoo.git",
+                "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/catfan/Medoo/zipball/8d90cba0e8ff176028847527d0ea76fe41a06ecf",
+                "reference": "8d90cba0e8ff176028847527d0ea76fe41a06ecf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pdo": "*",
+                "php": ">=5.4"
+            },
+            "suggest": {
+                "ext-pdo_dblib": "For MSSQL or Sybase database on Linux/UNIX platform",
+                "ext-pdo_mysql": "For MySQL or MariaDB database",
+                "ext-pdo_oci": "For Oracle database",
+                "ext-pdo_oci8": "For Oracle version 8 database",
+                "ext-pdo_pqsql": "For PostgreSQL database",
+                "ext-pdo_sqlite": "For SQLite database",
+                "ext-pdo_sqlsrv": "For MSSQL database"
+            },
+            "type": "framework",
+            "autoload": {
+                "psr-4": {
+                    "Medoo\\": "/src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Angel Lai",
+                    "email": "angel@catfan.me"
+                }
+            ],
+            "description": "The lightest PHP database framework to accelerate development",
+            "homepage": "https://medoo.in",
+            "keywords": [
+                "database",
+                "lightweight",
+                "mariadb",
+                "mssql",
+                "mysql",
+                "oracle",
+                "php framework",
+                "postgresql",
+                "sql",
+                "sqlite"
+            ],
+            "time": "2018-06-14T18:59:08+00:00"
+        },
         {
             "name": "ezyang/htmlpurifier",
             "version": "v4.10.0",
@@ -318,16 +377,16 @@
         },
         {
             "name": "leafo/scssphp",
-            "version": "v0.7.6",
+            "version": "v0.7.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/leafo/scssphp.git",
-                "reference": "585f6ae84de62ffecf69c23805f25d78d7e4b794"
+                "reference": "1d656f8c02a3a69404bba6b28ec4e06edddf0f49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/leafo/scssphp/zipball/585f6ae84de62ffecf69c23805f25d78d7e4b794",
-                "reference": "585f6ae84de62ffecf69c23805f25d78d7e4b794",
+                "url": "https://api.github.com/repos/leafo/scssphp/zipball/1d656f8c02a3a69404bba6b28ec4e06edddf0f49",
+                "reference": "1d656f8c02a3a69404bba6b28ec4e06edddf0f49",
                 "shasum": ""
             },
             "require": {
@@ -366,7 +425,7 @@
                 "scss",
                 "stylesheet"
             ],
-            "time": "2018-05-24T02:18:53+00:00"
+            "time": "2018-07-22T01:22:08+00:00"
         },
         {
             "name": "league/plates",
@@ -751,16 +810,16 @@
         },
         {
             "name": "symfony/lock",
-            "version": "v4.1.0",
+            "version": "v4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/lock.git",
-                "reference": "a1df50492e927ad00ca271f29adb2949a14f2a5a"
+                "reference": "d508b5dd92272cb74300396ecaadde969d0f7976"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/a1df50492e927ad00ca271f29adb2949a14f2a5a",
-                "reference": "a1df50492e927ad00ca271f29adb2949a14f2a5a",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/d508b5dd92272cb74300396ecaadde969d0f7976",
+                "reference": "d508b5dd92272cb74300396ecaadde969d0f7976",
                 "shasum": ""
             },
             "require": {
@@ -808,7 +867,7 @@
                 "redlock",
                 "semaphore"
             ],
-            "time": "2018-05-30T07:26:09+00:00"
+            "time": "2018-06-21T11:15:46+00:00"
         },
         {
             "name": "vlucas/valitron",

css/config.css

@@ -61,6 +61,7 @@ a.just_link {
 }
 
 button.with_skin {
+    padding:0 4px;
     background-color: black; color: white;
     font-family: '맑은 고딕';
     font-size: 13px;

css/login.css

@@ -87,6 +87,17 @@ input::-webkit-input-placeholder {
     align-items: center;
 }
 
+.full-content {
+    position:fixed;
+    left:0;
+    top:0;
+    width:100%;
+    height:100%;
+    margin:0;
+    padding:0;
+    z-index:800;
+}
+
 #btn_kakao_login{
     cursor: pointer;
     height:46px;

css/user_info.css

@@ -1,7 +1,7 @@
 @charset "utf-8";
 
 #user_info_container{
-    width:500px;
+    width:550px;
     position:absolute;
     left:50%;
     margin-left:-250px;

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() */
+

f_config/config.php

@@ -49,40 +49,86 @@ function getFriendlyErrorType($type)
     return "{$type}"; 
 }
 
+function getExceptionTraceAsString($exception) {
+    //https://gist.github.com/abtris/1437966
+    $rtn = "";
+    $count = 0;
+    $rtn = [];
+    foreach ($exception->getTrace() as $frame) {
+        $args = "";
+        if (isset($frame['args'])) {
+            $args = array();
+            foreach ($frame['args'] as $arg) {
+                if (is_string($arg)) {
+                    $args[] = "'" . $arg . "'";
+                } elseif (is_array($arg)) {
+                    $args[] = "Array";
+                } elseif (is_null($arg)) {
+                    $args[] = 'NULL';
+                } elseif (is_bool($arg)) {
+                    $args[] = ($arg) ? "true" : "false";
+                } elseif (is_object($arg)) {
+                    $args[] = get_class($arg);
+                } elseif (is_resource($arg)) {
+                    $args[] = get_resource_type($arg);
+                } else {
+                    $args[] = $arg;
+                }   
+            }   
+            $args = join(", ", $args);
+        }
+        $rtn[] = sprintf( "#%s %s:%s %s(%s)",
+                                 $count,
+                                 isset($frame['file']) ? $frame['file'] : 'unknown file',
+                                 isset($frame['line']) ? $frame['line'] : 'unknown line',
+                                 (isset($frame['class']))  ? $frame['class'].$frame['type'].$frame['function'] : $frame['function'],
+                                 $args );
+        $count++;
+    }
+    return $rtn;
+}
+
+function logError(string $err, string $errstr, array $trace){
+    $fdb = FileDB::db(ROOT.'/d_log/err_log.sqlite3', ROOT.'/f_install/sql/err_log.sql');
+    $date = date("Ymd_His");
+
+    $trace = array_map(function(string $text){
+        return str_replace(ROOT, '{ROOT}', $text);
+    }, $trace);
+
+    $fdb->insert('err_log', [
+        'date'=>$date,
+        'err'=>$err,
+        'errstr'=>$errstr,
+        'trace'=>Json::encode($trace)
+    ]);
+}
+
 function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, int $errline, array $errcontext){
     if (!(error_reporting() & $errno)) {
         // This error code is not included in error_reporting, so let it fall
         // through to the standard PHP error handler
         return false;
     }
-
-    $date = date("Ymd_His");
+    
     $e = new \Exception();
 
-    $data = Json::encode([
-        'date'=>$date,
-        'err'=>getFriendlyErrorType($errno),
-        'errstr'=>$errstr,
-        'trace'=>explode("\n", $e->getTraceAsString())
-    ], Json::PRETTY);
-
-    file_put_contents(ROOT.'/d_log/err_log.txt',"$data\n", FILE_APPEND);
+    logError(
+        getFriendlyErrorType($errno),
+        $errstr,
+        getExceptionTraceAsString($e)
+    );
 }
 set_error_handler("\sammo\logErrorByCustomHandler");
 
 
 function logExceptionByCustomHandler(\Throwable $e){
-
-    $date = date("Ymd_His");
-
-    $data = Json::encode([
-        'date'=>$date,
-        'err'=>get_class($e),
-        'errstr'=>$e->getMessage(),
-        'trace'=>explode("\n", $e->getTraceAsString())
-    ], Json::PRETTY);
-
-    file_put_contents(ROOT.'/d_log/err_log.txt',"$data\n", FILE_APPEND);
+    logError(
+        get_class($e),
+        $e->getMessage(),
+        getExceptionTraceAsString($e)
+    );
+    
     echo $e->getTraceAsString();
     throw $e;
 }

f_install/sql/err_log.sql

@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS `err_log` (
+	`id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+	`date`	TEXT NOT NULL,
+	`err`	TEXT NOT NULL,
+	`errstr`	TEXT NOT NULL,
+	`trace`	TEXT NOT NULL
+);
+CREATE INDEX IF NOT EXISTS `date` ON `err_log` (
+	`date`	DESC
+);

f_install/templates/common.orig.css

@@ -41,18 +41,86 @@
         url('_tK_gameImagePath_/winter.gif') no-repeat right;
 }
 
-.map_spring .map_body{
-    background: url('_tK_gameImagePath_/map1.jpg') no-repeat;
+/*체 지도*/
+.map_theme_che.map_spring .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_spring.jpg') no-repeat;
 }
 
-.map_summer .map_body{
-    background: url('_tK_gameImagePath_/map2.jpg') no-repeat;
+.map_theme_che.map_summer .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_summer.jpg') no-repeat;
 }
 
-.map_fall .map_body{
-    background: url('_tK_gameImagePath_/map3.jpg') no-repeat;
+.map_theme_che.map_fall .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_fall.jpg') no-repeat;
 }
 
-.map_winter .map_body{
-    background: url('_tK_gameImagePath_/map4.jpg') no-repeat;
+.map_theme_che.map_winter .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_winter.jpg') no-repeat;
+}
+
+.map_theme_che .map_bgroad{
+    background: url('_tK_gameImagePath_/map/che/che_road.png') no-repeat;
+}
+
+/*미니체 지도*/
+.map_theme_miniche.map_spring .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_spring.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche.map_summer .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_summer.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche.map_fall .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_fall.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche.map_winter .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_winter.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche .map_bgroad{
+    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;
 }

hwe/_admin2_submit.php

@@ -6,6 +6,8 @@ include "func.php";
 
 $btn = Util::getReq('btn');
 $weap = Util::getReq('weap', 'int');
+$genlist = Util::getReq('genlist', 'array_int');
+$msg = Util::getReq('msg', 'string');
 
 extractMissingPostToGlobals();
 
@@ -93,7 +95,7 @@ switch($btn) {
     case "강제 사망":
         $date = date('Y-m-d H:i:s');
         $db->update('general', [
-            'turn0'=>0,
+            'turn0'=>EncodeCommand(0, 0, 0, 0),
             'killturn'=>0,
             'turntime'=>$date,
         ], '`no` IN %li', $genlist);
@@ -314,13 +316,13 @@ switch($btn) {
         break;
     case "하야입력":
         $db->update('general', [
-            'turn0'=>'00000000000045'
+            'turn0'=>EncodeCommand(0, 0, 0, 45)
         ], '`no` IN %li', $genlist);
         break;
     case "방랑해산":
         $db->update('general', [
-            'turn0'=>'00000000000047',
-            'turn1'=>'00000000000056'
+            'turn0'=>EncodeCommand(0, 0, 0, 47),
+            'turn1'=>EncodeCommand(0, 0, 0, 56)
         ], '`no` IN %li', $genlist);
         break;
     case "NPC설정":

hwe/_admin4_submit.php

@@ -52,7 +52,7 @@ switch($btn) {
         break;
     case "강제 사망":
         $date = date('Y-m-d H:i:s');
-        DB::db()->query('update general set turn0=0,killturn=0,turntime=%s where no IN %li',$date, $genlist);
+        DB::db()->query('update general set turn0=%s,killturn=0,turntime=%s where no IN %li',EncodeCommand(0, 0, 0, 0),$date, $genlist);
         break;
     case "메세지 전달":
     //TODO:새 갠메 시스템으로 변경

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

@@ -85,22 +85,22 @@ foreach (getAllNationStaticInfo() as $nation) {
 }
 
 switch ($type) { //FIXME:  $query 처리 조심.
-    case  1: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by nation"; break;
-    case  2: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by leader desc"; break;
-    case  3: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by power desc"; break;
-    case  4: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by intel desc"; break;
-    case  5: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by experience desc"; break;
-    case  6: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by dedication desc"; break;
-    case  7: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by level desc"; break;
-    case  8: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by killturn"; break;
+    case  1: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by nation"; break;
+    case  2: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by leader desc"; break;
+    case  3: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by power desc"; break;
+    case  4: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by intel desc"; break;
+    case  5: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by experience desc"; break;
+    case  6: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by dedication desc"; break;
+    case  7: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by level desc"; break;
+    case  8: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by killturn"; break;
     default:
-    case  9: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by connect desc"; break;
-    case 10: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by experience desc"; break;
-    case 11: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by personal"; break;
-    case 12: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by special desc"; break;
-    case 13: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by special2 desc"; break;
-    case 14: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by age desc"; break;
-    case 15: $query = "select picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by npc desc"; break;
+    case  9: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by connect desc"; break;
+    case 10: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by experience desc"; break;
+    case 11: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by personal"; break;
+    case 12: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by special desc"; break;
+    case 13: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by special2 desc"; break;
+    case 14: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by age desc"; break;
+    case 15: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by npc desc"; break;
 }
 $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
 $gencount = MYDB_num_rows($genresult);
@@ -136,20 +136,20 @@ for ($j=0; $j < $gencount; $j++) {
         $lbonus = 0;
     }
     if ($lbonus > 0) {
-        $lbonus = "<font color=cyan>+{$lbonus}</font>";
+        $lbonusText = "<font color=cyan>+{$lbonus}</font>";
     } else {
-        $lbonus = "";
+        $lbonusText = "";
     }
 
     if ($general['injury'] > 0) {
         $leader = intdiv($general['leader'] * (100 - $general['injury']), 100);
         $power = intdiv($general['power'] * (100 - $general['injury']), 100);
         $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
-        $leader = "<font color=red>{$leader}</font>{$lbonus}";
+        $leader = "<font color=red>{$leader}</font>{$lbonusText}";
         $power = "<font color=red>{$power}</font>";
         $intel = "<font color=red>{$intel}</font>";
     } else {
-        $leader = "{$general['leader']}{$lbonus}";
+        $leader = "{$general['leader']}{$lbonusText}";
         $power = "{$general['power']}";
         $intel = "{$general['intel']}";
     }
@@ -166,8 +166,15 @@ for ($j=0; $j < $gencount; $j++) {
 
     $imageTemp = GetImageURL($general['imgsvr']);
     echo "
-    <tr>
-        <td align=center><img width='64' height='64' src={$imageTemp}/{$general['picture']}></img></td>
+    <tr data-general-id='{$general['no']}' 
+        data-general-wounded='{$general['injury']}' 
+        data-general-leadership='{$general['leader']}'
+        data-general-leadership-bonus='{$lbonus}'
+        data-general-power='{$general['power']}'
+        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>$name</td>
         <td align=center>{$general['age']}세</td>
         <td align=center>".displayCharInfo($general['personal'])."</td>

hwe/a_history.php

@@ -15,7 +15,6 @@ $userID = Session::getUserID();
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$connect=$db->get();
 
 if(!$serverID){
     $serverID = UniqueConst::$serverID;
@@ -25,11 +24,9 @@ if($serverID === UniqueConst::$serverID){
     increaseRefresh("연감", 1);
 }
 
-$admin = $gameStor->getValues(['startyear','year','month']);
+$admin = $gameStor->getValues(['startyear','year','month','map_theme']);
 
-$query = "select con,turntime from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
+$me = $db->queryFirstRow('SELECT con, turntime FROM general WHERE owner = %i', $userID);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -42,9 +39,21 @@ if ($con >= 2) {
 [$s_year, $s_month] = $db->queryFirstList('SELECT year, month FROM history WHERE server_id = %s ORDER BY year ASC, month ASC LIMIT 1', $serverID);
 $s = $s_year * 12 + $s_month;
 
+if($s_year === null){
+    echo '인자 에러';
+    exit();
+}
+
 [$e_year, $e_month] = $db->queryFirstList('SELECT year, month FROM history WHERE server_id = %s ORDER BY year DESC, month DESC LIMIT 1', $serverID);
 $e = $e_year * 12 + $e_month;
 
+if($serverID !== UniqueConst::$serverID){
+    $mapTheme = $db->queryFirstField('SELECT map FROM ng_games WHERE server_id=%s', $serverID)?:'che';
+}
+else{
+    $mapTheme = $admin['map_theme']??'che';
+}
+
 //FIXME: $yearmonth가 올바르지 않을 경우에 처리가 필요.
 if($serverID !== UniqueConst::$serverID && !$yearmonth){
     $year = $s_year;
@@ -89,11 +98,13 @@ if ($month <= 0) {
 <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('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS("js/map/theme_{$mapTheme}.js")?>
 <?=WebUtil::printJS('js/map.js')?>
 
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/map.css')?>
@@ -133,7 +144,7 @@ $history = $db->queryFirstRow('SELECT log,genlog,nation,power,gen,city FROM hist
     <tr><td colspan=5 align=center id=bg1>중 원 지 도</td></tr>
     <tr height=520>
         <td width=698>
-            <?=getMapHtml();?>
+            <?=getMapHtml($mapTheme);?>
             
         <td width=139 valign=top><div style='background-color:#cccccc;color:black;text-align:center'>국명</div><?=$history['nation']?></td>
         <td width=70 valign=top style='text-align:center'><div style='background-color:#cccccc;color:black;'>국력</div><?=$history['power']?></td>
@@ -158,10 +169,15 @@ $history = $db->queryFirstRow('SELECT log,genlog,nation,power,gen,city FROM hist
     <tr><td><?=banner()?> </td></tr>
 </table>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 reloadWorldMap({
     targetJson:'j_map_history.php?year=<?=$year?>&month=<?=$month?>&serverID=<?=$serverID?>',
     showMe:false,
-    neutralView:true
+    neutralView:true,
+    useCachedMap:false,
+    year:<?=$year?>,
+    month:<?=$month?>,
 });
 </script>
 </body>

hwe/a_status.php

@@ -14,6 +14,8 @@ $connect=$db->get();
 increaseRefresh("세력도", 2);
 checkTurn();
 
+$mapTheme = $gameStor->map_theme??'che';
+
 $query = "select con,turntime from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
@@ -29,20 +31,25 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 <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('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS('d_shared/base_map.js')?>
 <?=WebUtil::printJS('js/map.js')?>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 $(function(){
 
     reloadWorldMap({
         neutralView:true,
-        showMe:true
+        showMe:true,
+        useCachedMap:true
     });
 
 });
 </script>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/normalize.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
@@ -60,7 +67,7 @@ $(function(){
             <?=getGeneralPublicRecordRecent(34)?>
         </td>
         <td width=698>
-            <?=getMapHtml()?>
+            <?=getMapHtml($mapTheme)?>
         </td>
     </tr>
     <tr>

hwe/b_battleCenter.php

@@ -156,7 +156,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_currentCity.php

@@ -170,7 +170,7 @@ if($valid == 0 && $session->userGrade < 5) {
 
 
 $city = $db->queryFirstRow('SELECT * FROM city WHERE city=%i', $citylist);
-$nation = getNationStaticInfo($city['nation']);
+$cityNation = getNationStaticInfo($city['nation']);
 
 //태수, 군사, 시중
 $gen1 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen1']);
@@ -180,81 +180,7 @@ $gen3 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $cit
 if($city['trade'] == 0) {
     $city['trade'] = "- ";
 }
-?>
 
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-</table>
-
-<table align=center width=1000 class='tb_layout bg2'>
-    <tr>
-        <td colspan=12 align=center style=color:"<?=newColor($nation['color'])?>"; bgcolor=<?=$nation['color']?>>【 <?=CityConst::$regionMap[$city['region']]?> | <?=CityConst::$levelMap[$city['level']]?> 】 <?=$city['name']?></td>
-    </tr>
-    <tr>
-        <td align=center width=46 class=bg1>주민</td>
-        <td align=center width=140><?=$city['pop']?>/<?=$city['pop2']?></td>
-        <td align=center width=46 class=bg1>농업</td>
-        <td align=center width=140><?=$city['agri']?>/<?=$city['agri2']?></td>
-        <td align=center width=46 class=bg1>상업</td>
-        <td align=center width=140><?=$city['comm']?>/<?=$city['comm2']?></td>
-        <td align=center width=46 class=bg1>치안</td>
-        <td align=center width=140><?=$city['secu']?>/<?=$city['secu2']?></td>
-        <td align=center width=46 class=bg1>수비</td>
-        <td align=center width=140><?=$city['def']?>/<?=$city['def2']?></td>
-        <td align=center width=46 class=bg1>성벽</td>
-        <td align=center width=140><?=$city['wall']?>/<?=$city['wall2']?></td>
-    </tr>
-    <tr>
-        <td align=center class=bg1>민심</td>
-        <td align=center><?=$city['rate']?></td>
-        <td align=center class=bg1>시세</td>
-        <td align=center><?=$city['trade']?>%</td>
-        <td align=center class=bg1>인구</td>
-        <td align=center><?=round($city['pop']/$city['pop2']*100, 2)?>%</td>
-        <td align=center class=bg1>태수</td>
-        <td align=center><?=$gen1['name']??'-'?></td>
-        <td align=center class=bg1>군사</td>
-        <td align=center><?=$gen2['name']??'-'?></td>
-        <td align=center class=bg1>시중</td>
-        <td align=center><?=$gen3['name']??'-'?></td>
-    </tr>
-    <tr>
-        <td align=center class=bg1>장수</td>
-        <td colspan=11>
-<?php
-    $query = "select name, npc from general where city='{$city['city']}' and nation='{$city['nation']}'";    // 장수 목록
-    $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gencount = MYDB_num_rows($genresult);
-    if($gencount == 0) echo "-";
-    for($i=0; $i < $gencount; $i++) {
-        $general = MYDB_fetch_array($genresult);
-        echo "{$general['name']}, ";
-    }
-?>
-        </td>
-    </tr>
-</table>
-
-
-<br>
-<table align=center class='tb_layout bg0'>
-<thead>
-    <tr>
-        <td width=64 align=center class=bg1>얼 굴</td>
-        <td width=128 align=center class=bg1>이 름</td>
-        <td width=48 align=center class=bg1>통솔</td>
-        <td width=48 align=center class=bg1>무력</td>
-        <td width=48 align=center class=bg1>지력</td>
-        <td width=78 align=center class=bg1>관 직</td>
-        <td width=28 align=center class=bg1>守</td>
-        <td width=78 align=center class=bg1>병 종</td>
-        <td width=78 align=center class=bg1>병 사</td>
-        <td width=48 align=center class=bg1>훈련</td>
-        <td width=48 align=center class=bg1>사기</td>
-        <td width=280 align=center class=bg1>명 령</td>
-    </tr></thead><tbody class='bg0' id='general_list'>
-
-<?php
 $query = "select npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level,nation,crewtype,crew,train,atmos,term,turn0,turn1,turn2,turn3,turn4,turn5 from general where city='{$city['city']}' order by dedication desc";    // 장수 목록
 $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $gencount = MYDB_num_rows($genresult);
@@ -266,6 +192,9 @@ foreach(getAllNationStaticInfo() as $nation){
     $nationlevel[$nation['nation']] = $nation['level'];
 }
 
+//도시명	오	적군	0/0(0)	병장(총)	0/0(4)	90병장	0/0	60병장	0/0	수비○	0/0
+$generalsFormat = [];
+
 
 for($j=0; $j < $gencount; $j++) {
     $general = MYDB_fetch_array($genresult);
@@ -340,7 +269,7 @@ for($j=0; $j < $gencount; $j++) {
         $turnText = '';
     }
     
-    echo $templates->render('cityGeneral', [
+    $generalsFormat[] = [
         'ourGeneral'=>$ourGeneral,
         'isNPC'=>$isNPC,
         'wounded'=>$wounded,
@@ -366,7 +295,159 @@ for($j=0; $j < $gencount; $j++) {
         'nation'=>$nation,
         'nationName'=>$nationName,
         'turnText'=>$turnText
-    ]);
+    ];
+}
+
+$generalsName = array_map(function($gen){return $gen['name'];}, $generalsFormat);
+
+$enemyCrew = 0;
+$enemyCnt = 0;
+$enemyArmedCnt = 0;
+$crew90 = 0;
+$gen90 = 0;
+$crew80 = 0;
+$gen80 = 0;
+$crew60 = 0;
+$gen60 = 0;
+
+$crewDef = 0;
+$genDef = 0 ;
+
+$crewTotal = 0;
+$armedGenTotal = 0;
+$genTotal = 0;
+
+
+foreach($generalsFormat as $general){
+    if($general['nation'] == 0){
+        continue;
+    }
+    if($general['nation'] != $myNation['nation']){
+        $enemyCnt += 1;
+        $enemyCrew += $general['crew'];
+        if($general['crew'] > 0){
+            $enemyArmedCnt += 1;
+        }
+        continue;
+    }
+
+    $crewTotal += $general['crew'];
+    $genTotal += 1;
+
+    if($general['crew'] == 0){
+        continue;
+    }
+    $armedGenTotal += 1;
+
+    if($general['train'] >= 90 && $general['atmos'] >= 90){
+        $crew90 += $general['crew'];
+        $gen90 += 1;
+    }
+
+    $chkDef = false;
+    if($general['train'] >= 80 && $general['atmos'] >= 80){
+        $crew80 += $general['crew'];
+        $gen80 += 1;
+        if($general['defenceMode'] == 2){
+            $crewDef += $general['crew'];
+            $genDef += 1;
+            $chkDef = true;
+        }
+    }
+
+    if($general['train'] >= 60 && $general['atmos'] >= 60){
+        $crew60 += $general['crew'];
+        $gen60 += 1;
+
+        if($general['defenceMode'] == 1 && !$chkDef){
+            $crewDef += $general['crew'];
+            $genDef += 1;
+            $chkDef = true;
+        }
+    }
+
+}
+
+?>
+
+<table align=center width=1000 class='tb_layout bg0'>
+    <tr><td><?=backButton()?></td></tr>
+</table>
+
+<table align=center width=1000 class='tb_layout bg2'>
+    <tr>
+        <td colspan=11 align=center style='color:<?=newColor($cityNation['color'])?>; background:<?=$cityNation['color']?>'>【 <?=CityConst::$regionMap[$city['region']]?> | <?=CityConst::$levelMap[$city['level']]?> 】 <?=$city['name']?></td>
+        <td style='color:<?=newColor($cityNation['color'])?>; background:<?=$cityNation['color']?>' class='center'><?=date('m-d H:i:s')?></td>
+    </tr>
+    <tr>
+        <td align=center width=48 class=bg1>주민</td>
+        <td align=center width=112><?=$city['pop']?>/<?=$city['pop2']?></td>
+        <td align=center width=48 class=bg1>농업</td>
+        <td align=center width=108><?=$city['agri']?>/<?=$city['agri2']?></td>
+        <td align=center width=48 class=bg1>상업</td>
+        <td align=center width=108><?=$city['comm']?>/<?=$city['comm2']?></td>
+        <td align=center width=48 class=bg1>치안</td>
+        <td align=center width=108><?=$city['secu']?>/<?=$city['secu2']?></td>
+        <td align=center width=48 class=bg1>수비</td>
+        <td align=center width=108><?=$city['def']?>/<?=$city['def2']?></td>
+        <td align=center width=48 class=bg1>성벽</td>
+        <td align=center width=108><?=$city['wall']?>/<?=$city['wall2']?></td>
+    </tr>
+    <tr>
+        <td align=center class=bg1>민심</td>
+        <td align=center><?=$city['rate']?></td>
+        <td align=center class=bg1>시세</td>
+        <td align=center><?=$city['trade']?>%</td>
+        <td align=center class=bg1>인구</td>
+        <td align=center><?=round($city['pop']/$city['pop2']*100, 2)?>%</td>
+        <td align=center class=bg1>태수</td>
+        <td align=center><?=$gen1['name']??'-'?></td>
+        <td align=center class=bg1>군사</td>
+        <td align=center><?=$gen2['name']??'-'?></td>
+        <td align=center class=bg1>시중</td>
+        <td align=center><?=$gen3['name']??'-'?></td>
+    </tr>
+    <tr>
+        <td align=center class=bg1>도시명</td>
+        <td align=center><?=$city['name']?></td>
+        <td align=center class=bg1>적군</td>
+        <td align=center><?=number_format($enemyCrew)?>/<?=number_format($enemyArmedCnt)?>(<?=number_format($enemyCnt)?>)</td>
+        <td align=center class=bg1>병장(총)</td>
+        <td align=center><?=number_format($crewTotal)?>/<?=number_format($armedGenTotal)?>(<?=number_format($genTotal)?>)</td>
+        <td align=center class=bg1>90병장</td>
+        <td align=center><?=number_format($crew90)?>/<?=number_format($gen90)?></td>
+        <td align=center class=bg1>60병장</td>
+        <td align=center><?=number_format($crew60)?>/<?=number_format($gen60)?></td>
+        <td align=center class=bg1>수비○</td>
+        <td align=center><?=number_format($crewDef)?>/<?=number_format($genDef)?></td>
+    </tr>
+    <tr>
+        <td align=center class=bg1>장수</td>
+        <td colspan=11><?=join(', ', $generalsName)?></td>
+    </tr>
+</table>
+
+<br>
+<table align=center class='tb_layout bg0'>
+<thead>
+    <tr>
+        <td width=64 align=center class=bg1>얼 굴</td>
+        <td width=128 align=center class=bg1>이 름</td>
+        <td width=48 align=center class=bg1>통솔</td>
+        <td width=48 align=center class=bg1>무력</td>
+        <td width=48 align=center class=bg1>지력</td>
+        <td width=78 align=center class=bg1>관 직</td>
+        <td width=28 align=center class=bg1>守</td>
+        <td width=78 align=center class=bg1>병 종</td>
+        <td width=78 align=center class=bg1>병 사</td>
+        <td width=48 align=center class=bg1>훈련</td>
+        <td width=48 align=center class=bg1>사기</td>
+        <td width=280 align=center class=bg1>명 령</td>
+    </tr></thead>
+    <tbody class='bg0' id='general_list'>
+<?php
+foreach($generalsFormat as $general){
+    echo $templates->render('cityGeneral', $general);
 }
 ?>
 </tbody>

hwe/b_dipcenter.php

@@ -225,7 +225,7 @@ if ($budgetricediff > 0) {
     <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>870 x 200px 넘는 크기를 점유할 시 통보없이 제한될 수 있습니다.</td></tr>
+    <tr><td colspan=2>870px x 200px를 넘어서는 내용은 표시되지 않습니다.</td></tr>
     <tr><td colspan=2 height=10></td></tr>
     <tr><td colspan=2 align=center bgcolor=green>예 산 &amp; 정 책</td></tr>
     <tr>

hwe/b_diplomacy.php

@@ -13,6 +13,8 @@ $connect=$db->get();
 
 increaseRefresh("중원정보", 1);
 
+$mapTheme = $gameStor->map_theme??'che';
+
 $query = "select no,nation from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $me = MYDB_fetch_array($result);
@@ -78,21 +80,25 @@ foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE confl
 <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('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS('d_shared/base_map.js')?>
 <?=WebUtil::printJS('js/map.js')?>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 $(function(){
 
     reloadWorldMap({
         neutralView:true,
-        showMe:true
+        showMe:true,
+        useCachedMap:true
     });
 
 });
 </script>
-<?=WebUtil::printCSS('css/normalize.css')?>
+<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <?=WebUtil::printCSS('css/map.css')?>
@@ -214,7 +220,7 @@ for($i=0; $i < $nationcount; $i++) {
     </tr>
     <tr>
         <td width=698 height=420>
-            <?=getMapHtml()?>
+            <?=getMapHtml($mapTheme)?>
         </td>
         <td width=139 valign=top><div style='background-color:#cccccc;color:black;text-align:center'>국명</div><?=$nationStr?></td>
         <td width=70 valign=top style='text-align:center'><div style='background-color:#cccccc;color:black;'>국력</div><?=$powerStr?></td>

hwe/b_genList.php

@@ -9,8 +9,6 @@ if ($type <= 0 || $type > 8) {
     $type = 7;
 }
 
-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -19,7 +17,7 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
-increaseRefresh("암행부", 2);
+increaseRefresh("암행부", 1);
 
 $query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
@@ -43,6 +41,8 @@ if ($me['level'] == 0 || ($me['level'] == 1 && $me['belong'] < $nation['secretli
 $sel = [];
 $sel[$type] = "selected";
 
+$templates = new \League\Plates\Engine('templates');
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -65,7 +65,7 @@ $sel[$type] = "selected";
 <body>
 <table align=center width=1000 class='tb_layout bg0'>
     <tr><td>암 행 부<br><?=closeButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
+    <tr><td><form name=form1 method=get>정렬순서 :
         <select name=type size=1>
             <option <?=$sel[1]??''?> value=1>자금</option>
             <option <?=$sel[2]??''?> value=2>군량</option>
@@ -80,54 +80,28 @@ $sel[$type] = "selected";
     </td></tr>
 </table>
 <?php
-$query = "select troop,name from troop where nation='{$me['nation']}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$troopCount = MYDB_num_rows($result);
 $troopName = [];
-for ($i=0; $i < $troopCount; $i++) {
-    $troop = MYDB_fetch_array($result);
-    $troopName[$troop['troop']] = $troop['name'];
+foreach($db->queryAllLists('SELECT troop, name FROM troop WHERE nation=%i', $me['nation']) as [$troopID, $tName]){
+    $troopName[$troopID] = $tName;
 }
 
+$orderSQL = '';
 switch ($type) {
-    case 1: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by gold desc"; break;
-    case 2: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by rice desc"; break;
-    case 3: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by city"; break;
-    case 4: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by crewtype desc"; break;
-    case 5: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by crew desc"; break;
-    case 6: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by killturn"; break;
-    case 7: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by turntime"; break;
-    case 8: $query = "select npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general where nation='{$me['nation']}' order by troop desc"; break;
+    case 1: $orderSQL = "order by gold desc"; break;
+    case 2: $orderSQL = "order by rice desc"; break;
+    case 3: $orderSQL = "order by city"; break;
+    case 4: $orderSQL = "order by crewtype desc"; break;
+    case 5: $orderSQL = "order by crew desc"; break;
+    case 6: $orderSQL = "order by killturn"; break;
+    case 7: $orderSQL = "order by turntime"; break;
+    case 8: $orderSQL = "order by troop desc"; break;
 }
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$gencount = MYDB_num_rows($genresult);
 
-?>
-<table align=center id='general_list' class='tb_layout bg0'>
-    <thead>
-    <tr>
-        <td width=98 align=center class=bg1>이 름</td>
-        <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>
-<?php
-for ($j=0; $j < $gencount; $j++) {
-    $general = MYDB_fetch_array($genresult);
-    $city = CityConst::byID($general['city'])->name;
-    $troop = $troopName[$general['troop']]??'-';
+$generals = $db->query('SELECT npc,mode,no,level,troop,city,injury,leader,power,intel,experience,name,gold,rice,crewtype,crew,train,atmos,killturn,turntime,term,turn0,turn1,turn2,turn3,turn4 from general WHERE nation = %i %l', $me['nation'], $orderSQL);
+
+foreach ($generals as &$general) {
+    $general['cityText'] = CityConst::byID($general['city'])->name;
+    $general['troopText'] = $troopName[$general['troop']]??'-';
 
     if ($general['level'] == 12) {
         $lbonus = $nation['level'] * 2;
@@ -137,81 +111,128 @@ for ($j=0; $j < $gencount; $j++) {
         $lbonus = 0;
     }
     if ($lbonus > 0) {
-        $lbonus = "<font color=cyan>+{$lbonus}</font>";
+        $lbonusText = "<font color=cyan>+{$lbonus}</font>";
     } else {
-        $lbonus = "";
+        $lbonusText = "";
     }
+    $general['lbonus'] = $lbonus;
+    $general['lbonusText'] = $lbonusText;
 
     if ($general['injury'] > 0) {
         $leader = intdiv($general['leader'] * (100 - $general['injury']), 100);
         $power = intdiv($general['power'] * (100 - $general['injury']), 100);
         $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
-        $leader = "<font color=red>{$leader}</font>{$lbonus}";
+        $leader = "<font color=red>{$leader}</font>{$lbonusText}";
         $power = "<font color=red>{$power}</font>";
         $intel = "<font color=red>{$intel}</font>";
     } else {
-        $leader = "{$general['leader']}{$lbonus}";
+        $leader = "{$general['leader']}{$lbonusText}";
         $power = "{$general['power']}";
         $intel = "{$general['intel']}";
     }
 
+    $general['leaderText'] = $leader;
+    $general['powerText'] = $power;
+    $general['intelText'] = $intel;
+
+    $general['expLevelText'] = getExpLevel($general['experience']);
+
     if ($general['npc'] >= 2) {
         $name = "<font color=cyan>{$general['name']}</font>";
     } elseif ($general['npc'] == 1) {
         $name = "<font color=skyblue>{$general['name']}</font>";
     } else {
-        $name =  "{$general['name']}";
+        $name =  $general['name'];
     }
+    //TODO: npc 코드를 일원화
+    $general['nameText'] = $name;
 
     switch ($general['mode']) {
-    case 0: $mode = "×"; break;
-    case 1: $mode = "○"; break;
-    case 2: $mode = "◎"; break;
+        case 0: $mode = "×"; break;
+        case 1: $mode = "○"; break;
+        case 2: $mode = "◎"; break;
     }
+    $general['modeText'] = $mode;
+    $general['crewtypeText'] = GameUnitConst::byId($general['crewtype'])->name??'-';
 
-    echo "
-    <tr>
-        <td class='i_name' align=center><span class='t_name'>$name</span><br>Lv <span class='t_explevel'>".getExpLevel($general['experience'])."</span></td>
-        <td class='i_stat' align=center>{$leader}∥{$power}∥{$intel}</td>
-        <td class='i_troop' align=center>$troop</td>
-        <td class='i_gold' align=center>{$general['gold']}</td>
-        <td class='i_rice' align=center>{$general['rice']}</td>
-        <td class='i_city' align=center>$city</td>
-        <td align=center>$mode</td>
-        <td class='i_crewtype' align=center>".GameUnitConst::byId($general['crewtype'])->name."</td>
-        <td class='i_crew' align=center>{$general['crew']}</td>
-        <td class='i_train' align=center>{$general['train']}</td>
-        <td class='i_atmos' align=center>{$general['atmos']}</td>";
-    if ($general['npc'] >= 2) {
-        echo "
-        <td class='i_action'>
-            <font size=3>NPC 장수";
-    } else {
-        echo "
-        <td class='i_action'>
-            <font size=1>";
+    
+    if ($general['npc'] < 2) {
+        $turntext = [];
         $turn = getTurn($general, 1, 0);
 
         for ($i=0; $i < 5; $i++) {
-            $turn[$i] = StringUtil::subStringForWidth($turn[$i], 0, 20);
+            $turn[$i] = StringUtil::subStringForWidth($turn[$i], 0, 41);
             $k = $i+1;
-            echo "
-                &nbsp;$k : $turn[$i]  <br>";
+            $turntext[] = "&nbsp;$k : $turn[$i]";
         }
+        $general['turntext'] = join("<br>\n", $turntext);
     }
-    echo "
-            </font>
-        </td>
-        <td align=center>{$general['killturn']}</td>
-        <td class='i_turntime' align=center>".substr($general['turntime'], 14, 5)."</td>
-    </tr>";
 }
-echo "
+unset($general);
+
+$genCnt = count($generals);
+$totalGold = 0;
+$totalRice = 0;
+$crew90 = 0;
+$gen90 = 0;
+$crew80 = 0;
+$gen80 = 0;
+$crew60 = 0;
+$gen60 = 0;
+$crewTotal = 0;
+//$genTotal = 0;
+foreach($generals as $general){
+    $totalGold += $general['gold'];
+    $totalRice += $general['rice'];
+
+    $crewTotal += $general['crew'];
+
+    if($general['crew'] == 0){
+        continue;
+    }
+    if($general['train'] >= 90 && $general['atmos'] >= 90){
+        $crew90 += $general['crew'];
+        $gen90 += 1;
+    }
+
+    if($general['train'] >= 80 && $general['atmos'] >= 80){
+        $crew80 += $general['crew'];
+        $gen80 += 1;
+    }
+
+    if($general['train'] >= 60 && $general['atmos'] >= 60){
+        $crew60 += $general['crew'];
+        $gen60 += 1;
+    }
+}
+?>
+
+<table style='width:1000px;margin:5px auto' class='tb_layout bg0'>
+<thead>
+<colgroup>
+<col style="width:120px;"><col>
+<col style="width:120px;"><col>
+<col style="width:120px;"><col>
+<col style="width:120px;"><col>
+</colgroup>
+</thead>
+<tbody>
+<tr>
+<td class='bg1'>전체 금</td><td><?=number_format($totalGold)?></td>
+<td class='bg1'>전체 쌀</td><td><?=number_format($totalRice)?></td>
+<td class='bg1'>평균 금</td><td><?=number_format($totalGold/$genCnt, 2)?></td>
+<td class='bg1'>평균 쌀</td><td><?=number_format($totalRice/$genCnt, 2)?></td>
+</tr>
+<tr>
+<td class='bg1'>전체 병력/장수</td><td><?=number_format($crewTotal)?>/<?=number_format($genCnt)?></td>
+<td class='bg1'>훈사 90 병력/장수</td><td><?=number_format($crew90)?>/<?=number_format($gen90)?></td>
+<td class='bg1'>훈사 80 병력/장수</td><td><?=number_format($crew80)?>/<?=number_format($gen80)?></td>
+<td class='bg1'>훈사 60 병력/장수</td><td><?=number_format($crew60)?>/<?=number_format($gen60)?></td>
+</tr>
 </tbody>
 </table>
-";
 
-?>
+<?=$templates->render('generalList', ['generals'=>$generals])?>
 
 <table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>

hwe/b_myBossInfo.php

@@ -452,15 +452,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_myPage.php

@@ -81,6 +81,10 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 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_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>
@@ -30,6 +75,7 @@ $troopcount = MYDB_num_rows($result);
 <title><?=UniqueConst::$serverName?>: 부대편성</title>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
+<?=WebUtil::printCSS('css/troops.css')?>
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
 <?=WebUtil::printJS('js/ext.plugin_troop.js')?>
 </head>
@@ -50,120 +96,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;
-                if($general["turn{$k}"] == 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 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 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 id='result_killed'></td></tr>
+            <tr><th>받은 피해</th><td id='result_dead'></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_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

@@ -134,8 +134,25 @@ if($btn == "추방") {
             $log[] = "<C>●</><D><b>{$nation['name']}</b></>에서 <R>추방</>당하였습니다.";
 
             // 재야로, 국가 무소속으로, 명성/공헌 N*10%감소
-            $query = "update general set level=0,nation=0,belong=0,betray=betray+1,makelimit='12',gold='{$general['gold']}',rice='{$general['rice']}',dedication=dedication*(1-0.1*betray),experience=experience*(1-0.1*betray) where no='{$general['no']}'";
-            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+            if($admin['year'] <= $admin['startyear'] && $general['npc'] < 2){
+                $db->update('general', [
+                    'level'=>0,
+                    'nation'=>0,
+                    'belong'=>0,
+                ], 'no=%i', $general['no']);
+            }
+            else{
+                $db->update('general', [
+                    'level'=>0,
+                    'nation'=>0,
+                    'belong'=>0,
+                    'betray'=>$db->sqleval('betray + 1'),
+                    'makelimit'=>12,
+                    'gold'=>$general['gold'],
+                    'rice'=>$general['rice'],
+                    'dedication'=>$db->sqleval('dedication * (1 - 0.1*betray)'),
+                ], 'no=%i', $general['no']);
+            }
         }
         // 부대 처리
         $query = "select no from troop where troop='{$general['troop']}'";
@@ -163,7 +180,7 @@ if($btn == "추방") {
         $query = "update city set gen3='0' where gen3='{$general['no']}'";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 
-        if($general['npc'] >= 2 && ($admin['scenario'] == 0 || rand()%100 == 0)) {
+        if($general['npc'] >= 2 && ($admin['scenario'] < 100 || rand()%100 == 0)) {
             switch(rand()%5) {
             case 0: $str = "날 버리다니... 곧 전장에서 복수해주겠다..."; break;
             case 1: $str = "추방이라... 내가 무얼 잘못했단 말인가..."; break;

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

@@ -195,3 +195,10 @@ div.bar_out div.bar_in{
 .tooltiptext {
     display: none;
 }
+
+.btn-group-xs > .btn, .btn-xs {
+    padding  : .25rem .4rem;
+    font-size  : .875rem;
+    line-height  : .5;
+    border-radius : .2rem;
+  }

hwe/css/map.css

@@ -27,12 +27,51 @@
     position:relative;
 }
 
+.map_body .map_bglayer1{
+    width:100%;
+    height:100%;
+    position:absolute;
+    left:0;
+    top:0;
+}
+
+.map_body .map_bglayer2{
+    width:100%;
+    height:100%;
+    position:absolute;
+    left:0;
+    top:0;
+}
+
+.map_body .map_bgroad{
+    width:100%;
+    height:100%;
+    position:absolute;
+    left:0;
+    top:0;
+}
+
+.map_body .map_button_stack{
+    position:absolute;
+    right:0;
+    bottom:0;
+}
+
+.map_body .map_toggle_cityname::after{
+    content: "끄기"
+}
+
+.map_body .map_toggle_cityname.active::after{
+    content: "켜기"
+}
+
 .world_map .city_tooltip{
     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);
@@ -70,6 +109,19 @@
     background:transparent;
 }
 
+.world_map .city_detail_name{
+    background-color:rgba(0,0,0,0.5);
+    font-size:10px;
+    position:absolute;
+    white-space:nowrap;
+    left:70%;
+    bottom:-10px;
+    color:white;
+}
+
+.world_map.hide_cityname .city_detail_name{
+    display:none;
+}
 
 .city_base{
     position:absolute;
@@ -314,6 +366,8 @@
 
 /* Basic */
 
+
+
 .world_map.map_basic .city_filler{
     position:absolute;
     width:100%;

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/d_setting/CityConst.orig.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace sammo;
+
+class CityConst extends CityConstBase{
+    
+}

hwe/d_setting/GameConst.orig.php

@@ -0,0 +1,6 @@
+<?php
+namespace sammo;
+
+class GameConst extends GameConstBase
+{
+}

hwe/d_setting/GameCustomConst.orig.php

@@ -1,12 +0,0 @@
-<?php
-namespace sammo;
-
-class GameCustomConst
-{
-    /** @var int 유저 스탯 총합 */
-    public static $defaultStatTotal = _tK_statTotal_;
-    public static $defaultStatMin = _tK_statMin_;
-    public static $defaultStatMax = _tK_statMax_;
-    public static $defaultStatNPCMax = _tK_statNPCMax_;
-    public static $chiefStatMin = _tK_statChiefMin_;
-}

hwe/d_setting/GameUnitConst.orig.php

@@ -0,0 +1,6 @@
+<?php
+namespace sammo;
+
+class GameUnitConst extends GameUnitConstBase
+{
+}

hwe/d_shared/templates/.htaccess

@@ -0,0 +1 @@
+Deny from  all

hwe/func.php

@@ -424,7 +424,7 @@ function addCommand($typename, $value, $valid = 1, $color=0) {
 function commandGroup($typename, $type=0) {
     if($type == 0) {
         echo "
-    <optgroup label='{$typename}' style=color:skyblue;background-color:black;>";
+    <optgroup label='{$typename}' style='color:skyblue;background-color:black;'>";
     } else {
         echo "
     </optgroup>";
@@ -524,7 +524,7 @@ function commandTable() {
         addCommand("첩보(통솔경험, 자금$develcost3, 군량$develcost3)", 31);
         addCommand("징병(통솔경험)", 11);
         addCommand("모병(통솔경험, 자금x2)", 12);
-        addCommand("훈련(통솔경험, 사기↓)", 13);
+        addCommand("훈련(통솔경험)", 13);
         addCommand("사기진작(통솔경험, 자금↓)", 14);
         //addCommand("전투태세/3턴(통솔경험, 자금↓)", 15);
         addCommand("출병", 16);
@@ -532,7 +532,7 @@ function commandTable() {
         addCommand("첩보(통솔경험, 자금$develcost3, 군량$develcost3)", 31, 0);
         addCommand("징병(통솔경험)", 11, 0);
         addCommand("모병(통솔경험, 자금x2)", 12, 0);
-        addCommand("훈련(통솔경험, 사기↓)", 13, 0);
+        addCommand("훈련(통솔경험)", 13, 0);
         addCommand("사기진작(통솔경험, 자금↓)", 14, 0);
         //addCommand("전투태세/3턴(통솔경험, 자금↓)", 15, 0);
         addCommand("출병", 16, 0);
@@ -699,7 +699,8 @@ function CoreCommandTable() {
     if($city['supply'] == 0) { $valid = 0; }
 
     echo "
-<select name=commandtype size=1 style='height:20px;color:white;background-color:black;font-size:13px;>";
+<select name=commandtype size=1 style='height:20px;color:white;background-color:black;font-size:13px;'>";
+    commandGroup("====== 휴 식 ======");
     addCommand("휴 식", 99);
     commandGroup("", 1);
     commandGroup("====== 인 사 ======");
@@ -1147,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' src='{$imageTemp}/{$picture}' border='0'></td>
         <td width=906 colspan=2>$message[1]</td>
     </tr>";
     for($i=0; $i < $count; $i++) {
@@ -1812,7 +1813,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);
 
@@ -1870,7 +1871,7 @@ function PreprocessCommand($no) {
             $josaUl = JosaUtil::pick($general['item'], '을');
             $log[0] = "<C>●</><C>".getItemName($general['item'])."</>{$josaUl} 사용하여 치료합니다!";
             pushGenLog($general, $log);
-        } elseif($general['injury'] > 10 && $general['item'] == 1 && $general['turn0'] != EncodeCommand(0, 0, 0, 50)) {
+        } elseif($general['injury'] > 10 && $general['item'] == 1 && DecodeCommand($general['turn0'])[0] != 50) {
             //환약 사용
             $query = "update general set injury=0,item=0 where no='$no'";
             MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1887,6 +1888,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>소집해제</>되었습니다!"]);
+        }
+    }
+
 }
 
 
@@ -2016,7 +2038,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) {
@@ -2166,6 +2188,7 @@ function CheckHall($no) {
 
 
 function uniqueItem($general, $log, $vote=0) {
+    //TODO: uniqueItem 재 구현
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
     $connect=$db->get();
@@ -2183,7 +2206,7 @@ function uniqueItem($general, $log, $vote=0) {
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $gen = MYDB_fetch_array($result);
 
-    if($admin['scenario'] == 0)  { $prob = $gen['cnt'] * 5; }  // 5~6개월에 하나씩 등장
+    if($admin['scenario'] < 100)  { $prob = $gen['cnt'] * 5; }  // 5~6개월에 하나씩 등장
     else { $prob = $gen['cnt']; }  // 1~2개월에 하나씩 등장
 
     if($vote == 1) { $prob = Util::round($gen['cnt'] * 0.7 / 3); }     // 투표율 70%, 투표 한번에 2~3개 등장
@@ -2294,6 +2317,69 @@ function uniqueItem($general, $log, $vote=0) {
     return $log;
 }
 
+function checkAbilityEx(int $generalID, ActionLogger $actLog){
+    $db = DB::db();
+    $general = $db->queryFirstRow('SELECT leader,leader2,power,power2,intel,intel2 FROM general WHERE no = %i',$generalID);
+
+    if(!$general){
+        return;
+    }
+
+    if($general['leader2'] < 0){
+        $db->update('general',[
+            'leader2'=>$db->sqleval('leader2 + %i', GameConst::$upgradeLimit),
+            'leader'=>$db->sqleval('leader - 1')
+        ], 'no=%i', $generalID);
+        $actLog->pushGeneralActionLog('<R>통솔</>이 <C>1</> 떨어졌습니다!', ActionLogger::PLAIN);
+        return;
+    }
+
+    if($general['power2'] < 0){
+        $db->update('general',[
+            'power2'=>$db->sqleval('power2 + %i', GameConst::$upgradeLimit),
+            'power'=>$db->sqleval('power - 1')
+        ], 'no=%i', $generalID);
+        $actLog->pushGeneralActionLog('<R>무력</>이 <C>1</> 떨어졌습니다!', ActionLogger::PLAIN);
+        return;
+    }
+
+    if($general['intel2'] < 0){
+        $db->update('general',[
+            'intel2'=>$db->sqleval('intel2 + %i', GameConst::$upgradeLimit),
+            'intel'=>$db->sqleval('intel - 1')
+        ], 'no=%i', $generalID);
+        $actLog->pushGeneralActionLog('<R>지력</>이 <C>1</> 떨어졌습니다!', ActionLogger::PLAIN);
+        return;
+    }
+
+    if($general['leader2'] >= GameConst::$upgradeLimit){
+        $db->update('general',[
+            'leader2'=>$db->sqleval('leader2 - %i', GameConst::$upgradeLimit),
+            'leader'=>$db->sqleval('leader + 1')
+        ], 'no=%i', $generalID);
+        $actLog->pushGeneralActionLog('<R>통솔</>이 <C>1</> 올랐습니다!', ActionLogger::PLAIN);
+        return;
+    }
+
+    if($general['power2'] >= GameConst::$upgradeLimit){
+        $db->update('general',[
+            'power2'=>$db->sqleval('power2 - %i', GameConst::$upgradeLimit),
+            'power'=>$db->sqleval('power + 1')
+        ], 'no=%i', $generalID);
+        $actLog->pushGeneralActionLog('<R>무력</>이 <C>1</> 올랐습니다!', ActionLogger::PLAIN);
+        return;
+    }
+
+    if($general['intel2'] >= GameConst::$upgradeLimit){
+        $db->update('general',[
+            'intel2'=>$db->sqleval('intel2 - %i', GameConst::$upgradeLimit),
+            'intel'=>$db->sqleval('intel + 1')
+        ], 'no=%i', $generalID);
+        $actLog->pushGeneralActionLog('<R>지력</>이 <C>1</> 올랐습니다!', ActionLogger::PLAIN);
+        return;
+    }
+}
+
 function checkAbility($general, $log) {
     $db = DB::db();
     $connect=$db->get();
@@ -2600,6 +2686,9 @@ function searchDistance(int $from, int $maxDist=99, bool $distForm = false) {
 }
 
 function isNeighbor(int $nation1, int $nation2, bool $includeNoSupply=true) {
+    if($nation1 === $nation2){
+        return false;
+    }
     $db = DB::db();
 
     $nation1Cities = [];
@@ -2638,6 +2727,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:
@@ -2648,6 +2791,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:
@@ -2696,6 +2846,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'";
@@ -2717,8 +2869,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);
     
@@ -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);
         }
@@ -628,7 +628,7 @@ function updateCommand($no, $type=0) {
 update general set
 turn0=turn1,turn1=turn2,turn2=turn3,turn3=turn4,turn4=turn5,turn5=turn6,turn6=turn7,turn7=turn8,turn8=turn9,
 turn9=turn10,turn10=turn11,turn11=turn12,turn12=turn13,turn13=turn14,turn14=turn15,turn15=turn16,turn16=turn17,
-turn17=turn18,turn18=turn19,turn19=turn20,turn20=turn21,turn21=turn22,turn22=turn23,turn23='00000000000000'
+turn17=turn18,turn18=turn19,turn19=turn20,turn20=turn21,turn21=turn22,turn22=turn23,turn23='".EncodeCommand(0, 0, 0, 0)."'
 where no='{$general['no']}'
 ";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -642,7 +642,7 @@ update nation set
 {$turn}4={$turn}5,{$turn}5={$turn}6,
 {$turn}6={$turn}7,{$turn}7={$turn}8,
 {$turn}8={$turn}9,{$turn}9={$turn}10,
-{$turn}10={$turn}11,{$turn}11='00000000000099'
+{$turn}10={$turn}11,{$turn}11='".EncodeCommand(0, 0, 0, 99)."'
 where nation='{$general['nation']}'
 ";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -672,7 +672,7 @@ turn9=turn8,turn8=turn7,
 turn7=turn6,turn6=turn5,
 turn5=turn4,turn4=turn3,
 turn3=turn2,turn2=turn1,
-turn1=turn0,turn0='00000000000000'
+turn1=turn0,turn0='".EncodeCommand(0, 0, 0, 0)."'
 where no='$no'
 ";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -685,7 +685,7 @@ update nation set
 {$turn}7={$turn}6,{$turn}6={$turn}5,
 {$turn}5={$turn}4,{$turn}4={$turn}3,
 {$turn}3={$turn}2,{$turn}2={$turn}1,
-{$turn}1={$turn}0,{$turn}0='00000000000099'
+{$turn}1={$turn}0,{$turn}0='".EncodeCommand(0, 0, 0, 99)."'
 where nation='{$general['nation']}'
 ";
         MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -772,19 +772,10 @@ parent.moveProcessing(<?=$commandtype?>, <?=Json::encode($turn)?>);
 
 
 function EncodeCommand($fourth, $third, $double, $command) {
-    $str  = StringUtil::padStringAlignRight((string)$fourth, 4, "0");
-    $str .= StringUtil::padStringAlignRight((string)$third,  4, "0");
-    $str .= StringUtil::padStringAlignRight((string)$double, 4, "0");
-    $str .= StringUtil::padStringAlignRight((string)$command, 2, "0");
-    return $str;
+    return Json::encode([$command, $double, $third, $fourth]);
 }
 
 function DecodeCommand($str) {
-    $command = [];
-    $command[3] = (int)(substr($str, 0, 4));
-    $command[2] = (int)(substr($str, 4, 4));
-    $command[1] = (int)(substr($str, 8, 4));
-    $command[0] = (int)(substr($str, 12, 2));
-    return $command;
+    return Json::decode($str);
 }
 

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'],
         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) {
@@ -355,60 +312,43 @@ function getLevel($level, $nlevel=8) {
 
 function getCall($leader, $power, $intel) {
     $call = '평범';
-    if($leader >= GameConst::$chiefStatMin && $power >= GameConst::$chiefStatMin && $intel >= GameConst::$chiefStatMin) {
-        $call = '만능';
-    } elseif($leader >= GameConst::$chiefStatMin && $power >= GameConst::$chiefStatMin) {
-        $call = '용장';
-    } elseif($leader >= GameConst::$chiefStatMin && $intel >= GameConst::$chiefStatMin) {
-        $call = '지장';
-    } elseif($power >= GameConst::$chiefStatMin && $intel >= GameConst::$chiefStatMin) {
-        $call = '명장';
-    } elseif($leader >= GameConst::$chiefStatMin) {
-        $call = '명사';
-    } elseif($power >= GameConst::$chiefStatMin) {
-        $call = '용맹';
-    } elseif($intel >= GameConst::$chiefStatMin) {
-        $call = '현명';
+
+    if($leader < 40){
+        if($power + $intel < $leader){
+            return '아둔';
+        }
+        if($intel >= GameConst::$chiefStatMin && $power < $intel * 0.8){
+            return '학자';
+        }
+        if($power >= GameConst::$chiefStatMin && $intel < $power * 0.8){
+            return '장사';
+        }
+        return '명사';
     }
-    return $call;
+
+    $maxStat = max($leader, $power, $intel);
+    $sum2Stat = min($leader+$power, $power+$intel, $intel+$leader);
+    if($maxStat >= GameConst::$chiefStatMin + GameConst::$statGradeLevel && $sum2Stat >= $maxStat * 1.7){
+        return '만능';
+    }
+    if($power >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $intel < $power * 0.8){
+        return '용장';
+    }
+    if($intel >= GameConst::$chiefStatMin - GameConst::$statGradeLevel && $power < $intel * 0.8){
+        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}품관";
 }
 
 
@@ -435,16 +375,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;
 }
@@ -461,9 +403,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);
 }
 
@@ -471,142 +411,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) {
@@ -615,7 +522,7 @@ function getDexLog($dex1, $dex2) {
 }
 
 
-function getWeapName($weap) : string {
+function getWeapName($weap) : ?string {
     switch($weap) {
         case  0: $weapname = '-'; break;
         case  1: $weapname = '단도(+1)'; break;
@@ -649,7 +556,7 @@ function getWeapName($weap) : string {
     return $weapname;
 }
 
-function getWeapEff($weap) : int{
+function getWeapEff($weap) : ?int{
     switch($weap) {
         case  7: $weap =  7; break;
         case  8: $weap =  7; break;
@@ -676,7 +583,7 @@ function getWeapEff($weap) : int{
     return $weap;
 }
 
-function getBookName($book) : string {
+function getBookName($book) : ?string {
     switch($book) {
         case  0: $bookname = '-'; break;
         case  1: $bookname = '효경전(+1)'; break;
@@ -710,7 +617,7 @@ function getBookName($book) : string {
     return $bookname;
 }
 
-function getBookEff($book) : int {
+function getBookEff($book) : ?int {
     switch($book) {
         case  7: $book =  7; break;
         case  8: $book =  7; break;
@@ -737,7 +644,7 @@ function getBookEff($book) : int {
     return $book;
 }
 
-function getHorseName($horse) : string {
+function getHorseName($horse) : ?string {
     switch($horse) {
         case  0: $horsename = '-'; break;
         case  1: $horsename = '노기(+1)'; break;
@@ -771,7 +678,7 @@ function getHorseName($horse) : string {
     return $horsename;
 }
 
-function getHorseEff($horse) : int {
+function getHorseEff($horse) : ?int {
     switch($horse) {
         case  7: $horse =  7; break;
         case  8: $horse =  7; break;

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 => '특'
+    ];
+}
 
  /**
  * 게임 내부에 사용하는 유틸리티 함수들을 분리
@@ -115,22 +160,37 @@ function getSpecial2($leader, $power, $intel, $nodex=1, $dex0=0, $dex10=0, $dex2
 }
 
 function getGenDex($general, $type) {
-    $type = intdiv($type, 10) * 10;
-    return $general["dex{$type}"];
+    //XXX: 지금은 동작하지만.. 병종 구성이 보궁기귀차 에서 바뀌면...
+    $ntype = GameUnitConst::byId($type)->armType * 10;
+    return $general["dex{$ntype}"]??0;
 }
 
 function addGenDex($no, $atmos, $train, $type, $exp) {
+    //XXX: 지금은 동작하지만.. 병종 구성이 보궁기귀차 에서 바뀌면...
     $db = DB::db();
-    $connect=$db->get();
 
-    $type = intdiv($type, 10) * 10;
-    $dexType = "dex{$type}";
-    if($type == 30) { $exp = Util::round($exp * 0.90); }     //귀병은 90%효율
-    elseif($type == 40) { $exp = Util::round($exp * 0.90); } //차병은 90%효율
-    $exp = Util::round($exp * ($atmos+$train) / 200); // 사기 + 훈련 / 200
+    $armType = GameUnitConst::byId($type)->armType;
+    if($armType == GameUnitConst::T_CASTLE){
+        $armType = GameUnitConst::T_SIEGE;
+    }
 
-    $query = "update general set {$dexType}={$dexType}+{$exp} where no='$no'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    if($armType < 0){
+        return;
+    }
+    
+    $ntype = $armType*10;
+    $dexType = "dex{$ntype}";
+    if($armType == GameUnitConst::T_WIZARD) {
+        $exp = Util::round($exp * 0.90); 
+    }
+    else if($armType == GameUnitConst::T_SIEGE) {
+        $exp = Util::round($exp * 0.90);
+    }
+    $exp = Util::round($exp * ($atmos + $train) / 200); // 사기 + 훈련 / 200
+
+    $db->update('general', [
+        $dexType=>$db->sqleval('%b + %i', $dexType, $exp)
+    ], 'no=%i', $no);
 }
 
 
@@ -314,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),"");
@@ -1391,6 +1430,10 @@ function checkEmperior() {
     $serverCnt = $db->queryFirstField('SELECT count(*) FROM ng_games');
     $serverName = UniqueConst::$serverName;
 
+    $db->update('ng_games', [
+        'winner_nation'=>$nation['nation']
+    ], 'server_id=%s', UniqueConst::$serverID);
+
     $db->insert('emperior', [
         'phase'=>$serverName.$serverCnt.'기',
         'server_id'=>UniqueConst::$serverID,

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: //무장
@@ -107,48 +119,52 @@ 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);
@@ -181,7 +197,7 @@ function processAI($no) {
     $general = MYDB_fetch_array($result);
 
     // 입력된 턴이 있으면 그것 실행
-    if($general['turn0'] != "00000000000000") {
+    if(DecodeCommand($general['turn0'])[0] != 0) {
         return;
     }
 
@@ -208,12 +224,9 @@ function processAI($no) {
         $coreCommand = MYDB_fetch_array($result);
     }
 
-    $attackable = 0;
-    $query = "select city from city where nation='{$general['nation']}' and supply='1' and front=1";
-    $result = MYDB_query($query, $connect) or Error("processAI10 ".MYDB_error($connect),"");
-    $cityCount = MYDB_num_rows($result);
+    $cityCount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i AND supply=1 AND front=1', $general['nation']);
     // 공격가능도시 있으면 1
-    if($cityCount > 0) { $attackable = 1; }
+    $attackable = $cityCount > 0;
 
     $dipState = 0;
     $query = "select no from diplomacy where me='{$general['nation']}' and state=1 and term>8";
@@ -307,10 +320,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); //임관
@@ -320,7 +333,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:
@@ -377,7 +390,7 @@ function processAI($no) {
     //군주가 할일
     if($general['level'] == 12) {
         //오랑캐인데 공격 못하면 바로 방랑/해산
-        if($general['npc'] == 5 && $dipState == 0 && $attackable == 0) {
+        if($general['npc'] == 9 && $dipState == 0 && !$attackable) {
             //방랑군이냐 아니냐
             if($nation['level'] == 0) {
                 // 해산
@@ -443,37 +456,44 @@ function processAI($no) {
             }
         } else {
             //외교 평시에 선포
-            if($dipState == 0 && $attackable == 0) {
-                //전방 체크 먼저
+
+            do{
+                if($dipState != 0){
+                    break;
+                }
+                if($attackable){
+                    break;
+                }
+
                 SetNationFront($nation['nation']);
 
-                $query = "select city from city where nation='{$general['nation']}' and front=1 limit 0,1";
-                $result = MYDB_query($query, $connect) or Error("processAI02 ".MYDB_error($connect),"");
-                $frontCount = MYDB_num_rows($result);
-                //근접 공백지 없을때
-                if($frontCount == 0) {
-                    $query = "select (sum(pop/10)+sum(agri)+sum(comm)+sum(secu)+sum(def)+sum(wall))/(sum(pop2/10)+sum(agri2)+sum(comm2)+sum(secu2)+sum(def2)+sum(wall2))*100 as dev from city where nation='{$general['nation']}'";
-                    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-                    $devRate = MYDB_fetch_array($result);
-                    //내정이 80% 이상일때
-                    if($devRate['dev'] > 80) {
-                        $query = "select nation from nation where level>0 order by rand()";
-                        $result = MYDB_query($query, $connect) or Error("processAI09 ".MYDB_error($connect),"");
-                        $nationCount = MYDB_num_rows($result);
-                        for($i=0; $i < $nationCount; $i++) {
-                            $youNation = MYDB_fetch_array($result);
-
-                            if(isNeighbor($general['nation'], $youNation['nation'])) {
-                                $command = EncodeCommand(0, 0, $youNation['nation'], 62);
-                                $query = "update nation set l12turn0='$command' where nation='{$general['nation']}'";
-                                MYDB_query($query, $connect) or Error("processAI09 ".MYDB_error($connect),"");
-                                $rulerCommand = 1;
-                                break;
-                            }
-                        }
-                    }
+                $frontCount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i AND front=1', $general['nation']);
+                if($frontCount > 0){
+                    break;
                 }
-            }
+
+                $devRate = $db->queryFirstField('SELECT (sum(pop/10)+sum(agri)+sum(comm)+sum(secu)+sum(def)+sum(wall))/(sum(pop2/10)+sum(agri2)+sum(comm2)+sum(secu2)+sum(def2)+sum(wall2)) from city where nation=%i', $general['nation']);
+                if($devRate < 0.8){
+                    break;
+                }
+
+                $nations = [];
+                foreach ($db->queryAllLists('SELECT nation, power FROM nation WHERE level>0') as [$youNationID, $youNationPower]) {
+                    if(!isNeighbor($general['nation'], $youNationID)){
+                        continue;
+                    }
+                    $nations[$youNationID] = 1/sqrt($youNationPower+1);
+                }
+                if(!$nations){
+                    break;
+                }
+                $youNationID = Util::choiceRandomUsingWeight($nations);
+                $command = EncodeCommand(0, 0, $youNationID, 62);
+                $db->update('nation', [
+                    'l12turn0'=>$command
+                ], 'nation=%i', $general['nation']);
+                $rulerCommand = 1;
+            }while(false);
         }
     }
 
@@ -582,7 +602,7 @@ function processAI($no) {
         
         $target = array();
         // 평시거나 초반아니면서 공격가능 없으면서 병사 있으면 해제(25%)
-        if($dipState == 0 && $isStart == 0 && $attackable == 0 && $general['crew'] > 0 && rand()% 100 < 25) {
+        if($dipState == 0 && $isStart == 0 && !$attackable && $general['crew'] > 0 && rand()% 100 < 25) {
             $command = EncodeCommand(0, 0, 0, 17);    //소집해제
         } elseif($dipState <= 1 || $isStart == 1) {
         //평시이거나 선포있어도 초반이면
@@ -824,26 +844,11 @@ function processAI($no) {
     }
 
     switch($command) {
-    case "00000000000001": //내정
+    case EncodeCommand(0, 0, 0, 1): //내정
         SetDevelop($genType, $general['no'], $general['city'], $nation['tech']);
         return;
-    case "00000000000011": //징병
-        $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']);
+    case EncodeCommand(0, 0, 0, 11): //징병
+        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']}'";

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'];
     }
@@ -814,8 +820,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']);
@@ -852,188 +858,175 @@ function process_9(&$general) {
 }
 
 function process_11(&$general, $type) {
+    if($type == 1){
+        $type = '징병';
+    }
+    else{
+        $type = '모병';
+    }
+
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();
-
-    $log = [];
-    $alllog = [];
-    $history = [];
     $date = substr($general['turntime'],11,5);
 
-    if($type == 1) { $defaultatmos = GameConst::$defaultAtmosLow; $defaulttrain = GameConst::$defaultTrainLow; }
-    else { $defaultatmos = GameConst::$defaultAtmosHigh; $defaulttrain = GameConst::$defaultTrainHigh; }
+    if($type === '징병') { 
+        $defaultatmos = GameConst::$defaultAtmosLow;
+        $defaulttrain = GameConst::$defaultTrainLow;
+    }
+    else {
+        $defaultatmos = GameConst::$defaultAtmosHigh;
+        $defaulttrain = GameConst::$defaultTrainHigh;
+    }
 
-    $admin = $gameStor->getValues(['startyear', 'year', 'month']);
+    [$startyear, $year, $month] = $gameStor->getValuesAsArray(['startyear', 'year', 'month']);
 
-    $query = "select level,tech from nation where nation='{$general['nation']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    $lbonus = setLeadershipBonus($general, $nation['level']);
-
-    $query = "select * from city where city='{$general['city']}'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($result);
+    $actLog = new ActionLogger($general['no'], $general['nation'], $year, $month);
 
     $command = DecodeCommand($general['turn0']);
-    $armtype = $command[2];
-    $crew = $command[1];
+    $crewType = $command[2];
+    $rawCrew = $command[1];
+    
 
-    if($armtype != $general['crewtype']) { $general['crew'] = 0; $general['train'] = $defaulttrain; $general['atmos'] = $defaultatmos; }
-
-    if($crew*100 + $general['crew'] > getGeneralLeadership($general, true, true, true)*100) { 
-        $crew = Util::round(getGeneralLeadership($general, true, true, true) - $general['crew']/100);
+    if($crewType != $general['crewtype']) {
+        $general['crew'] = 0;
+        $general['train'] = $defaulttrain;
+        $general['atmos'] = $defaultatmos;
     }
-    if($crew < 0) { $crew = 0; }
-    $cost = $crew * getCost($armtype);
-    //기술로 가격
-    $cost *= getTechCost($nation['tech']);
+
+    if($general['crew'] != 0) { 
+        $dtype = "추가".$type; 
+    }
+    else {
+        $dtype = $type;
+    }
+
+    if(!$general['nation']){
+        $actLog->pushGeneralActionLog("재야입니다. $dtype 실패. <1>$date</>");
+        return;
+    }
+
+    $city = $db->queryFirstRow('SELECT * FROM city WHERE city = %i', $general['city']);
+
+    if($city['nation'] != $general['nation']){
+        $actLog->pushGeneralActionLog("아국이 아닙니다. $dtype 실패. <1>$date</>");
+        return;
+    }
+
+    $crewTypeObj = GameUnitConst::byID($crewType);
+    if($crewTypeObj === null){
+        $actLog->pushGeneralActionLog("병종 코드 에러. $type 실패. <1>$date</>");
+        return;
+    }
+
+    [$nationLevel, $tech] = $db->queryFirstList('SELECT `level`,tech FROM nation WHERE nation=%i', $general['nation']);
+
+    $lbonus = setLeadershipBonus($general, $nationLevel);
+
+    //NOTE: 입력 변수는 100명 단위임
+    $crew = $rawCrew * 100;	
+    if($crew + $general['crew'] > getGeneralLeadership($general, true, true, true)*100) { 
+        $crew = max(0, getGeneralLeadership($general, true, true, true) * 100 - $general['crew']);
+    }
+
+    if($crew <= 0) {
+        $actLog->pushGeneralActionLog("더이상 $dtype 할 수 없습니다. $dtype 실패. <1>$date</>");
+        return;
+    }
+
+    $cost = $crewTypeObj->costWithTech($tech, $crew);
+	if($type === '모병') { 
+		$cost *= 2;
+	}
     //성격 보정
-    $cost = CharCost($cost, $general['personal']);
-    $cost = Util::round($cost);
+    $cost = Util::round(CharCost($cost, $general['personal']));
 
-    //특기 보정 : 보병, 궁병, 기병, 귀병, 공성, 징병
-    if(intdiv($armtype, 10) == 0 && $general['special2'] == 50) { $cost *= 0.9; }
-    if(intdiv($armtype, 10) == 1 && $general['special2'] == 51) { $cost *= 0.9; }
-    if(intdiv($armtype, 10) == 2 && $general['special2'] == 52) { $cost *= 0.9; }
-    if(intdiv($armtype, 10) == 3 && $general['special2'] == 40) { $cost *= 0.9; }
-    if(intdiv($armtype, 10) == 4 && $general['special2'] == 53) { $cost *= 0.9; }
+    //특기 보정 : 징병, 보병, 궁병, 기병, 귀병, 공성
     if($general['special2'] == 72) { $cost *= 0.5; }
-
-    if($type == 1) { $dtype = "징병"; }
-    elseif($type == 2) { $dtype = "모병"; $cost *= 2; }
-    if($general['crew'] != 0) { $dtype = "추가".$dtype; }
-
-    //현재 가능한지 검사
-    switch($armtype) {
-        case 0:  case 10:  case 20:  case 30: case 35: // 보병 궁병 기병 귀병 남귀병
-            $sel = 0; break;
-
-        case  1: $sel = 1; $rg =  2; break; // 청주병(중원)
-        case  2: $sel = 1; $rg =  7; break; // 수병(오월)
-        case  3: $sel = 2; $ct = 64; break; // 자객병(저)
-        case  4: $sel = 2; $ct =  3; break; // 근위병(낙양)
-        case  5: $sel = 1; $rg =  5; break; // 등갑병(남중)
-
-        case 11: $sel = 1; $rg =  8; break; // 궁기병(동이)
-        case 12: $sel = 1; $rg =  4; break; // 연노병(서촉)
-        case 13: $sel = 2; $ct =  6; break; // 강궁병(양양)
-        case 14: $sel = 2; $ct =  7; break; // 석궁병(건업)
-
-        case 21: $sel = 1; $rg =  1; break; // 백마병(하북)
-        case 22: $sel = 1; $rg =  3; break; // 중장기병(서북)
-        case 23: $sel = 2; $ct = 65; break; // 돌격기병(흉노)
-        case 24: $sel = 2; $ct = 63; break; // 철기병(강)
-        case 25: $sel = 2; $ct = 67; break; // 수렵기병(산월)
-        case 26: $sel = 2; $ct = 66; break; // 맹수병(남만)
-        case 27: $sel = 2; $ct =  2; break; // 호표기병(허창)
-
-        case 31: $sel = 1; $rg =  6; break; // 신귀병(초)
-        case 32: $sel = 2; $ct = 68; break; // 백귀병(오환)
-        case 33: $sel = 2; $ct = 69; break; // 흑귀병(왜)
-        case 34: $sel = 2; $ct =  4; break; // 악귀병(장안)
-        case 36: $sel = 2; $ct =  3; break; // 황귀병(낙양)
-        case 37: $sel = 2; $ct =  5; break; // 천귀병(성도)
-        case 38: $sel = 2; $ct =  1; break; // 마귀병(업)
-
-        case 40: $sel = 0; break; // 정란
-        case 41: $sel = 0; break; // 충차
-        case 42: $sel = 2; $ct =  1; break; // 벽력거(업)
-        case 43: $sel = 2; $ct =  5; break; // 목우(성도)
-
-        default: $sel = 0; $armtype = 0; break;
-    }
-    if($sel == 0) {
-        // 남귀병은 기술1등급부터
-        // 충차는 기술1등급부터
-        if($armtype == 35 && $nation['tech'] < 1000) {
-            $cnt = 0;
-        } elseif($armtype == 41 && $nation['tech'] < 1000) {
-            $cnt = 0;
-        } else {
-            $cnt = 1;
-        }
-    } elseif($sel == 1) {
-        $query = "select city,level from city where nation='{$general['nation']}' and region='$rg'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $cnt = MYDB_num_rows($result);
-        $rgcity = MYDB_fetch_array($result);
-        // 기술 1000 이상부터 지역병
-        if($cnt > 0 && $nation['tech'] < 1000) {
-            $cnt = 0;
-        }
-    } else {
-        $query = "select city,level from city where nation='{$general['nation']}' and city='$ct'";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $cnt = MYDB_num_rows($result);
-        $ctcity = MYDB_fetch_array($result);
-        // 기술 2000 이상부터 이민족병
-        if($cnt > 0 && $ctcity['level'] == 4 && $nation['tech'] < 2000) {
-            $cnt = 0;
-        }
-        // 기술 3000 이상부터 특수병
-        if($cnt > 0 && $ctcity['level'] == 8 && $nation['tech'] < 3000) {
-            $cnt = 0;
-        }
-    }
-    if($cnt > 0) { $valid = 1; }
-    else { $valid = 0; }
-
-    // 초반 제한중 차병 불가
-    if($admin['year'] < $admin['startyear']+3 && intdiv($armtype, 10) == 4) {
-        $valid = 0;
+    else if($general['special2'] == 50 && $crewTypeObj->armType == GameUnitConstBase::T_FOOTMAN) { $cost *= 0.9; }
+    else if($general['special2'] == 51 && $crewTypeObj->armType == GameUnitConstBase::T_ARCHER) { $cost *= 0.9; }
+    else if($general['special2'] == 52 && $crewTypeObj->armType == GameUnitConstBase::T_CAVALRY) { $cost *= 0.9; }
+    else if($general['special2'] == 40 && $crewTypeObj->armType == GameUnitConstBase::T_WIZARD) { $cost *= 0.9; }
+    else if($general['special2'] == 53 && $crewTypeObj->armType == GameUnitConstBase::T_SIEGE) { $cost *= 0.9; }
+    
+    if($general['gold'] < $cost){
+        $actLog->pushGeneralActionLog("자금이 모자랍니다. $dtype 실패. <1>$date</>");
+        return;
     }
 
-    if($general['level'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:재야입니다. $dtype 실패. <1>$date</>";
-    } elseif($city['nation'] != $general['nation']) {
-        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. $dtype 실패. <1>$date</>";
-//    } elseif($city['supply'] == 0) {
-//        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. $dtype 실패. <1>$date</>";
-    } elseif($crew <= 0) {
-        $log[] = "<C>●</>{$admin['month']}월:더이상 $dtype 할 수 없습니다. $dtype 실패. <1>$date</>";
-    } elseif($general['gold'] < $cost) {
-        $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. $dtype 실패. <1>$date</>";
-    } elseif($general['rice'] < $crew) {
-        $log[] = "<C>●</>{$admin['month']}월:군량이 모자랍니다. $dtype 실패. <1>$date</>";
-    } elseif($valid == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:현재 $dtype 할 수 없는 병종입니다. $dtype 실패. <1>$date</>";
-    } elseif($city['pop']-30000 < $crew*100) {    // 주민 30000명 이상만 가능
-        $log[] = "<C>●</>{$admin['month']}월:주민이 모자랍니다. $dtype 실패. <1>$date</>";
-    } elseif($city['rate'] < 20) {
-        $log[] = "<C>●</>{$admin['month']}월:민심이 낮아 주민들이 도망갑니다. $dtype 실패. <1>$date</>";
-    } else {
-        $log[] = "<C>●</>{$admin['month']}월:".GameUnitConst::byId($armtype)->name."을(를) <C>{$crew}00</>명 {$dtype}했습니다. <1>$date</>";
-        $exp = $crew;
-        $ded = $crew;
-        // 숙련도 증가
-        addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $armtype, $crew);
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $general['personal']);
-
-        $atmos = Util::round(($general['atmos'] * $general['crew'] + $defaultatmos * $crew*100) / ($general['crew'] + $crew*100));
-        $train = Util::round(($general['train'] * $general['crew'] + $defaulttrain * $crew*100) / ($general['crew'] + $crew*100));
-        $general['crew'] += $crew*100;
-        $general['gold'] -= $cost;
-        // 주민수 감소        // 민심 김소
-        if($type == 1) { $city['rate'] = $city['rate'] - Util::round(($crew*100 / $city['pop'])*100); }
-        else { $city['rate'] = $city['rate'] - Util::round(($crew*100 / $city['pop'])*50); }
-        if($city['rate'] < 0) { $city['rate'] = 0; }
-        $query = "update city set pop=pop-({$crew}*100),rate='{$city['rate']}' where city='{$general['city']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        // 통솔경험, 병종 변경, 병사수 변경, 훈련치 변경, 사기치 변경, 자금 군량 하락, 공헌도, 명성 상승
-        $general['leader2']++;
-        $query = "update general set resturn='SUCCESS',leader2='{$general['leader2']}',crewtype='$armtype',crew='{$general['crew']}',train='$train',atmos='$atmos',gold='{$general['gold']}',rice=rice-'$crew',dedication=dedication+'$ded',experience=experience+'$exp' where no='{$general['no']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-
-        $log = checkAbility($general, $log);
-        $log = uniqueItem($general, $log);
+    if($general['rice'] < $crew / 100) {
+        $actLog->pushGeneralActionLog("군량이 모자랍니다. $dtype 실패. <1>$date</>");
+        return;
     }
 
-    pushGenLog($general, $log);
+    $ownCities = [];
+    $ownRegions = [];
+    foreach($db->queryFirstColumn('SELECT city FROM city WHERE nation = %i', $general['nation']) as $ownCity){
+        $ownCities[$ownCity] = 1;
+        $ownRegions[CityConst::byId($ownCity)->region] = 1;
+    }
+    $valid = $crewTypeObj->isValid($ownCities, $ownRegions, $year - $startyear, $tech);
+
+    if(!$valid) {
+        $actLog->pushGeneralActionLog("현재 $dtype 할 수 없는 병종입니다. $dtype 실패. <1>$date</>");
+        return;
+    }
+    
+    if($city['pop']-30000 < $crew) {    // 주민 30000명 이상만 가능
+        $actLog->pushGeneralActionLog("주민이 모자랍니다. $dtype 실패. <1>$date</>");
+        return;
+    }
+    if($city['rate'] < 20) {
+        $actLog->pushGeneralActionLog("민심이 낮아 주민들이 도망갑니다. $dtype 실패. <1>$date</>");
+        return;
+    }
+    
+    $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);
+    // 숙련도 증가
+    addGenDex($general['no'], GameConst::$maxAtmosByCommand, GameConst::$maxTrainByCommand, $crewType, $crew/100);
+
+    // 성격 보정
+    $exp = CharExperience($exp, $general['personal']);
+    $ded = CharDedication($ded, $general['personal']);
+
+    $atmos = Util::round(($general['atmos'] * $general['crew'] + $defaultatmos * $crew) / ($general['crew'] + $crew));
+    $train = Util::round(($general['train'] * $general['crew'] + $defaulttrain * $crew) / ($general['crew'] + $crew));
+    $general['crew'] += $crew;
+    $general['gold'] -= $cost;
+    // 주민수 감소        // 민심 감소
+    if($type === '징병') {
+        $city['rate'] -= Util::round(($crew / $city['pop'])*100); 
+    }
+    else {
+        $city['rate'] -= Util::round(($crew / 2 / $city['pop'])*100); 
+    }
+    if($city['rate'] < 0) { $city['rate'] = 0; }
+
+    $db->update('city', [
+        'pop'=>$db->sqleval('pop-%i', $crew),
+        'rate'=>$city['rate']
+    ], 'city = %i', $general['city']);
+
+    // 통솔경험, 병종 변경, 병사수 변경, 훈련치 변경, 사기치 변경, 자금 군량 하락, 공헌도, 명성 상승
+    $general['leader2']++;
+    $db->update('general', [
+        'resturn'=>'SUCCESS',
+        'leader2'=>$general['leader2'],
+        'crewtype'=>$crewTypeObj->id,
+        'crew'=>$general['crew'],
+        'train'=>$train,
+        'atmos'=>$atmos,
+        'gold'=>$general['gold'],
+        'rice'=>$db->sqleval('rice - %i', Util::round($crew/100)),
+        'dedication'=>$db->sqleval('dedication + %i', $ded),
+        'experience'=>$db->sqleval('experience + %i', $exp)
+    ], 'no=%i', $general['no']);
+
+    checkAbilityEx($general['no'], $actLog);
+    $log = uniqueItem($general, []);//TODO: uniqueItem 재 구현
+    $actLog->pushGeneralActionLog($log, ActionLogger::RAWTEXT);
 }
 
 function process_13(&$general) {
@@ -1060,14 +1053,10 @@ function process_13(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:재야입니다. 훈련 실패. <1>$date</>";
     } elseif($city['nation'] != $general['nation']) {
         $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. 훈련 실패. <1>$date</>";
-//    } elseif($city['supply'] == 0) {
-//        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. 훈련 실패. <1>$date</>";
     } elseif($general['crew'] == 0) {
         $log[] = "<C>●</>{$admin['month']}월:병사가 없습니다. 훈련 실패. <1>$date</>";
     } elseif($general['train'] >= GameConst::$maxTrainByCommand) {
         $log[] = "<C>●</>{$admin['month']}월:병사들은 이미 정예병사들입니다. <1>$date</>";
-//    } elseif(intdiv($general['crewtype'], 10) == 4) {
-//        $log[] = "<C>●</>{$admin['month']}월:병기는 훈련이 불가능합니다. <1>$date</>";
     } else {
         // 훈련시
         $score = Util::round(getGeneralLeadership($general, true, true, true) * 100 / $general['crew'] * GameConst::$trainDelta);
@@ -1128,16 +1117,12 @@ function process_14(&$general) {
         $log[] = "<C>●</>{$admin['month']}월:재야입니다. 사기진작 실패. <1>$date</>";
     } elseif($city['nation'] != $general['nation']) {
         $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. 사기진작 실패. <1>$date</>";
-//    } elseif($city['supply'] == 0) {
-//        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. 사기진작 실패. <1>$date</>";
     } elseif($general['crew'] == 0) {
         $log[] = "<C>●</>{$admin['month']}월:병사가 없습니다. 사기진작 실패. <1>$date</>";
     } elseif($general['gold'] < $general['crew']/100) {
         $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. 사기진작 실패. <1>$date</>";
     } elseif($general['atmos'] >= GameConst::$maxAtmosByCommand) {
         $log[] = "<C>●</>{$admin['month']}월:이미 사기는 하늘을 찌를듯 합니다. <1>$date</>";
-//    } elseif(intdiv($general['crewtype'], 10) == 4) {
-//        $log[] = "<C>●</>{$admin['month']}월:병기는 사기 진작이 불가능합니다. <1>$date</>";
     } else {
         $score = Util::round(getGeneralLeadership($general, true, true, true)*100 / $general['crew'] * GameConst::$atmosDelta);
         $gold = $general['gold'] - Util::round($general['crew']/100);
@@ -1310,20 +1295,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);
     }
 
@@ -1812,14 +1784,7 @@ function process_41(&$general) {
     } elseif($crewexp == 0) {
         $log[] = "<C>●</>{$admin['month']}월:병사가 모자랍니다. 단련 실패. <1>$date</>";
     } else {
-        $type = intdiv($general['crewtype'], 10);
-        switch($type) {
-        case 0: $crewstr = '보병'; break;
-        case 1: $crewstr = '궁병'; break;
-        case 2: $crewstr = '기병'; break;
-        case 3: $crewstr = '귀병'; break;
-        case 4: $crewstr = '차병'; break;
-        }
+        $crewstr = GameUnitConst::allType()[GameUnitConst::byID($general['crewtype'])->armType];
 
         if($ratio < 33) {
             // 숙련도 증가

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</>"]);
 }
 
@@ -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']}에 선전포고";
 
@@ -846,13 +782,6 @@ function process_63(&$general) {
         pushGenLog($general, ["<C>●</>{$month}월:고립된 도시입니다. 제의 실패. <1>$date</>"]);
         return;
     }
-    
-    $exp = 5;
-    $ded = 5;
-
-    // 성격 보정
-    $exp = CharExperience($exp, $general['personal']);
-    $ded = CharDedication($ded, $general['personal']);
 
     // 상대에게 발송
     $src = new MessageTarget(
@@ -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),"");
@@ -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();
     }
 

hwe/func_process_personnel.php

@@ -84,7 +84,7 @@ function process_25(&$general) {
     $joinedNations = Json::decode($general['nations']);
 
     // 랜덤임관인 경우
-    if($general['npc'] > 2 && $where >= 98 && ($admin['scenario'] == 0 || $admin['scenario'] >= 20 || !$admin['fiction'])){
+    if($general['npc'] > 2 && $where >= 98 && ($admin['scenario'] < 100 || $admin['scenario'] >= 2000 || !$admin['fiction'])){
         //'사실' 모드에서는 '성향'에 우선을 두되, 장수수, 랜덤에 비중을 둠
         $nations = $db->query(
             'SELECT nation.`name` as `name`,nation.nation as nation,scout,nation.`level` as `level`,gennum,`affinity` FROM nation join general on general.nation = nation.nation and general.level = 12 WHERE nation.nation not in %li and gennum < %i and scout = 0',
@@ -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</>";
@@ -339,7 +339,7 @@ function process_29(&$general) {
             // 체섭시 무장 20%, 지장 20%, 무지장 60%
             // 마이너 무장 40%, 지장 40%, 무지장 20%
             $type = rand() % 10;
-            if($admin['scenario'] == 0) {
+            if($admin['scenario'] < 100) {
                 switch($type) {
                 case 0: case 1:
                     $leader = GameConst::$defaultStatMax - 10 + rand()%11;

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;
+    
+    $srcCityID = $general['city'];
+    $destCityID = DecodeCommand($general['turn0'])[1];
 
-    $query = "select * from city where city='$destination'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $destcity = MYDB_fetch_array($result);
+    $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;
 
-    $nation = getNationStaticInfo($general['nation']);
+    $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);
+    $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);
-
-    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;
-        }
-
-        // 특기보정 : 신산, 귀모
-        if($general['special2'] == 41) { $ratio += 10; }
-        if($general['special'] == 31) { $ratio += 20; }
-
-        // 국가보정
-        if($nation['type'] == 9) { $ratio += 10; }
-
-        // 거리보정
-        $ratio /= Util::array_get($dist[$destination], 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</>";
-
-            $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),"");
-
-            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']);
-
-        $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);
+    $failReason = checkSabotageFailCondition($general, $srcCity, $destCity, $reqGold, $reqRice, $dipState);
+    if($failReason !== null){
+        $logger->pushGeneralActionLog("{$failReason} {$sabotageName} 실패. <1>{$date}</>");
+        return;
     }
-    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-    pushGenLog($general, $log);
+
+    $srcNation = getNationStaticInfo($srcNationID);
+    $destNation = getNationStaticInfo($destNationID);
+
+    $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)
+    );
+
+    // 거리보정
+    $sabotageProb /= Util::array_get($dist[$destCityID], 99);
+
+    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;
+    }
+
+    $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;
-        }
-
-        // 특기보정 : 신산, 귀모
-        if($general['special2'] == 41) { $ratio += 10; }
-        if($general['special'] == 31) { $ratio += 20; }
-
-        // 국가보정
-        if($mynation['type'] == 9) { $ratio += 10; }
-
-        // 거리보정
-        $ratio /= Util::array_get($dist[$destination], 99);
-
-        if($ratio > $ratio2) {
-            $alllog[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에서 금과 쌀을 도둑맞았습니다.";
-            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 탈취가 성공했습니다. <1>$date</>";
-
-            // 탈취 최대 400 * 8
-            $gold = (rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount) * $destcity['level'];
-            $rice = (rand() % GameConst::$sabotageAmountCoef + GameConst::$sabotageDefaultAmount) * $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($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),"");
-            } 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']);
-
-        $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),"");
-
-        $log = checkAbility($general, $log);
+    $failReason = checkSabotageFailCondition($general, $srcCity, $destCity, $reqGold, $reqRice, $dipState);
+    if($failReason !== null){
+        $logger->pushGeneralActionLog("{$failReason} {$sabotageName} 실패. <1>{$date}</>");
+        return;
     }
-    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-    pushGenLog($general, $log);
+
+    $srcNation = getNationStaticInfo($srcNationID);
+    $destNation = getNationStaticInfo($destNationID);
+
+    $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)
+    );
+
+    // 거리보정
+    $sabotageProb /= Util::array_get($dist[$destCityID], 99);
+
+    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 = Util::randRangeInt(GameConst::$sabotageDamageMin, GameConst::$sabotageDamageMax) * $destCity['level'];
+    $rice = Util::randRangeInt(GameConst::$sabotageDamageMin, GameConst::$sabotageDamageMax) * $destCity['level'];
+
+    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) {
+        $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;
+    }
+
+    $logger->pushGeneralActionLog("금<C>{$gold}</> 쌀<C>{$rice}</>을 획득했습니다.", 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_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);
+    $failReason = checkSabotageFailCondition($general, $srcCity, $destCity, $reqGold, $reqRice, $dipState);
+    if($failReason !== null){
+        $logger->pushGeneralActionLog("{$failReason} {$sabotageName} 실패. <1>{$date}</>");
+        return;
+    }    
 
-        $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;
+    $srcNation = getNationStaticInfo($srcNationID);
+    $destNation = getNationStaticInfo($destNationID);
 
-        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;
-        }
+    $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']);
 
-        // 특기보정 : 신산, 귀모
-        if($general['special2'] == 41) { $ratio += 10; }
-        if($general['special'] == 31) { $ratio += 20; }
+    [
+        $srcGenScore,
+        $srcSpecialScore,
+        $srcItemScore,
+        $srcNationScore,
+    ] = calcSabotageAttackScore($statType, $general, $srcNation);
 
-        // 국가보정
-        if($mynation['type'] == 9) { $ratio += 10; }
+    [
+        $destGenScore,
+        $destCityScore,
+        $destSupplyScore
+    ] = calcSabotageDefendScore($statType, $generalList, $destCity, $destNation);
 
-        // 거리보정
-        $ratio /= Util::array_get($dist[$destination], 99);
+    $sabotageProb = (
+        GameConst::$sabotageDefaultProb 
+        + ($srcGenScore + $srcSpecialScore + $srcItemScore + $srcNationScore) 
+        - ($destGenScore + $destCityScore + $destSupplyScore)
+    );
 
-        if($ratio > $ratio2) {
-            $alllog[] = "<C>●</>{$admin['month']}월:누군가가 <G><b>{$destcity['name']}</b></>의 성벽을 허물었습니다.";
-            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 파괴가 성공했습니다. <1>$date</>";
+    // 거리보정
+    $sabotageProb /= Util::array_get($dist[$destCityID], 99);
 
-            // 파괴
-            $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),"");
+    if(!Util::randBool($sabotageProb)){
+        $josaYi = JosaUtil::pick($sabotageName, '이');
+        $logger->pushGeneralActionLog("<G><b>{$destCityName}</b></>에 {$sabotageName}{$josaYi} 실패했습니다. <1>$date</>");
 
-            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 = Util::randRangeInt(1, 100);
+        $exp *= getCharExpMultiplier($general['personal']);
+        $ded = Util::randRangeInt(1, 70);
+        $ded *= getCharDedMultiplier($general['personal']);
 
-        // 성격 보정
-        $exp = CharExperience($exp, $general['personal']);
-        $ded = CharDedication($ded, $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']);
 
-        $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),"");
-
-        $log = checkAbility($general, $log);
+        checkAbilityEx($general['no'], $logger);
+        return;
     }
-    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-    pushGenLog($general, $log);
+
+    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</>");
+
+    // 파괴
+    $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; }
+
+    $destCity['def'] -= $defAmount;
+    $destCity['wall'] -= $wallAmount;
+
+    $db->update('city', [
+        'state'=>32,
+        'def'=>$destCity['def'],
+        'wall'=>$destCity['wall']
+    ], 'city=%i', $destCityID);
+
+    $injuryCount = SabotageInjury($destCityID);
+
+    $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;
-        }
-
-        // 특기보정 : 신산, 귀모
-        if($general['special2'] == 41) { $ratio += 10; }
-        if($general['special'] == 31) { $ratio += 20; }
-
-        // 국가보정
-        if($mynation['type'] == 9) { $ratio += 10; }
-
-        // 거리보정
-        $ratio /= Util::array_get($dist[$destination], 99);
-
-        if($ratio > $ratio2) {
-            $alllog[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>의 백성들이 동요하고 있습니다.";
-            $log[] = "<C>●</>{$admin['month']}월:<G><b>{$destcity['name']}</b></>에 선동이 성공했습니다. <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),"");
-
-            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']);
-
-        $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),"");
-
-        $log = checkAbility($general, $log);
+    $failReason = checkSabotageFailCondition($general, $srcCity, $destCity, $reqGold, $reqRice, $dipState);
+    if($failReason !== null){
+        $logger->pushGeneralActionLog("{$failReason} {$sabotageName} 실패. <1>{$date}</>");
+        return;
     }
-    pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
-    pushGenLog($general, $log);
+
+    $srcNation = getNationStaticInfo($srcNationID);
+    $destNation = getNationStaticInfo($destNationID);
+
+    $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)
+    );
+
+    // 거리보정
+    $sabotageProb /= Util::array_get($dist[$destCityID], 99);
+
+    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
+    $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;
+    
+    $db->update('city', [
+        'state'=>32,
+        'secu'=>$destCity['secu'],
+        'rate'=>$destCity['rate']
+    ], 'city=%i', $destCityID);
+
+    $injuryCount = SabotageInjury($destCityID);
+
+    $logger->pushGeneralActionLog("도시의 치안이 <C>{$secuAmount}</>, 민심이 <C>{$rateAmount}</>만큼 감소하고, 장수 <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);
 }

hwe/func_template.php

@@ -203,11 +203,18 @@ function formatName(string $name, int $npc): string{
     return $name;
 }
 
-function getMapHtml(){
-    //NOTE: 필요한가?
+function getMapHtml(?string $mapTheme=null){
     $templates = new \League\Plates\Engine(__dir__.'/templates');
 
-    return $templates->render('map');
+    if($mapTheme === null){
+        $db = DB::db();
+        $gameStor = KVStorage::getStorage($db, 'game_env');
+        $mapTheme = $gameStor->map_theme??'che';
+    }
+
+    return $templates->render('map', [
+        'mapTheme'=>$mapTheme
+    ]);
 }
 
 function getInvitationList(array $nationList){

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

@@ -44,7 +44,7 @@ if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
     ], 'owner=%i', $userID);
 }
 
-$admin = $gameStor->getValues(['develcost','online','conlimit','tournament','tnmt_type','turnterm','scenario','scenario_text','extended_general','fiction','npcmode','vote','vote_title']);
+$admin = $gameStor->getValues(['develcost','online','conlimit','tournament','tnmt_type','turnterm','scenario','scenario_text','extended_general','fiction','npcmode','vote','vote_title','map_theme']);
 
 $plock = $db->queryFirstField('SELECT plock FROM plock LIMIT 1');
 
@@ -76,7 +76,7 @@ if ($admin['npcmode'] == 0) {
     $valid = 1;
 }
 $color = "cyan";
-
+$mapTheme = $admin['map_theme'];
 ?>
 <!DOCTYPE html>
 <html>
@@ -91,13 +91,16 @@ $color = "cyan";
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
 <?=WebUtil::printJS('js/main.js')?>
-<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS('d_shared/base_map.js')?>
 <?=WebUtil::printJS('js/map.js')?>
 <?=WebUtil::printJS('js/msg.js')?>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 $(function(){
     reloadWorldMap({
-        hrefTemplate:'b_currentCity.php?citylist={0}'
+        hrefTemplate:'b_currentCity.php?citylist={0}',
+        useCachedMap:true
     });
 
     setInterval(function(){
@@ -230,18 +233,18 @@ else if($session->userGrade == 4){
 <table class="tb_layout bg0" style="width:1000px;">
     <tr>
         <td width=698 height=520 colspan=2>
-            <?=getMapHtml()?>
+            <?=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>
     </tr>
 <form name=form2 action=preprocessing.php method=post target=commandlist>
     <tr>
         <td rowspan=3 width=50 valign=top><?=turnTable()?></td>
-        <td width=646 style="border:none;text-align:center;"><?php cityInfo(); ?></td>
+        <td style="width:650px;border:none;text-align:center;"><?php cityInfo(); ?></td>
     </tr>
     <tr>
-        <td width=646 align=right>
-            <font color=cyan><b>←</b> Ctrl, Shift, 드래그로 복수선택 가능　　　　　반복&amp;수정<b>→</b></font>
+        <td style='width:650px;' align=right>
+            <font color=cyan><b>←</b> Ctrl, Shift, 드래그로 복수선택 가능　　반복&amp;수정<b>→</b></font>
             <select name=sel size=1 style=color:white;background-color:black;font-size:13px;>
                 <option value=1>1턴</option>
                 <option value=2>2턴</option>
@@ -255,11 +258,11 @@ else if($session->userGrade == 4){
                 <option value=10>10턴</option>
                 <option value=11>11턴</option>
                 <option value=12>12턴</option>
-            </select><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:50px;font-size:13px; value='반복' onclick='refreshing(this, 2,0)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:80px;font-size:13px; value='▼미루기' onclick='refreshing(this, 2,1)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:80px;font-size:13px; value='▲당기기' onclick='refreshing(this, 2,2)'>
+            </select><input type=button style='background-color:<?=GameConst::$basecolor2?>;color:white;width:70px;font-size:13px;margin-left:1ch;margin-right:2ch;' value='반복' onclick='refreshing(this, 2,0)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:80px;font-size:13px; value='▼미루기' onclick='refreshing(this, 2,1)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:80px;font-size:13px; value='▲당기기' onclick='refreshing(this, 2,2)'>
         </td>
     </tr>
     <tr>
-        <td width=646 align=right style="border:none;">
+        <td align=right style="'width:650px;border:none;">
             <?php commandTable(); ?>
             <input id="mainBtnSubmit" type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px; value='실 행' onclick='refreshing(this, 3,form2)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:110px;font-size:13px; value='갱 신' onclick='refreshing(this, 0,0)'><input type=button style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;font-size:13px; value='로비로' onclick=location.replace('../')><br>
         </td>

hwe/j_install_db.php

@@ -19,8 +19,6 @@ $username = Util::getReq('db_id');
 $password = Util::getReq('db_pw');
 $dbName = Util::getReq('db_name');
 
-extractMissingPostToGlobals();
-
 if(!$host || !$port || !$username || !$password || !$dbName){
     Json::die([
         'result'=>false,

hwe/j_map_history.php

@@ -8,8 +8,6 @@ $year = Util::getReq('year', 'int');
 $month = Util::getReq('month', 'int');
 $serverID = Util::getReq('serverID', 'string', null);
 
-extractMissingPostToGlobals();
-
 $url = '/a_history.php';
 
 if(!strpos($_SERVER['HTTP_REFERER'], $url)) {
@@ -19,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,417 @@
+<?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;
+
+$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;
+
+    $attackerKilled += $attacker->getKilled() / $repeatCnt;
+    $attackerDead += $attacker->getDead() / $repeatCnt;
+
+    $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,
+    'dead'=>$attackerDead,
+    '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

@@ -170,7 +170,7 @@ $special = 0;
 
 $admin = $gameStor->getValues(['scenario', 'turnterm', 'show_img_level']);
 
-if ($admin['scenario'] > 0) {
+if ($admin['scenario'] >= 1000) {
     $specage2 = $age + 3;
     $specage = $age + 3;
 }
@@ -222,6 +222,7 @@ $db->insert('general', [
     'turntime' => $turntime,
     'killturn' => 6,
     'lastconnect' => $lastconnect,
+    'crewtype'=>GameUnitConst::DEFAULT_CREWTYPE,
     'makelimit' => 0,
     'age' => $age,
     'startage' => $age,

hwe/js/base_map.js

@@ -1,100 +0,0 @@
-
-
-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: ["흉노", 180, 95],
-        66: ["남만", 80, 455],
-        67: ["산월", 425, 430],
-        68: ["오환", 610, 20],
-        69: ["왜", 680, 320],
-        70: ["호관", 285, 140],
-        71: ["호로", 285, 205],
-        72: ["사곡", 240, 175],
-        73: ["함곡", 180, 175],
-        74: ["사수", 310, 185],
-        75: ["양평", 90, 220],
-        76: ["가맹", 45, 225],
-        77: ["역경", 410, 65],
-        78: ["계교", 405, 135],
-        79: ["동황", 515, 145],
-        80: ["관도", 340, 165],
-        81: ["정도", 400, 210],
-        82: ["합비", 435, 285],
-        83: ["광릉", 490, 275],
-        84: ["적도", 130, 75],
-        85: ["가정", 40, 160],
-        86: ["기산", 110, 180],
-        87: ["면죽", 35, 255],
-        88: ["이릉", 215, 295],
-        89: ["장판", 280, 315],
-        90: ["백랑", 530, 30],
-        91: ["적벽", 330, 325],
-        92: ["파양", 430, 350],
-        93: ["탐라", 605, 260],
-        94: ["유구", 625, 435],
-    };
-}

hwe/js/battle_simulator.js

@@ -0,0 +1,800 @@
+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));
+        $('#result_dead').html(toPretty(result.dead));
+        $('#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

hwe/js/ext.kingdoms.js

@@ -9,19 +9,33 @@ $(function(){
     
     var getUserType = function(통,무,지){
         var 총 = 통+무+지;
-               
-        if(통 < 총*0.2)	{
+        if(통 < 40){
+            if(무+지 < 통){
+                return "무능";
+            }
             return "무지";
-        }else if(무 < 총*0.2)	{
-            return "지";
-        }else if(지 < 총*0.2)	{
-            return "무";
-        }else{
+        }
+
+        var 최대능력치 = Math.max(통, 무, 지);
+        var 능력치2합 = Math.min(통+무, 무+지, 지+통);
+        if(최대능력치 >= 70 && 능력치2합 >= 최대능력치 * 1.7){
             return "만능";
         }
+
+        if(무 >= 60 && 지 < 무*0.8){
+            return "무";
+        }
+        if(지 >= 60 && 무 < 지*0.8){
+            return "지";
+        }
+
+        
+
+        return "평범";
     };
     
     function formatScore(x) {
+        console.log(x);
         return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
     }
     
@@ -53,27 +67,31 @@ $(function(){
                     var 장수명 = $.trim($tds.eq(1).text());
                     var 국가 = $.trim($tds.eq(6).text());
                     
+                    var 부상 = $this.data('general-wounded');
+
                     장수.html = $this.clone();
                     장수.장수명 = 장수명;
                     장수.국가 = 국가;
                     장수.벌점 = parseInt($tds.eq(-1).text());
-                    장수.통 = parseInt($tds.eq(10).text().split('+')[0]);
-                    장수.무 = parseInt($tds.eq(11).text().split('+')[0]);
-                    장수.지 = parseInt($tds.eq(12).text().split('+')[0]);
+                    장수.통 = parseInt($this.data('general-leadership'));
+                    장수.무 = parseInt($this.data('general-power'));
+                    장수.지 = parseInt($this.data('general-intel'));
                     장수.삭턴 = parseInt($tds.eq(-2).text());
                     장수.종류 = getUserType(장수.통, 장수.무, 장수.지);
-                    장수.의병 = 장수명[0]=="ⓜ" || 장수명[0]=="ⓖ";
+                    장수.NPC = $this.data('is-npc');
+                    
                     if(!(국가 in 국가별)){
                         국가별[국가] = {};
+                        국가별[국가].만능 = [];
                         국가별[국가].무 = [];
                         국가별[국가].지 = [];
-                        국가별[국가].충차 = [];
+                        국가별[국가].평범 = [];
                         국가별[국가].무지 = [];
-                        국가별[국가].만능 = [];
-                        //국가별[국가].의병 = [];
+                        국가별[국가].무능 = [];
+                        //국가별[국가].NPC = [];
                     }
                     
-                    //if(장수.의병) 국가별[국가].의병.push(장수);
+                    //if(장수.NPC) 국가별[국가].NPC.push(장수);
                     국가별[국가][장수.종류].push(장수);
                     
                     장수.html.hide();
@@ -93,8 +111,11 @@ $(function(){
                     
                     var total = 0;
                     var 전투유저장수 = 0;
-                    var 삭턴장수 = 0;
                     var 통솔합 = 0;
+                    var 삭턴장수 = 0;
+
+                    var 전투N장수 = 0;
+                    var N장통솔합 = 0;
                     $td.html('<p class="sum" style="margin:0;font-weight:bold;color:yellow;text-align:center"></p>');
                     $td.css('text-indent','-5.8em').css('padding-left','5.8em');
                     for(var 종류명 in 국가정보){
@@ -130,15 +151,18 @@ $(function(){
                         $.each(테이블,function(idx,val){
 							                      
                             var 종능 = val.통 + val.무 + val.지;
-                            if(종류명 == '무' || 종류명 == '지' || 종류명 == '충차'){
-                                if(val.삭턴 >= 80 && !val.의병){
-                                    전투유저장수+=1;
+                            console.log(val);
+                            if(종류명 != '무능' && 종류명 != '무지'){
+                                if(val.삭턴 >= 80 && !val.NPC){
+                                    전투유저장수 += 1;
                                     
-                                    if(종능 > 150)         통솔합 += val.통;
-                                    else if(종능/0.75 >= 150)통솔합 += parseInt(val.통/0.75);
-                                    else if(종능/0.55 >= 150)통솔합 += parseInt(val.통/0.55);
-                                    else if(종능/0.35 >= 150)통솔합 += parseInt(val.통/0.35);
-                                    else if(종능/0.15 >= 150)통솔합 += parseInt(val.통/0.15);
+                                    통솔합 += val.통;
+                                }
+                                
+                                if(val.삭턴 > 5 && val.NPC){
+                                    전투N장수 += 1;
+
+                                    N장통솔합 += val.통;
                                 }
                             }
                             
@@ -146,11 +170,11 @@ $(function(){
                             var $obj2 = $('<span></span>');
                             $obj.html(val.장수명);
                             
-                            if(!val.의병 && val.삭턴 < 80){
+                            if(!val.NPC && val.삭턴 < 80){
                                 $obj.css('text-decoration','line-through');
                                 삭턴장수+=1;
                             }
-                            if(val.의병){
+                            if(val.NPC){
                                 $obj.css('color','cyan');
                             }
                             if(val.벌점 >= 1500) $obj.css('color','yellow');
@@ -179,7 +203,7 @@ $(function(){
                         $td.append($p);
                     }
                     
-                    var result = "* 총("+total+"), 전투장("+전투유저장수+", 약 "+formatScore(통솔합*100)+"명), 삭턴장("+삭턴장수+") *";
+                    var result = "* 총("+total+"), 전투장("+전투유저장수+", 약 "+formatScore(통솔합*100)+"명), 전투N장("+전투N장수+", 약 "+formatScore(N장통솔합*100)+"명), 삭턴장("+삭턴장수+") *";
                     $tbl.find('.sum').html(result);
                     
                     
@@ -226,7 +250,7 @@ $(function(){
         $btn.prop("disabled",true);
         var $tr0 = $('table:eq(0) tr:eq(0)');
     	$tr0.append('<td><strong>*벌점 순 정렬*</strong><br><span style="color:yellow">벌점 1500점 이상</span>, <span style="color:lightgreen">벌점 200점 이상</span>, '+
-                    '<span style="text-decoration:line-through">삭턴 장</span>, <span style="color:cyan">ⓝ장</span>'+'<br><strong>전투장 :</strong> 무장 + 지장 + 충차장 - 삭턴자(무,지,충) </td>');
+                    '<span style="text-decoration:line-through">삭턴장</span>, <span style="color:cyan">ⓝ장</span>'+'<br><strong>전투장 :</strong> 만능장 + 무장 + 지장 + 평범장 - 삭턴자(만능, 무, 지, 평범) </td>');
     });
     
     

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){
-                            tmpUsers = $(this);
-                            return false;
-                        }
+                    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();
-                            $userFrame.css('top',top);
-                            userInfo.obj.show();
-                            $userFrame.show();
-                            console.log('올림!'+userInfo.이름);
-                        },function(){
-                            $userFrame.hide();
-                            userInfo.obj.hide();
-                            console.log('내림!'+userInfo.이름);
-                        });
-                        
-                        $user.append(', ');
-                        aGroup.$users.append($user);
-                    });
-                    
-                    aGroup.$users.append('('+aGroup.list.length+'명)');
+                $('.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);
+                    userList[generalID].show();
+                    $userFrame.show();
+                },function(){
+                    var $this = $(this);
+                    var parent = $this.closest('tr');
+                    var generalID = parseInt($this.data('general-id'));
+                    userList[generalID].hide();
+                    $userFrame.hide();
                 });
             }
             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

@@ -13,6 +13,7 @@ function reloadWorldMap(option){
         clickableAll:false, //어떤 경우든 클릭을 가능하게 함. 해당 동작의 동작 가능성 여부와는 별도.
         selectCallback:null, //callback을 지정시 clickable과 관계 없이 해당 함수를 실행. 
         hrefTemplate:'#', //도시가 클릭가능할 경우 지정할 href값. {0}은 도시 id로 변환됨
+        useCachedMap:false, //맵 캐시를 사용
 
         //아래부터는 post query에 들어갈 녀석
         year:null, //year값, 연감등에 사용
@@ -20,11 +21,15 @@ function reloadWorldMap(option){
         aux:null, //기타 넣고 싶은 값을 입력
         neutralView:false, //clickable, 소속 국가, 첩보 여부 등을 반환여부를 설정
         showMe:true, //반환 값에 본인이 위치한 도시 값을 반환하도록 설정. neutralView와 별개
-        targetJson:'j_map.php'
+        targetJson:'j_map.php',
+
+        //기타 보조 값
+        startYear:null,
     };
     
     option = $.extend(defaultOption, option);
 
+    var useCachedMap = option.useCachedMap;
     var isDetailMap = option.isDetailMap;
     var clickableAll = option.clickableAll;
     var selectCallback = option.selectCallback;
@@ -32,6 +37,8 @@ function reloadWorldMap(option){
 
     var cityPosition = getCityPosition();
 
+    var storedOldMapKey = 'sam.{0}.map'.format(serverNick);
+    var storedStartYear = 'sam.{0}.startYear'.format(serverNick);
     //OBJ : startYear, year, month, cityList, nationList, spyList, shownByGeneralList, myCity
 
     function checkReturnObject(obj){
@@ -50,6 +57,13 @@ function reloadWorldMap(option){
             return obj.promise();
         }
 
+        if(useCachedMap){
+            localStorage.setItem(storedOldMapKey, JSON.stringify([serverID, obj]));
+            localStorage.setItem(storedStartYear, JSON.stringify(obj.startYear));
+        }
+        
+        $world_map.removeClass('draw_required');
+
         return obj;
     }
     
@@ -129,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;
@@ -276,6 +259,9 @@ function reloadWorldMap(option){
                 }
                 $imgObj.append($flagObj);
             }
+
+            var $nameObj = $('<span class="city_detail_name">{0}</span>'.format(city.name));
+            $imgObj.append($nameObj);
          
 
             $map_body.append($cityObj);
@@ -336,6 +322,8 @@ function reloadWorldMap(option){
                 $imgObj.append($capitalObj);
             }
 
+            var $nameObj = $('<span class="city_detail_name">{0}</span>'.format(city.name));
+            $imgObj.append($nameObj);
 
             $map_body.append($cityObj);
         });
@@ -415,6 +403,25 @@ function reloadWorldMap(option){
         return obj;
     }
 
+    var $hideCityNameBtn = $world_map.find('.map_toggle_cityname');
+    if(localStorage.getItem('sam.hideMapCityName') == 'yes'){
+        $world_map.addClass('hide_cityname');
+        $hideCityNameBtn.addClass('active').attr('aria-pressed', 'true');
+    }
+
+    $hideCityNameBtn.click(function(){
+        //이전 상태 확인
+        var state = !$hideCityNameBtn.hasClass('active');
+        if(state){
+            $world_map.addClass('hide_cityname');
+            localStorage.setItem('sam.hideMapCityName', 'yes');
+        }
+        else{
+            $world_map.removeClass('hide_cityname');
+            localStorage.setItem('sam.hideMapCityName', 'no');
+        }
+    });
+
     if(isDetailMap){
         $world_map.addClass('map_detail');
     }
@@ -446,5 +453,52 @@ function reloadWorldMap(option){
         .then(setMouseWork)
         .then(setCityClickable)
         .then(saveCityInfo);    
+
+    if($world_map.hasClass('draw_required')){
+        if(useCachedMap){
+            //일단 불러옴
+            do{
+                var storedMap = localStorage.getItem(storedOldMapKey);
+                if(!storedMap){
+                    break;
+                }
+                storedMap = JSON.parse(storedMap);
+                var storedServerID = storedMap[0];
+                if(storedServerID != serverID){
+                    break;
+                }
+
+                storedMap = storedMap[1];
+                storedMap = setMapBackground(storedMap);
+                storedMap = convertCityObjs(storedMap);
+                if(isDetailMap){
+                    storedMap = drawDetailWorldMap(storedMap);
+                }
+                else{
+                    storedMap = drawBasicWorldMap(storedMap);
+                }
+                storedMap = setMouseWork(storedMap);
+                storedMap = setCityClickable(storedMap);
+                storedMap = saveCityInfo(storedMap);
+            }while(false);
+        }
+        else if(option.year && option.month){
+            var startYear = localStorage.getItem(storedStartYear);
+            if(startYear){
+                startYear = JSON.parse(startYear);  
+            }
+            else{
+                startYear = option.year;
+            }
+            var tmp = {
+                year : option.year,
+                month : option.month,
+                startYear : startYear
+            };
+            setMapBackground(tmp);
+        }
+        
+        
+    }
 }
 

hwe/js/msg.js

@@ -150,6 +150,12 @@ function redrawMsg(deferred){
                 
 
                 msg.defaultIcon = pathConfig.sharedIcon+'/default.jpg';
+                if(msgType == 'diplomacy'){
+                    msg.allowButton = myGeneralLevel>4;
+                }
+                else{
+                    msg.allowButton = true;
+                }
                 var msgHtml = TemplateEngine(messageTemplate, msg);
                 
 
@@ -331,18 +337,18 @@ function refreshMailboxList(obj){
 
 function registerGlobal(basicInfo){
     
-    myNation = {
+    window.myNation = {
         'id':basicInfo.myNationID,
         'mailbox':basicInfo.myNationID+9000,
         'color':'#000000',
         'nation':'재야'
     };
-    lastMsg = {
+    window.lastMsg = {
         id : basicInfo.lastContact
     };
-    myGeneralID = basicInfo.generalID;
-    isChief = basicInfo.isChief;
-    myGeneralLevel = basicInfo.generalLevel;
+    window.myGeneralID = basicInfo.generalID;
+    window.isChief = basicInfo.isChief;
+    window.myGeneralLevel = basicInfo.generalLevel;
 }
 
 function activateMessageForm(){

hwe/js/templates/message.html

@@ -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>
@@ -42,5 +42,5 @@
         <div class="msg_content"><%e(text)%></div>
         <%if(this.option && this.option.action) {%>
         <div class="msg_prompt">
-            <button class="prompt_yes btn_prompt">수락</button> <button class="prompt_no btn_prompt">거절</button>
+            <button class="prompt_yes btn_prompt" <%allowButton?'':'disabled="disabled"'%>>>수락</button> <button class="prompt_no btn_prompt" <%allowButton?'':'disabled="disabled"'%>>거절</button>
         </div><%} %></div></div>

hwe/lib.php

@@ -54,7 +54,7 @@ function MessageBox($str)
 
 function LogText($prefix, $variable)
 {
-    $text = sprintf('%s : %s'."\n", $prefix, var_export($variable, true));
+    $text = sprintf('%s : %s'."\r\n", $prefix, var_export($variable, true));
     file_put_contents(ROOT.'/d_log/dbg_logs.txt', $text, FILE_APPEND);
 }
 

hwe/preprocessing.php

@@ -14,11 +14,9 @@ $turn = Util::getReq('turn', 'array_int');
 $sel = Util::getReq('sel', 'int');
 $commandtype = Util::getReq('commandtype', 'int');
 
-extractMissingPostToGlobals();
-
 increaseRefresh("턴입력", 1);
 
-if(!$turn || $commandtype === null){
+if(!$turn || $commandtype === null || $sel === null){
     header('location:commandlist.php');
     die();
 }
@@ -57,8 +55,8 @@ switch($commandtype) {
     case  8: command_Single($turn, 8); break; //치안 강화
     case  9: command_Single($turn, 9); break; //자금 조달
 
-//    case 11: command_11(    $turn, 11); break; //징병
-//    case 12: command_12(    $turn, 12); break; //모병
+//    case 11: command_11(    $turn, 11, false); break; //징병
+//    case 12: command_11(    $turn, 12, true); break; //모병
     case 13: command_Single($turn, 13); break; //훈련
     case 14: command_Single($turn, 14); break; //사기진작
     case 15: command_Single($turn, 0); break; //전투태세

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,1724 +2,444 @@
 namespace sammo;
 
 
-function processWar($general, $city) {
-    '@phan-var array<string,int|string|null> $general';
+function processWar(array $rawAttacker, array $rawDefenderCity){
 
     $db = DB::db();
+    $rawAttackerCity = $db->queryFirstRow('SELECT * FROM city WHERE city = %i', $rawAttacker['city']);
+
+    $attackerNationID = $rawAttacker['nation'];
+    $defenderNationID = $rawDefenderCity['nation'];
+
+    $rawAttackerNation = $db->queryFirstRow('SELECT nation,`level`,`name`,capital,totaltech,gennum,tech,`type`,gold,rice FROM nation WHERE nation = %i', $attackerNationID);
+
+    if($defenderNationID == 0){
+        $rawDefenderNation =  [
+            'nation'=>0,
+            'name'=>'재야',
+            'capital'=>0,
+            'level'=>0,
+            'gold'=>0,
+            'rice'=>2000,
+            'type'=>0,
+            'tech'=>0,
+            'totaltech'=>0,
+            'gennum'=>1     
+        ];
+    }
+    else{
+        $rawDefenderNation = $db->queryFirstRow('SELECT nation,`level`,`name`,capital,totaltech,gennum,tech,`type`,gold,rice FROM nation WHERE nation = %i', $defenderNationID);
+    }
+
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();
+    [$startYear, $year, $month, $cityRate] = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'city_rate']);
 
-    $templates = new \League\Plates\Engine(__dir__.'/templates');
+    $attacker = new WarUnitGeneral($rawAttacker, $rawAttackerCity, $rawAttackerNation, true, $year, $month);
 
-    $date = substr($general['turntime'],11,5);
+    $city = new WarUnitCity($rawDefenderCity, $rawDefenderNation, $year, $month, $cityRate);
 
-    $admin = $gameStor->getAll();
+    $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'));
 
-    $year = $admin['year'];
-    $month = $admin['month'];
-
-    $log = [];
-    $batlog = [];
-    $batres = [];
-
-    $opplog = [];
-    $oppbatlog = [];
-    $oppbatres = [];
-
-    $alllog = [];
-    $history = [];
-
-    $deadAmount = [
-        'att'=>0,
-        'def'=>0
-    ];
-
-    $warphase = GameUnitConst::byID($general['crewtype'])->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;
+    if(!$defenderList){
+        $defenderList = [];
     }
 
-    // 우선 스케일링
-    $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);
-
-    $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) {
-            $josaRo = JosaUtil::pick(GameUnitConst::byId($general['crewtype'])->name, '로');
-            $josaYi = JosaUtil::pick($general['name'], '이');
-            $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>{$josaYi} ".GameUnitConst::byId($general['crewtype'])->name."{$josaRo} 성벽을 공격합니다.";
-            $log[] = "<C>●</>".GameUnitConst::byId($general['crewtype'])->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++;
-
-                if($general['level'] == 12) {
-                    $lbonus = $nation['level'] * 2;
-                } elseif($general['level'] >= 5) {
-                    $lbonus = $nation['level'];
-                } else {
-                    $lbonus = 0;
-                }
-                $myAtt = getAtt($general, $nation['tech'], $lbonus);
-                $myDef = getDef($general, $nation['tech']);
-                $cityAtt = getCityAtt($city);
-                $cityDef = getCityDef($city);
-
-                // 감소할 병사 수
-                $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);
-
-                $avoid = 1;
-                // 병종간 특성
-                if(intdiv($general['crewtype'], 10) == 3) {   // 귀병
-                    $int = Util::round(getGeneralIntel($general, true, true, true, false));
-                    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%
-                    }
-
-                    // 특기보정 : 신산
-                    if($general['special2'] == 41) { $ratio2 += 200; }
-
-                    $ratio = rand() % 1000; // 0~999
-                    if($ratio <= $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;
-                            }
-                        }
-                    }
-                } elseif($general['crewtype'] == 40) { // 정란
-                    $cityCrew = $cityCrew * 1.8;
-                } elseif($general['crewtype'] == 41) { // 충차
-                    $cityCrew = $cityCrew * 2.4;
-                } elseif($general['crewtype'] == 42) { // 벽력거
-                    $cityCrew = $cityCrew * 1.8;
-                }
-                //군주 공격 보정 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 = CriticalRatio3($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 = GameUnitConst::byID($general['crewtype'])->avoid;   //회피율
-				$ratio2 = Util::round($ratio2 * $general['train'] / 100); //훈련 반영
-                //특기보정 : 궁병
-                if($general['special2'] == 51) { $ratio2 += 20; }
-                //도구 보정 : 둔갑천서, 태평요술
-                if($general['item'] == 26 || $general['item'] == 25) { $ratio2 += 20; }
-                if($ratio < $ratio2 && $avoid == 1) {
-                    $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($general['crewtype'], $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(GameUnitConst::byId($general['crewtype'])->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(0, 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(GameUnitConst::byId($general['crewtype'])->name, '이');
-                $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 ".GameUnitConst::byId($general['crewtype'])->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(GameUnitConst::byId($general['crewtype'])->name, '이');
-                $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 ".GameUnitConst::byId($general['crewtype'])->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);
-            $josaYi = JosaUtil::pick(GameUnitConst::byId($oppose['crewtype'])->name, '이');
-            $josaWa = JosaUtil::pick(GameUnitConst::byId($general['crewtype'])->name, '와');
-            $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 ".GameUnitConst::byId($general['crewtype'])->name."{$josaWa} <Y>{$oppose['name']}</>의 ".GameUnitConst::byId($oppose['crewtype'])->name."{$josaYi} 대결합니다.";
-            $josaUl = JosaUtil::pick(GameUnitConst::byId($oppose['crewtype'])->name, '을');
-            $josaRo = JosaUtil::pick(GameUnitConst::byId($general['crewtype'])->name, '로');
-            $log[] = "<C>●</>".GameUnitConst::byId($general['crewtype'])->name."{$josaRo} <Y>{$oppose['name']}</>의 ".GameUnitConst::byId($oppose['crewtype'])->name."{$josaUl} <M>공격</>합니다.";
-            $josaUl = JosaUtil::pick(GameUnitConst::byId($general['crewtype'])->name, '을');
-            $opplog[] = "<C>●</>".GameUnitConst::byId($oppose['crewtype'])->name."{$josaRo} <Y>{$general['name']}</>의 ".GameUnitConst::byId($general['crewtype'])->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++;
-
-                if($general['level'] == 12) {
-                    $lbonus = $nation['level'] * 2;
-                } elseif($general['level'] >= 5) {
-                    $lbonus = $nation['level'];
-                } else {
-                    $lbonus = 0;
-                }
-                $myAtt = getAtt($general, $nation['tech'], $lbonus);
-                $myDef = getDef($general, $nation['tech']);
-
-                if($oppose['level'] == 12) {
-                    $opplbonus = $destnation['level'] * 2;
-                } elseif($oppose['level'] >= 5) {
-                    $opplbonus = $destnation['level'];
-                } else {
-                    $opplbonus = 0;
-                }
-                $opAtt = getAtt($oppose, $destnation['tech'], $opplbonus);
-                $opDef = getDef($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(intdiv($general['crewtype'], 10) == 3) {   // 귀병
-                    $int = Util::round(getGeneralIntel($general, true, true, true, false));
-                    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%
-                    }
-
-                    // 특기보정 : 신산
-                    if($general['special2'] == 41) { $ratio2 += 200; }
-
-                    $ratio = rand() % 1000; // 0~999
-                    if($ratio <= $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(intdiv($oppose['crewtype'], 10) == 3) {   // 귀병
-                    $int = Util::round(getGeneralIntel($oppose, true, true, true, false));
-                    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%
-                    }
-
-                    // 특기보정 : 신산
-                    if($oppose['special2'] == 41) { $ratio2 += 200; }
-
-                    $ratio = rand() % 1000; // 0~999
-                    if($ratio <= $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;
-                            }
-                        }
-                    }
-                }
-
-                // 특기보정: 돌격
-                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;
-                    }
-                }
-
-                // 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;
-                }
-
-                //군주 공격 보정 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($oppose['crewtype'] != 0 && $oppose['crewtype'] != 10 && $oppose['crewtype'] != 20 &&
-                        $oppose['crewtype'] != 30 && $oppose['crewtype'] != 40 && $oppose['crewtype'] != 41)
-                    {
-                        $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($general['crewtype'] != 0 && $general['crewtype'] != 10 && $general['crewtype'] != 20 &&
-                        $general['crewtype'] != 30 && $general['crewtype'] != 40 && $general['crewtype'] != 41)
-                    {
-                        $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 = CriticalRatio3($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 = CriticalRatio3($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 = GameUnitConst::byID($general['crewtype'])->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; }
-                if($ratio < $ratio2 && $myAvoid == 1) {
-                    // 특기보정 : 격노
-                    if($oppose['special2'] == 74 && rand() % 100 < 50) {
-                        $batlog[] = "<C>●</>회피 시도에 상대가 <R>격노</>했다!</>";
-                        $oppbatlog[] = "<C>●</>상대의 회피 시도에 <C>격노</>했다!</>";
-                        $myCrew = CriticalScore2($myCrew);
-                        $opAvoid = 0;
-                    } else {
-                        $batlog[] = "<C>●</><C>회피</>했다!</>";
-                        $oppbatlog[] = "<C>●</>상대가 <R>회피</>했다!</>";
-                        $myCrew /= 5; // 20%만 소모
-                        $myAvoid = 0;
-                    }
-                }
-                //회피
-                $ratio = rand() % 100; // 0 ~ 99
-                $ratio2 = GameUnitConst::byID($oppose['crewtype'])->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; }
-                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 {
-                        $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($general['crewtype'], $nation['tech']));
-                // 결과 쌀
-                $myRice = $general['rice'] - $myRice;
-
-                // 중간 쌀 체크
-                $opRice = Util::round($opexp / 50 * 0.8);
-                // 성격 보정
-                $opRice = CharExperience($opRice, $oppose['personal']);
-                // 쌀 소모
-                $opRice = ($opRice * 5 * getCrewtypeRice($oppose['crewtype'], $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(GameUnitConst::byId($general['crewtype'])->name, 0, 2),
-                'name'=> $general['name'],
-                'remain_crew' => $general['crew'],
-                'killed_crew' => -$mydeathnum
-            ];
-            $render_defender = [
-                'crewtype' => mb_substr(GameUnitConst::byId($oppose['crewtype'])->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(GameUnitConst::byId($oppose['crewtype'])->name, '이');
-                    $alllog[] = "<C>●</>{$month}월:<Y>{$oppose['name']}</>의 ".GameUnitConst::byId($oppose['crewtype'])->name."{$josaYi} 패퇴했습니다.";
-                    $log[] = "<C>●</><Y>{$oppose['name']}</>의 ".GameUnitConst::byId($oppose['crewtype'])->name."{$josaYi} 패퇴했습니다.";
-                    $opplog[] = "<C>●</>군량 부족으로 패퇴합니다.";
-                } else {
-                    $josaYi = JosaUtil::pick(GameUnitConst::byId($oppose['crewtype'])->name, '이');
-                    $alllog[] = "<C>●</>{$month}월:<Y>{$oppose['name']}</>의 ".GameUnitConst::byId($oppose['crewtype'])->name."{$josaYi} 전멸했습니다.";
-                    $log[] = "<C>●</><Y>{$oppose['name']}</>의 ".GameUnitConst::byId($oppose['crewtype'])->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($oppose['crewtype'], $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(GameUnitConst::byId($general['crewtype'])->name, '이');
-                    $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 ".GameUnitConst::byId($general['crewtype'])->name."{$josaYi} 퇴각했습니다.";
-                    $log[] = "<C>●</>군량 부족으로 퇴각합니다.";
-                    $opplog[] = "<C>●</><Y>{$general['name']}</>의 ".GameUnitConst::byId($general['crewtype'])->name."{$josaYi} 퇴각했습니다.";
-                } else {
-                    $josaYi = JosaUtil::pick(GameUnitConst::byId($general['crewtype'])->name, '이');
-                    $alllog[] = "<C>●</>{$month}월:<Y>{$general['name']}</>의 ".GameUnitConst::byId($general['crewtype'])->name."{$josaYi} 퇴각했습니다.";
-                    $log[] = "<C>●</>퇴각했습니다.";
-                    $opplog[] = "<C>●</><Y>{$general['name']}</>의 ".GameUnitConst::byId($general['crewtype'])->name."{$josaYi} 퇴각했습니다.";
-                }
-
-                // 경험치 상승
-                if(intdiv($oppose['crewtype'], 10) == 3) {   // 귀병
-                    $oppose['intel2']++;
-                } elseif(intdiv($oppose['crewtype'], 10) == 4) {   // 차병
-                    $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($oppose['crewtype'], $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 = [];
-            }
+    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;
         }
     }
 
-    if(isset($oppose)){
-        //마지막 페이즈에 장수가 전멸하지 않은 경우. 쌀 소모 후속 처리
-
-        // 상대장수 경험 등등 증가(페이즈 초과시)
-        $opexp = Util::round($opexp / 50 * 0.8);
-        // 성격 보정
-        $opexp = CharExperience($opexp, $oppose['personal']);
-        // 쌀 소모
-        $oppose['rice'] -= ($opexp * 5 * getCrewtypeRice($oppose['crewtype'], $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(intdiv($general['crewtype'], 10) == 3) {   // 귀병
-        $general['intel2'] += $exp2;
-    } elseif(intdiv($general['crewtype'], 10) == 4) {   // 차병
-        $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($general['crewtype'], $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 CriticalRatio3($general) {
-    //  무장 무력 : 65 5%, 70 10%, 75 15%, 80 20%
-    //  지장 지력 : 65 5%, 70  8%, 75 10%, 80 13%
-    //충차장 통솔:  65 5%, 70  8%, 75 10%, 80 13%
-
-    $crewtype = intdiv($general['crewtype'], 10);
-
-    if($crewtype == 3){ //지장
-        $mainstat = getGeneralIntel($general, false, true, true, false);
-    }
-    else if($crewtype == 4){ //병기
-        $mainstat = getGeneralLeadership($general, false, true, true, false);
-    }
-    else{ //무장
-        $mainstat = getGeneralPower($general, false, true, true, false);
-    }
-
-    $ratio = max($mainstat - 65, 0);
-
-    if ($crewtype >= 3) {
-       $ratio *= 0.4;
-    }
-    else{
-        $ratio *= 0.5;
-    }
-
-    $ratio = round($ratio);
-    $ratio += 5;
-
-    if($ratio > 50) $ratio = 50;
-
-    return $ratio;
-}
-
-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) {
-    if(!$crewtype) { $crewtype = 0; }
-    $cost = GameUnitConst::byID($crewtype)->rice / 10;
-    return $cost * getTechCost($tech);
-}
-
-//////////////////////////////////////////////////////////////
-// 표준 공 / 수 반환 수치는 약 0이 되게 (100~550)
-//////////////////////////////////////////////////////////////
-
-function getAtt($general, $tech, $lbonus) {
-    $att = GameUnitConst::byID($general['crewtype'])->attack + getTechAbil($tech);
-    
-    $general['lbonus'] = $lbonus;
-
-    if(intdiv($general['crewtype'], 10) == 3) {   // 귀병 지100%
-        $ratio = getGeneralIntel($general, true, true, true)*2 - 40;
-    } elseif(intdiv($general['crewtype'], 10) == 4) {   // 차병 통100%
-        $ratio = getGeneralLeadership($general, true, true, true)*2 - 40;
-    } else {
-        $ratio = getGeneralPower($general, true, true, true)*2 - 40; //10일때 -20, 70일때 100, 100일때 160
-    }
-    if($ratio <  10) { $ratio = 10; }
-    if($ratio > 100) { $ratio = 50 + $ratio/2; }    // 100보다 큰 경우는 상승률 1/2
-    $att = $att * $ratio / 100;
-
-    return $att;
-}
-
-function getDef($general, $tech) {
-    $def = GameUnitConst::byID($general['crewtype'])->defence + getTechAbil($tech);
-
-    $crew = ($general['crew'] / (7000 / 30)) + 70;    // 5000명일때 91점 7000명일때 100점 10000명일때 113점
-    $def = $def * $crew / 100;
-
-    return $def;
-}
-
-function getCityAtt($city) {
-    $att = ($city['def']*0.1 + $city['wall']*0.9) / 500 + 200;    //50000일때 300점 100000일때 400점
-    return $att;
-}
-
-function getCityDef($city) {
-    $def = ($city['def']*0.1 + $city['wall']*0.9) / 500 + 200;
-    return $def;
-}
-
-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></> 공략에 가담하여 분쟁이 발생하고 있습니다."]);
-    }
-    
-    $rawConflict = Json::encode($conflict);
-    $city['conflict'] = $rawConflict;
+    $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("<C>●</>{$attacker->getCrewTypeName()}{$josaRo} 성벽을 <M>공격</>합니다.", ActionLogger::PLAIN);
+            }
+
+            $defender->useBattleInitItem();
+
+            $attacker->setOppose($defender);
+            $defender->setOppose($attacker);
+
+            $attacker->checkBattleBeginSkill();
+            $defender->checkBattleBeginSkill();
+
+            $attacker->checkBattleBeginItem();
+            $defender->checkBattleBeginItem();
+
+            $attacker->applyBattleBeginSkillAndItem();
+            $defender->applyBattleBeginSkillAndItem();
+        }
+
+        $attacker->beginPhase();
+        $defender->beginPhase();
+
+        $attacker->checkPreActiveSkill();
+        $defender->checkPreActiveSkill();
+
+        $attacker->checkActiveSkill();
+        $defender->checkActiveSkill();
+        //NOTE: 마법은 checkActiveSkill, checkPostActiveSkill 내에서 반영
+
+        $attacker->checkPostActiveSkill();
+        $defender->checkPostActiveSkill();
+        //NOTE: 반계류 등의 스킬을 post에서 반영
+
+        $activeSkillIterator = new \AppendIterator();
+        $activeSkillIterator->append($attacker->applyActiveSkill());
+        $activeSkillIterator->append($defender->applyActiveSkill());
+        foreach($activeSkillIterator 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) {
@@ -1777,30 +497,20 @@ 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']);
 
     // 국가 멸망시
     //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);
+        $dipNations = $db->queryFirstColumn('SELECT you FROM diplomacy WHERE me = %i', $losenation['nation']);
 
         $loseGeneralGold = 0;
         $loseGeneralRice = 0;
@@ -1836,11 +546,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);
@@ -1848,7 +554,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),"");
@@ -1910,10 +616,9 @@ 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);
+        foreach($dipNations as $dip){
             //전방설정
-            SetNationFront($dip['you']);
+            SetNationFront($dip);
         }
     // 멸망이 아니면
     } else {
@@ -1957,14 +662,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) {
             // 도시 소속 변경, 태수,군사,시중 초기화
@@ -1982,17 +684,12 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) {
         $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,

hwe/processing.php

@@ -5,10 +5,13 @@ include "lib.php";
 include "func.php";
 //로그인 검사
 
-$commandtype = Util::getReq('commandtype', 'int', 0);
-$turn = Util::getReq('turn', 'array_int', [0]);
+$commandtype = Util::getReq('commandtype', 'int');
+$turn = Util::getReq('turn', 'array_int');
 
-extractMissingPostToGlobals();
+if(!$turn || $commandtype === null){
+    header('location:commandlist.php');
+    die();
+}
 
 $session = Session::requireGameLogin()->setReadOnly();
 
@@ -49,8 +52,8 @@ switch($commandtype) {
     case  8: command_Single($turn, 8); break; //치안 강화
     case  9: command_Single($turn, 9); break; //자금 조달
 
-    case 11: command_11(    $turn, 11); break; //징병
-    case 12: command_12(    $turn, 12); break; //모병
+    case 11: command_11(    $turn, 11, false); break; //징병
+    case 12: command_11(    $turn, 12, true); break; //모병
     case 13: command_Single($turn, 13); break; //훈련
     case 14: command_Single($turn, 14); break; //사기진작
     //case 15: command_Single($turn, 0); break; //전투태세 
@@ -128,9 +131,11 @@ function starter($name, $type=0) {
 <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
 <?=WebUtil::printJS('../d_shared/common_path.js')?>
 <?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printJS('js/base_map.js')?>
+<?=WebUtil::printJS('d_shared/base_map.js')?>
 <?=WebUtil::printJS('js/map.js')?>
 <script>
+window.serverNick = '<?=DB::prefix()?>';
+window.serverID = '<?=UniqueConst::$serverID?>';
 $(function(){
     var $target = $("form[name=form1] select[name=double]");
     console.log($target);
@@ -138,6 +143,7 @@ $(function(){
         isDetailMap:false,
         clickableAll:true,
         neutralView:true,
+        useCachedMap:true,
         selectCallback:function(city){
             $target.val(city.id);
             return false;
@@ -193,416 +199,133 @@ function command_99($turn) {
     header('location:b_chiefcenter.php');
 }
 
-function command_11($turn, $command) {
+function command_11($turn, $command, bool $is모병 = false) {
     $db = DB::db();
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();
     $userID = Session::getUserID();
 
-    starter("징병");
+    $me = $db->queryFirstRow(
+        'SELECT no,nation,level,personal,special2,level,city,crew,horse,injury,leader,crewtype,gold 
+        from general where owner=%i',
+        $userID
+    );
 
-    $query = "select no,nation,level,personal,special2,level,city,crew,horse,injury,leader,crewtype,gold from general where owner='{$userID}'";
-    $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
-    $me = MYDB_fetch_array($result);
-
-    $query = "select level,tech from nation where nation='{$me['nation']}'";
-    $result = MYDB_query($query, $connect) or Error("process53 ".MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    if($me['level'] == 12) {
-        $lbonus = $nation['level'] * 2;
-    } elseif($me['level'] >= 5) {
-        $lbonus = $nation['level'];
-    } else {
-        $lbonus = 0;
+    [$nationLevel, $tech] = $db->queryFirstList('SELECT level,tech FROM nation WHERE nation=%i', $me['nation']);
+    if(!$nationLevel){
+        $nationLevel = 0;
     }
 
+    if(!$tech){
+        $tech = 0;
+    }
+
+    $lbonus = setLeadershipBonus($me, $nationLevel);
+
     $ownCities = [];
     $ownRegions = [];
-    $relativeYear = $gameStor->year - $gameStor->startyear;
-    $tech = $nation['tech'];
+    [$year, $startyear] = $gameStor->getValuesAsArray(['year','startyear']);
+
+    $relativeYear = $year - $startyear;
 
     foreach(DB::db()->query('SELECT city, region from city where nation = %i', $me['nation']) as $city){
         $ownCities[$city['city']] = 1;
         $ownRegions[$city['region']] = 1;
     }
 
-    $leader = intdiv($me['leader'] * (100 - $me['injury']), 100) + getHorseEff($me['horse']) + $lbonus;
-    $crew = $leader - Util::round($me['crew']/100);
-    $abil = getTechAbil($nation['tech']);
-    $cost = getTechCost($nation['tech']);
-    echo "
-<font size=2>병사를 모집합니다. 훈련과 사기치는 낮지만 가격이 저렴합니다.<br>
-가능한 수보다 많게 입력하면 가능한 최대 병사를 모집합니다.<br>
-이미 병사가 있는 경우 추가징병되며, 병종이 다를경우는 기존의 병사는 소집해제됩니다.<br>
-현재 징병 가능한 병종은 <font color=green>녹색</font>으로 표시되며,<br>
-현재 징병 가능한 특수병종은 <font color=limegreen>초록색</font>으로 표시됩니다.<br>
-<script type='text/javascript'>
-function calc(cost, formnum) {
-    switch(formnum) {
-        case 0: form = document.form0; break;
-        case 1: form = document.form1; break;
-        case 2: form = document.form2; break;
-        case 3: form = document.form3; break;
-        case 4: form = document.form4; break;
-        case 5: form = document.form5; break;
-        case 10: form = document.form10; break;
-        case 11: form = document.form11; break;
-        case 12: form = document.form12; break;
-        case 13: form = document.form13; break;
-        case 14: form = document.form14; break;
-        case 20: form = document.form20; break;
-        case 21: form = document.form21; break;
-        case 22: form = document.form22; break;
-        case 23: form = document.form23; break;
-        case 24: form = document.form24; break;
-        case 25: form = document.form25; break;
-        case 26: form = document.form26; break;
-        case 27: form = document.form27; break;
-        case 30: form = document.form30; break;
-        case 31: form = document.form31; break;
-        case 32: form = document.form32; break;
-        case 33: form = document.form33; break;
-        case 34: form = document.form34; break;
-        case 35: form = document.form35; break;
-        case 36: form = document.form36; break;
-        case 37: form = document.form37; break;
-        case 38: form = document.form38; break;
-        case 40: form = document.form40; break;
-        case 41: form = document.form41; break;
-        case 42: form = document.form42; break;
-        case 43: form = document.form43; break;
-    }
-    crew = form.double.value;
-    form.cost.value = Math.round(crew * cost);
-}
-</script>
-<table class='tb_layout' style='margin:auto;'>
-    <tr>
-        <td colspan=10 align=center id=bg2>
-            현재 기술력 : <input type=text style=text-align:right;color:white;background-color:black size=5 readonly value=".getTechCall($nation['tech']).">
-            현재 통솔 : <input type=text style=text-align:right;color:white;background-color:black size=3 readonly value=$leader>
-            현재 병종 : <input type=text size=8 style=text-align:right;color:white;background-color:black readonly value=".GameUnitConst::byID($me['crewtype'])->name.">
-            현재 병사 : <input type=text size=5 style=text-align:right;color:white;background-color:black readonly value={$me['crew']}>
-            현재 자금 : <input type=text size=5 style=text-align:right;color:white;background-color:black readonly value={$me['gold']}>
-        </td>
-    </tr>
-    <tr>
-        <td width=64 align=center id=bg1>사진</td>
-        <td width=64 align=center id=bg1>병종</td>
-        <td width=40 align=center id=bg1>공격</td>
-        <td width=40 align=center id=bg1>방어</td>
-        <td width=40 align=center id=bg1>기동</td>
-        <td width=40 align=center id=bg1>회피</td>
-        <td width=40 align=center id=bg1>군량</td>
-        <td width=40 align=center id=bg1>가격</td>
-        <td width=130 align=center id=bg1>병사수</td>
-        <td width=300 align=center id=bg1>특징</td>
-    </tr>";
+    $leader = getGeneralLeadership($me, true, true, true);
+    $fullLeader = getGeneralLeadership($me, false, true, true);
+    $abil = getTechAbil($tech);
 
-    foreach(GameUnitConst::all() as $i=>$unit) {
-        if($i == 0){
-            echo '<tr><td colspan=10>보병 계열</td></tr>';
-        }
-        else if($i == 10){
-            echo '<tr><td colspan=10>궁병 계열</td></tr>';
-        }
-        else if($i == 20){
-            echo '<tr><td colspan=10>기병 계열</td></tr>';
-        }
-        else if($i == 30){
-            echo '<tr><td colspan=10>귀병 계열</td></tr>';
-        }
-        else if($i == 40){
-            echo '<tr><td colspan=10>차병 계열</td></tr>';
-        }
+    $armTypes = [];
 
-        if(!$unit->isValid($ownCities, $ownRegions, $relativeYear, $tech)){
-            continue; //TODO: 불가능한 병종도 보여줄 필요가 있음.
-        }
+    foreach(GameUnitConst::allType() as $armType => $armName){
+        $armTypeCrews = [];
         
-        if($unit->recruitType == 0){
-            $l = 'green';
-        }
-        else{
-            $l = 'limegreen';
-        }
-
-        $baseRice = $unit->rice * $cost;
-        $baseCost = $unit->cost * $cost;
-        $baseCost = CharCost($baseCost, $me['personal']);
-
-        $unitBaseType = intdiv($unit->id, 10);
-        if($me['special2'] == 50 && $unitBaseType == 0){
-            $baseCost *= 0.9;
-        }
-        else if($me['special2'] == 51 && $unitBaseType == 1){
-            $baseCost *= 0.9;
-        }
-        else if($me['special2'] == 52 && $unitBaseType == 2){
-            $baseCost *= 0.9;
-        }
-        else if($me['special2'] == 53 && $unitBaseType == 3){
-            $baseCost *= 0.9;
-        }
-        else if($me['special2'] == 54 && $unitBaseType == 4){
-            $baseCost *= 0.9;
-        }
-        else if($me['special2'] == 72) { 
-            $baseCost *= 0.5; 
-        }
-
-        $name = $unit->name;
-        $attack = $unit->attack + $abil;
-        $defence = $unit->defence + $abil;
-        $speed = $unit->speed;
-        $avoid = $unit->avoid;
-        $weapImage = ServConfig::$gameImagePath."/weap{$i}.png";
-        if($gameStor->show_img_level < 2) { $weapImage = ServConfig::$sharedIconPath."/default.jpg"; }
-        
-        $baseRiceShort = round($baseRice, 1);
-        $baseCostShort = round($baseCost, 1);
-
-        $info = join('<br>', $unit->info);
-
-        echo "
-<tr height=64 bgcolor=$l>
-    <td style='background:no-repeat center url(\"{$weapImage}\");background-size:64px;background-color:#222222;' align=center></td>
-    <td align=center>{$name}</td>
-    <td align=center>{$attack}</td>
-    <td align=center>{$defence}</td>
-    <td align=center>{$speed}</td>
-    <td align=center>{$avoid}</td>
-    <td align=center>{$baseRiceShort}</td>
-    <td align=center>{$baseCostShort}</td>
-<form name=form{$i} action=c_double.php>
-    <td valign=center>
-        <input type=text name=double maxlength=3 size=3 value=$crew style=text-align:right;color:white;background-color:black>00명<input type=button value=계산 onclick='calc($baseCost, $i)'><br>
-        <input type=text name=cost maxlength=5 size=5 readonly style=text-align:right;color:white;background-color:black>원 <input type=submit value=징병>
-        <input type=hidden name=third value={$i}>
-        <input type=hidden name=command value=$command>";
-
-        for($j=0; $j < count($turn); $j++) {
-            echo "
-        <input type=hidden name=turn[] value=$turn[$j]>";
-        }
-        echo "
-    </td>
-</form>
-    <td>$info</td>
-    </tr>";
-    }
-
-    echo "
-</table>";
-
-    ender();
-}
-
-function command_12($turn, $command) {
-    $db = DB::db();
-    $gameStor = KVStorage::getStorage($db, 'game_env');
-    $connect=$db->get();
-    $userID = Session::getUserID();
-
-    starter("모병");
-
-    $query = "select no,nation,level,personal,special2,level,city,crew,horse,injury,leader,crewtype,gold from general where owner='{$userID}'";
-    $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
-    $me = MYDB_fetch_array($result);
-
-    $query = "select level,tech from nation where nation='{$me['nation']}'";
-    $result = MYDB_query($query, $connect) or Error("process53 ".MYDB_error($connect),"");
-    $nation = MYDB_fetch_array($result);
-
-    if($me['level'] == 12) {
-        $lbonus = $nation['level'] * 2;
-    } elseif($me['level'] >= 5) {
-        $lbonus = $nation['level'];
-    } else {
-        $lbonus = 0;
-    }
-
-    $ownCities = [];
-    $ownRegions = [];
-    $relativeYear = $gameStor->year - $gameStor->startyear;
-    $tech = $nation['tech'];
-
-    foreach(DB::db()->query('SELECT city, region from city where nation = %i', $me['nation']) as $city){
-        $ownCities[$city['city']] = 1;
-        $ownRegions[$city['region']] = 1;
-    }
-
-    $leader = intdiv($me['leader'] * (100 - $me['injury']), 100) + getHorseEff($me['horse']) + $lbonus;
-    $crew = $leader - round($me['crew']/100);
-    $abil = getTechAbil($nation['tech']);
-    $cost = getTechCost($nation['tech']);
-    echo "
-<font size=2>병사를 모집합니다. 훈련과 사기치는 높지만 자금이 많이 듭니다.<br>
-가능한 수보다 많게 입력하면 가능한 최대 병사를 모집합니다.<br>
-이미 병사가 있는 경우 추가징병되며, 병종이 다를경우는 기존의 병사는 소집해제됩니다.<br>
-현재 모병 가능한 병종은 <font color=green>녹색</font>으로 표시되며,<br>
-현재 모병 가능한 특수병종은 <font color=limegreen>초록색</font>으로 표시됩니다.<br>
-<script type='text/javascript'>
-function calc(cost, formnum) {
-    switch(formnum) {
-        case 0: form = document.form0; break;
-        case 1: form = document.form1; break;
-        case 2: form = document.form2; break;
-        case 3: form = document.form3; break;
-        case 4: form = document.form4; break;
-        case 5: form = document.form5; break;
-        case 10: form = document.form10; break;
-        case 11: form = document.form11; break;
-        case 12: form = document.form12; break;
-        case 13: form = document.form13; break;
-        case 14: form = document.form14; break;
-        case 20: form = document.form20; break;
-        case 21: form = document.form21; break;
-        case 22: form = document.form22; break;
-        case 23: form = document.form23; break;
-        case 24: form = document.form24; break;
-        case 25: form = document.form25; break;
-        case 26: form = document.form26; break;
-        case 27: form = document.form27; break;
-        case 30: form = document.form30; break;
-        case 31: form = document.form31; break;
-        case 32: form = document.form32; break;
-        case 33: form = document.form33; break;
-        case 34: form = document.form34; break;
-        case 35: form = document.form35; break;
-        case 36: form = document.form36; break;
-        case 37: form = document.form37; break;
-        case 38: form = document.form38; break;
-        case 40: form = document.form40; break;
-        case 41: form = document.form41; break;
-        case 42: form = document.form42; break;
-        case 43: form = document.form43; break;
-    }
-    crew = form.double.value;
-    form.cost.value = Math.round(crew * cost * 2);
-}
-</script>
-<table class='tb_layout' style='margin:auto;'>
-    <tr><td align=center colspan=10>모병은 가격 2배의 자금이 소요됩니다.</td></tr>
-    <tr>
-        <td colspan=10 align=center id=bg2>
-            현재 기술력 : <input type=text style=text-align:right;color:white;background-color:black size=5 readonly value=".getTechCall($nation['tech']).">
-            현재 통솔 : <input type=text style=text-align:right;color:white;background-color:black size=3 readonly value=$leader>
-            현재 병종 : <input type=text size=8 style=text-align:right;color:white;background-color:black readonly value=".GameUnitConst::byID($me['crewtype'])->name.">
-            현재 병사 : <input type=text size=5 style=text-align:right;color:white;background-color:black readonly value={$me['crew']}>
-            현재 자금 : <input type=text size=5 style=text-align:right;color:white;background-color:black readonly value={$me['gold']}>
-        </td>
-    </tr>
-    <tr>
-        <td width=64 align=center id=bg1>사진</td>
-        <td width=64 align=center id=bg1>병종</td>
-        <td width=40 align=center id=bg1>공격</td>
-        <td width=40 align=center id=bg1>방어</td>
-        <td width=40 align=center id=bg1>기동</td>
-        <td width=40 align=center id=bg1>회피</td>
-        <td width=40 align=center id=bg1>군량</td>
-        <td width=40 align=center id=bg1>가격</td>
-        <td width=130 align=center id=bg1>병사수</td>
-        <td width=300 align=center id=bg1>특징</td>
-    </tr>";
+        foreach(GameUnitConst::byType($armType) as $unit){
+            $crewObj = new \stdClass;
+            if(!$unit->isValid($ownCities, $ownRegions, $relativeYear, $tech)){
+                continue; //TODO: 불가능한 병종도 보여줄 필요가 있음.
+            }
 
+            $crewObj->id = $unit->id;
+            
+            if($unit->reqTech == 0){
+                $crewObj->bgcolor = 'green';
+            }
+            else{
+                $crewObj->bgcolor = 'limegreen';
+            }
     
-    foreach(GameUnitConst::all() as $i=>$unit) {
-        if($i == 0){
-            echo '<tr><td colspan=10>보병 계열</td></tr>';
-        }
-        else if($i == 10){
-            echo '<tr><td colspan=10>궁병 계열</td></tr>';
-        }
-        else if($i == 20){
-            echo '<tr><td colspan=10>기병 계열</td></tr>';
-        }
-        else if($i == 30){
-            echo '<tr><td colspan=10>귀병 계열</td></tr>';
-        }
-        else if($i == 40){
-            echo '<tr><td colspan=10>차병 계열</td></tr>';
-        }
+            $crewObj->baseRice = $unit->rice * getTechCost($tech);
+            $crewObj->baseCost = CharCost($unit->costWithTech($tech), $me['personal']);
 
-        if(!$unit->isValid($ownCities, $ownRegions, $relativeYear, $tech)){
-            continue; //TODO: 불가능한 병종도 보여줄 필요가 있음.
-        }
-        
-        if($unit->recruitType == 0){
-            $l = 'green';
-        }
-        else{
-            $l = 'limegreen';
-        }
+            $armType = $unit->armType;
+            if($me['special2'] == 50 && $armType == GameUnitConst::T_FOOTMAN){
+                $crewObj->baseCost *= 0.9;
+            }
+            else if($me['special2'] == 51 && $armType == GameUnitConst::T_ARCHER){
+                $crewObj->baseCost *= 0.9;
+            }
+            else if($me['special2'] == 52 && $armType == GameUnitConst::T_CAVALRY){
+                $crewObj->baseCost *= 0.9;
+            }
+            else if($me['special2'] == 53 && $armType == GameUnitConst::T_WIZARD){
+                $crewObj->baseCost *= 0.9;
+            }
+            else if($me['special2'] == 54 && $armType == GameUnitConst::T_SIEGE){
+                $crewObj->baseCost *= 0.9;
+            }
+            else if($me['special2'] == 72) { 
+                $crewObj->baseCost *= 0.5; 
+            }
+    
+            $crewObj->name = $unit->name;
+            $crewObj->attack = $unit->attack + $abil;
+            $crewObj->defence = $unit->defence + $abil;
+            $crewObj->speed = $unit->speed;
+            $crewObj->avoid = $unit->avoid;
+            if($gameStor->show_img_level < 2) { 
+                $crewObj->img = ServConfig::$sharedIconPath."/default.jpg"; 
+            }
+            else{
+                $crewObj->img = ServConfig::$gameImagePath."/weap".$unit->id.".png";
+            }
+            
+            $crewObj->baseRiceShort = round($crewObj->baseRice, 1);
+            $crewObj->baseCostShort = round($crewObj->baseCost, 1);
+    
+            $crewObj->info = join('<br>', $unit->info);
 
-        $baseRice = $unit->rice * $cost;
-        $baseCost = $unit->cost * $cost;
-        $baseCost = CharCost($baseCost, $me['personal']);
 
-        $unitBaseType = intdiv($unit->id, 10);
-        if($me['special2'] == 50 && $unitBaseType == 0){
-            $baseCost *= 0.9;
+            $armTypeCrews[] = $crewObj;
         }
-        else if($me['special2'] == 51 && $unitBaseType == 1){
-            $baseCost *= 0.9;
-        }
-        else if($me['special2'] == 52 && $unitBaseType == 2){
-            $baseCost *= 0.9;
-        }
-        else if($me['special2'] == 53 && $unitBaseType == 3){
-            $baseCost *= 0.9;
-        }
-        else if($me['special2'] == 54 && $unitBaseType == 4){
-            $baseCost *= 0.9;
-        }
-        else if($me['special2'] == 72) { 
-            $baseCost *= 0.5; 
-        }
-
-        $name = $unit->name;
-        $attack = $unit->attack + $abil;
-        $defence = $unit->defence + $abil;
-        $speed = $unit->speed;
-        $avoid = $unit->avoid;
-        $weapImage = ServConfig::$gameImagePath."/weap{$i}.png";
-        if($gameStor->show_img_level < 2) { $weapImage = ServConfig::$sharedIconPath."/default.jpg"; }
-        
-        $baseRiceShort = round($baseRice, 1);
-        $baseCostShort = round($baseCost, 1);
-
-        $info = join('<br>', $unit->info);
-
-        echo "
-<tr height=64 bgcolor=$l>
-    <td style='background:no-repeat center url(\"{$weapImage}\");background-size:64px;background-color:#222222;' align=center></td>
-    <td align=center>{$name}</td>
-    <td align=center>{$attack}</td>
-    <td align=center>{$defence}</td>
-    <td align=center>{$speed}</td>
-    <td align=center>{$avoid}</td>
-    <td align=center>{$baseRiceShort}</td>
-    <td align=center>{$baseCostShort}</td>
-<form name=form{$i} action=c_double.php>
-    <td valign=center>
-        <input type=text name=double maxlength=3 size=3 value=$crew style=text-align:right;color:white;background-color:black>00명<input type=button value=계산 onclick='calc($baseCost, $i)'><br>
-        <input type=text name=cost maxlength=5 size=5 readonly style=text-align:right;color:white;background-color:black>원 <input type=submit value=모병>
-        <input type=hidden name=third value={$i}>
-        <input type=hidden name=command value=$command>";
-
-        for($j=0; $j < count($turn); $j++) {
-            echo "
-        <input type=hidden name=turn[] value=$turn[$j]>";
-        }
-        echo "
-    </td>
-</form>
-    <td>$info</td>
-    </tr>";
+        $armTypes[] = [$armName, $armTypeCrews];
+    }
+    if($is모병){
+        $commandName = '모병';
+        starter("모병");
+    }
+    else{
+        $commandName = '징병';
+        starter("징병");
     }
 
-    echo "
-</table>";
+    $templates = new \League\Plates\Engine('templates');
+    echo $templates->render('recruitCrewForm', [
+        'command'=>$command,
+        'commandName'=>$commandName,
+        'techLevelText'=>getTechCall($tech),
+        'tech'=>$tech,
+        'leader'=>$leader,
+        'fullLeader'=>$fullLeader,
+        'crewType'=>GameUnitConst::byId($me['crewtype'])->id,
+        'crewTypeName'=>GameUnitConst::byId($me['crewtype'])->name,
+        'crew'=>$me['crew'],
+        'gold'=>$me['gold'],
+        'turn'=>$turn,
+        'armTypes'=>$armTypes,
+    ]);
+
 
     ender();
 }
@@ -985,7 +708,7 @@ function command_25($turn, $command) {
 !!!는 방랑군을 포함한 랜덤임관입니다. 유니크를 기대하신다면!<br>
 ???는 방랑군을 제외한 랜덤임관입니다. 유니크 혜택은 없습니다.<br>
 임관 금지이거나 초기 제한중인 국가는 붉은색 배경으로 표시됩니다.<br>
-870px x 200px 넘는 높이를 점유할 시 통보없이 제한될 수 있습니다.<br>
+870px x 200px를 넘어서는 내용은 표시되지 않습니다.<br>
 <form name=form1 action=c_double.php method=post>
 <select name=double size=1 style=color:white;background-color:black>
     <option value=99 style=color:white;background-color:black;>!!!</option>

hwe/sammo/ActionLogger.php

@@ -0,0 +1,309 @@
+<?php
+
+namespace sammo;
+
+class ActionLogger{
+    protected $generalId;
+    protected $nationId;
+    protected $autoFlush;
+
+    protected $year = null;
+    protected $month = null;
+    
+    protected $generalHistoryLog = [];
+    protected $generalActionLog = [];
+    protected $generalBattleResultLog = [];
+    protected $generalBattleDetailLog = [];
+    protected $nationalHistoryLog = [];
+    protected $globalHistoryLog = [];
+    protected $globalActionLog = [];
+
+    const RAWTEXT = 0;
+    const PLAIN = 1;
+    const YEAR_MONTH = 2;
+    const YEAR = 3;
+    const MONTH = 4;
+    const EVENT_PLAIN = 5;
+    const EVENT_YEAR_MONTH = 6;
+    const NOTICE = 7;
+    const NOTICE_YEAR_MONTH = 8;
+
+    public function __construct(int $generalId, int $nationId, int $year, int $month, bool $autoFlush = true){
+        $this->generalId = $generalId;
+        $this->nationId = $nationId;
+        $this->year = $year;
+        $this->month = $month;
+        $this->autoFlush = $autoFlush;
+    }
+
+    public function __destruct(){
+        if($this->autoFlush){
+            $this->flush();
+        }
+    }
+
+    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 = [];
+        $this->generalBattleDetailLog = [];
+        $this->nationalHistoryLog = [];
+        $this->globalHistoryLog = [];
+        $this->globalActionLog = [];
+
+        return $backup;
+    }
+
+    public function flush(){
+        $db = DB::db();
+
+        if($this->generalHistoryLog){
+            $rawText = join('<br>', $this->generalHistoryLog).'<br>';
+            $db->update('general', [
+                'history'=>$db->sqleval('concat(%s, history)', $rawText)
+            ], 'no=%i', $this->generalId);
+            $this->generalHistoryLog = [];
+        }
+
+        if($this->generalActionLog){
+            pushGenLog(['no'=>$this->generalId], $this->generalActionLog);
+            $this->generalActionLog = [];
+        }
+
+        if($this->generalBattleResultLog){
+            pushBatRes(['no'=>$this->generalId], $this->generalBattleResultLog);
+            $this->generalBattleResultLog = [];
+        }
+
+        if($this->generalBattleDetailLog){
+            pushBatLog(['no'=>$this->generalId], $this->generalBattleDetailLog);
+            $this->generalBattleDetailLog = [];
+        }
+
+        if($this->nationId && $this->nationalHistoryLog){
+            $rawText = join('<br>', $this->nationalHistoryLog).'<br>';
+            $db->update('nation', [
+                'history'=>$db->sqleval('concat(%s, history)', $rawText)
+            ], 'nation=%i', $this->nationId);
+            $this->nationalHistoryLog = [];
+        }
+
+        if($this->globalHistoryLog){
+            pushWorldHistory($this->globalHistoryLog, $this->year, $this->month);
+            $this->globalHistoryLog = [];
+        }
+
+        if($this->globalActionLog){
+            pushGeneralPublicRecord($this->globalActionLog, $this->year, $this->month);
+            $this->globalActionLog = [];
+        }
+    }
+
+
+    public function pushGeneralHistoryLog($text, int $formatType = self::YEAR_MONTH){
+        if(!$text){
+            return;
+        }
+        if(is_array($text)){
+            foreach($text as $textItem){
+                $this->pushGeneralHistoryLog($textItem);
+            }
+            return;
+        }
+
+        $text = $this->formatText($text, $formatType);
+        $this->generalHistoryLog[] = $text;
+    }
+
+    public function pushGeneralActionLog($text, int $formatType = self::MONTH){
+        if(!$text){
+            return;
+        }
+        if(is_array($text)){
+            foreach($text as $textItem){
+                $this->pushGeneralActionLog($textItem);
+            }
+            return;
+        }
+
+        $text = $this->formatText($text, $formatType);
+        $this->generalActionLog[] = $text;
+    }
+
+    public function pushGeneralBattleResultLog($text, int $formatType = self::RAWTEXT){
+        if(!$text){
+            return;
+        }
+        if(is_array($text)){
+            foreach($text as $textItem){
+                $this->pushGeneralBattleResultLog($textItem);
+            }
+            return;
+        }
+
+        $text = $this->formatText($text, $formatType);
+        $this->generalBattleResultLog[] = $text;
+    }
+
+    public function pushGeneralBattleDetailLog($text, int $formatType = self::PLAIN){
+        if(!$text){
+            return;
+        }
+        if(is_array($text)){
+            foreach($text as $textItem){
+                $this->pushGeneralBattleDetailLog($textItem);
+            }
+            return;
+        }
+
+        $text = $this->formatText($text, $formatType);
+        $this->generalBattleDetailLog[] = $text;
+    }
+
+    public function pushNationalHistoryLog($text, int $formatType = self::RAWTEXT){
+        if(!$text){
+            return;
+        }
+        if(is_array($text)){
+            foreach($text as $textItem){
+                $this->pushNationalHistoryLog($textItem);
+            }
+            return;
+        }
+
+        $text = $this->formatText($text, $formatType);
+        $this->nationalHistoryLog[] = $text;
+    }
+
+    public function pushGlobalActionLog($text, int $formatType = self::MONTH){
+        if(!$text){
+            return;
+        }
+        if(is_array($text)){
+            foreach($text as $textItem){
+                $this->pushGlobalActionLog($textItem);
+            }
+            return;
+        }
+
+        $text = $this->formatText($text, $formatType);
+        $this->globalActionLog[] = $text;
+    }
+
+    public function pushGlobalHistoryLog($text, int $formatType = self::YEAR_MONTH){
+        if(!$text){
+            return;
+        }
+        if(is_array($text)){
+            foreach($text as $textItem){
+                $this->pushGlobalHistoryLog($textItem);
+            }
+            return;
+        }
+
+        $text = $this->formatText($text, $formatType);
+        $this->globalHistoryLog[] = $text;
+    }
+
+    public function formatText(string $text, int $formatType):string{
+        if($formatType === self::RAWTEXT){
+            return $text;
+        }
+
+        if($formatType === self::PLAIN){
+            return "<C>●</>{$text}";
+        }
+
+        if($formatType === self::YEAR_MONTH){
+            return "<C>●</>{$this->year}년 {$this->month}월:{$text}";
+        }
+
+        if($formatType === self::YEAR){
+            return "<C>●</>{$this->year}년:{$text}";
+        }
+
+        if($formatType === self::MONTH){
+            return "<C>●</>{$this->month}월:{$text}";
+        }
+
+        if($formatType === self::EVENT_PLAIN){
+            return "<S>◆</>{$text}";
+        }
+
+        if($formatType === self::EVENT_YEAR_MONTH){
+            return "<S>◆</>{$this->year}년 {$this->month}월:{$text}";
+        }
+
+        if($formatType === self::NOTICE){
+            return "<R>★</>{$text}";
+        }
+
+        if($formatType === self::NOTICE_YEAR_MONTH){
+            return "<R>★</>{$this->year}년 {$this->month}월:{$text}";
+        }
+        
+        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/CityConst.php

@@ -1,357 +0,0 @@
-<?php
-namespace sammo;
-
-class CityConst{
-    private function __construct(){
-
-    }
-
-    private static $constID = null;
-    private static $constName = null;
-    private static $constRegion = null;
-
-
-    public static $regionMap = [
-        '하북'=>1,1=>'하북',
-        '중원'=>2,2=>'중원',
-        '서북'=>3,3=>'서북',
-        '서촉'=>4,4=>'서촉',
-        '남중'=>5,5=>'남중',
-        '초'=>6,6=>'초',
-        '오월'=>7,7=>'오월',
-        '동이'=>8,8=>'동이'
-    ];
-    
-    public static $levelMap = [
-        '수'=>1,1=>'수',
-        '진'=>2,2=>'진',
-        '관'=>3,3=>'관',
-        '이'=>4,4=>'이',
-        '소'=>5,5=>'소',
-        '중'=>6,6=>'중',
-        '대'=>7,7=>'대',
-        '특'=>8,8=>'특'
-    ];
-
-    /**
-     * @return \sammo\CityInitialDetail[]
-     */
-    public static function all(){
-        static::_generate();
-        return static::$constID;
-    }
-    public static function byID(int $id): CityInitialDetail{
-        static::_generate();
-        return static::$constID[$id];
-    }
-
-    public static function byName(string $name): CityInitialDetail{
-        static::_generate();
-        return static::$constName[$name];
-    }
-
-    public static function byRegion(int $region): CityInitialDetail{
-        static::_generate();
-        return static::$constRegion[$region];
-    }
-
-    private static $initCity = [
-        //id,  도시, 규모,  인구,  농,  상,  치,  성,  수,(x100) 지역,  연결도시
-        [ 1,   '업', '특', 6205, 125, 113, 100, 117, 122, '하북', ['남피', '복양', '호관', '계교', '관도']],
-        [ 2, '허창', '특', 5876, 121, 124, 100, 117, 125, '중원', ['완', '진류', '초', '호로', '사수', '관도']],
-        [ 3, '낙양', '특', 8357, 117, 120, 100, 121, 124, '중원', ['호관', '호로', '사곡', '사수']],
-        [ 4, '장안', '특', 5923, 116, 123, 100, 120, 118, '서북', ['안정', '함곡', '기산']],
-        [ 5, '성도', '특', 6525, 123, 125, 100, 125, 123, '서촉', ['덕양', '강주', '면죽']],
-        [ 6, '양양', '특', 5837, 120, 126, 100, 115, 117,   '초', ['신야', '장판']],
-        [ 7, '건업', '특', 6386, 116, 123, 100, 115, 119, '오월', ['오', '합비', '광릉']],
-            
-        [ 8, '북평', '대', 4862, 102,  95,  80, 103,  99, '하북', ['역경', '백랑']],
-        [ 9, '남피', '대', 5032,  99, 101,  80, 101, 105, '하북', ['업', '평원', '역경']],
-        [10,   '완', '대', 4724, 103, 100,  80, 101,  99, '중원', ['허창', '여남', '신야', '호로']],
-        [11, '수춘', '대', 5143,  99,  96,  80,  99,  95, '중원', ['서주', '여남', '초', '합비']],
-        [12, '서주', '대', 4853, 101,  98,  80, 102,  97, '중원', ['수춘', '하비', '초', '패']],
-        [13, '강릉', '대', 4850, 105,  96,  80,  95,  96,   '초', ['장사', '무릉', '이릉', '장판']],
-        [14, '장사', '대', 4710,  97,  99,  80, 100, 105,   '초', ['강릉', '시상', '계양', '무릉', '영릉']],
-        [15, '시상', '대', 5252,  98, 100, 100,  99,  96, '오월', ['장사', '여강', '고창', '적벽', '파양']],
-        [16, '위례', '대', 4926, 100,  93,  80,  98, 103, '동이', ['평양', '사비', '계림', '안평', '동황']],
-            
-        [17,   '계', '중', 3885,  75,  80,  60,  78,  81, '하북', ['진양', '역경']],
-        [18, '복양', '중', 4185,  80,  83,  60,  82,  80, '중원', ['업', '진류', '계교', '정도']],
-        [19, '진류', '중', 3957,  82,  80,  60,  80,  83, '중원', ['허창', '복양', '사수', '관도', '정도']],
-        [20, '여남', '중', 3831,  77,  81,  60,  84,  77, '중원', ['완', '수춘', '초']],
-        [21, '하비', '중', 4278,  85,  83,  60,  82,  78, '중원', ['서주', '광릉']],
-        [22, '서량', '중', 3874,  77,  79,  60,  83,  80, '서북', ['천수', '강', '저']],
-        [23, '하내', '중', 3736,  77,  81,  60,  81,  80, '서북', ['진양', '홍농', '흉노', '호관']],
-        [24, '한중', '중', 4027,  77,  84,  60,  80,  85, '서촉', ['상용', '양평', '기산']],
-        [25, '상용', '중', 3687,  78,  76,  60,  77,  81, '서촉', ['한중', '신야']],
-        [26, '덕양', '중', 3803,  81,  84,  60,  79,  77, '서촉', ['성도', '강주', '자동', '영안']],
-        [27, '강주', '중', 4126,  79,  80,  60,  84,  81, '서촉', ['성도', '덕양', '영안', '귀양', '주시']],
-        [28, '건녕', '중', 3765,  82,  80,  60,  86,  81, '남중', ['귀양', '운남', '남영']],
-        [29, '남해', '중', 3803,  82,  76,  60,  80,  81, '남중', ['교지', '상동', '대', '산월']],
-        [30, '계양', '중', 3955,  83,  80,  60,  81,  77,   '초', ['장사', '영릉', '상동']],
-        [31,   '오', '중', 4355,  77,  81,  60,  77,  76, '오월', ['건업', '회계', '파양', '탐라']],
-        [32, '평양', '중', 3982,  78,  80,  60,  83,  78, '동이', ['위례', '졸본']],
-        [33, '사비', '중', 4157,  77,  79,  60,  78,  80, '동이', ['위례', '계림', '탐라']],
-        [34, '계림', '중', 3911,  80,  74,  60,  81,  78, '동이', ['위례', '사비', '이도', '탐라']],
-            
-        [35, '진양', '소', 3074,  56,  59,  40,  64,  59, '하북', ['계', '하내', '호관']],
-        [36, '평원', '소', 3074,  62,  65,  40,  61,  63, '하북', ['남피', '북해', '계교']],
-        [37, '북해', '소', 3146,  55,  63,  40,  63,  58, '하북', ['평원', '패', '동황']],
-        [38,   '초', '소', 3286,  60,  62,  40,  62,  57, '중원', ['허창', '수춘', '서주', '여남', '정도']],
-        [39,   '패', '소', 2877,  64,  58,  40,  58,  59, '중원', ['서주', '북해', '정도']],
-        [40, '천수', '소', 2985,  59,  64,  40,  60,  58, '서북', ['서량', '안정', '저', '적도']],
-        [41, '안정', '소', 2764,  57,  59,  40,  57,  62, '서북', ['장안', '천수', '가정']],
-        [42, '홍농', '소', 2748,  57,  63,  40,  58,  63, '서북', ['하내', '사곡', '함곡']],
-        [43, '하변', '소', 2785,  58,  62,  40,  60,  56, '서촉', ['가맹', '가정']],
-        [44, '자동', '소', 2870,  57,  55,  40,  60,  58, '서촉', ['덕양', '양평', '가맹', '면죽']],
-        [45, '영안', '소', 3153,  62,  59,  40,  58,  59, '서촉', ['덕양', '강주', '이릉']],
-        [46, '귀양', '소', 2746,  58,  61,  40,  61,  58, '남중', ['강주', '건녕', '주시']],
-        [47, '주시', '소', 2828,  60,  59,  40,  58,  63, '남중', ['강주', '귀양', '운남']],
-        [48, '운남', '소', 3258,  62,  60,  40,  64,  61, '남중', ['건녕', '주시', '남만']],
-        [49, '남영', '소', 2853,  59,  62,  40,  58,  57, '남중', ['건녕', '영릉', '남만']],
-        [50, '교지', '소', 3195,  58,  59,  40,  58,  59, '남중', ['남해', '남만']],
-        [51, '신야', '소', 2786,  60,  62,  40,  58,  55,   '초', ['양양', '완', '상용']],
-        [52, '강하', '소', 3074,  55,  56,  40,  57,  60,   '초', ['장판', '적벽']],
-        [53, '무릉', '소', 3196,  58,  63,  40,  63,  58,   '초', ['강릉', '장사', '영릉']],
-        [54, '영릉', '소', 2849,  62,  58,  40,  62,  62,   '초', ['장사', '계양', '남영', '무릉']],
-        [55, '상동', '소', 2767,  58,  59,  40,  62,  58,   '초', ['남해', '계양', '고창']],
-        [56, '여강', '소', 2905,  56,  58,  40,  60,  55, '오월', ['시상', '합비', '적벽', '파양']],
-        [57, '회계', '소', 3005,  64,  59,  40,  62,  64, '오월', ['오', '산월']],
-        [58, '고창', '소', 2802,  57,  62,  40,  58,  63, '오월', ['시상', '상동', '산월']],
-        [59,   '대', '소', 3256,  60,  62,  40,  57,  60, '오월', ['남해', '산월', '유구']],
-        [60, '안평', '소', 2937,  63,  59,  40,  59,  63, '동이', ['위례', '졸본', '동황', '백랑']],
-        [61, '졸본', '소', 2939,  55,  59,  40,  60,  58, '동이', ['평양', '안평', '오환']],
-        [62, '이도', '소', 3174,  58,  61,  40,  58,  56, '동이', ['계림', '왜', '탐라']],
-            
-        [63,   '강', '이', 2095,  40,  42,  20,  43,  40, '서북', ['서량', '적도']],
-        [64,   '저', '이', 1957,  40,  42,  20,  43,  42, '서북', ['서량', '천수', '가정']],
-        [65, '흉노', '이', 2064,  40,  41,  20,  40,  38, '서북', ['하내', '적도']],
-        [66, '남만', '이', 2378,  40,  42,  20,  43,  45, '남중', ['운남', '남영', '교지']],
-        [67, '산월', '이', 2275,  40,  37,  20,  43,  38, '오월', ['남해', '회계', '고창', '대']],
-        [68, '오환', '이', 2153,  42,  37,  20,  43,  40, '동이', ['졸본', '백랑']],
-        [69,   '왜', '이', 2065,  39,  37,  20,  43,  41, '동이', ['이도', '유구']],
-            
-        [70, '호관', '관',  887,  19,  18,  20,  95,  96, '하북', ['업', '낙양', '하내', '진양']],
-        [71, '호로', '관', 1112,  22,  21,  20, 103,  98, '중원', ['허창', '낙양', '완']],
-        [72, '사곡', '관', 1008,  21,  19,  20,  99, 101, '서북', ['낙양', '홍농']],
-        [73, '함곡', '관', 1081,  20,  22,  20, 101, 102, '서북', ['장안', '홍농']],
-        [74, '사수', '관',  958,  17,  19,  20,  95,  96, '중원', ['허창', '낙양', '진류', '관도']],
-        [75, '양평', '관',  868,  19,  19,  20,  97,  96, '서촉', ['한중', '자동', '기산']],
-        [76, '가맹', '관',  855,  17,  18,  20,  96,  95, '서촉', ['하변', '자동']],
-            
-        [77, '역경', '진',  985,  18,  19,  20,  39,  41, '하북', ['북평', '남피', '계']],
-        [78, '계교', '진', 1012,  21,  19,  20,  40,  42, '하북', ['업', '복양', '평원']],
-        [79, '동황', '진',  992,  19,  21,  20,  38,  40, '하북', ['위례', '북해', '안평']],
-        [80, '관도', '진', 1123,  22,  20,  20,  42,  43, '중원', ['업', '허창', '진류', '사수']],
-        [81, '정도', '진', 1085,  21,  21,  20,  41,  38, '중원', ['복양', '진류', '초', '패']],
-        [82, '합비', '진',  998,  20,  19,  20,  39,  41, '중원', ['건업', '수춘', '여강']],
-        [83, '광릉', '진', 1001,  20,  21,  20,  41,  40, '중원', ['건업', '하비']],
-        [84, '적도', '진',  952,  18,  17,  20,  38,  37, '서북', ['천수', '강', '흉노']],
-        [85, '가정', '진',  931,  17,  17,  20,  36,  38, '서북', ['안정', '하변', '저']],
-        [86, '기산', '진', 1005,  19,  18,  20,  41,  40, '서촉', ['장안', '한중', '양평']],
-        [87, '면죽', '관', 1093,  22,  21,  20, 108,  99, '서촉', ['성도', '자동']],
-        [88, '이릉', '진',  968,  18,  19,  20,  39,  41,   '초', ['강릉', '영안']],
-        [89, '장판', '진', 1032,  21,  20,  20,  40,  37,   '초', ['양양', '강릉', '강하', '적벽']],
-        [90, '백랑', '진', 1052,  22,  19,  20,  38,  42, '동이', ['북평', '안평', '오환']],
-            
-        [91, '적벽', '수', 1117,  23,  21,  20,  42,  41, '오월', ['시상', '강하', '여강', '장판']],
-        [92, '파양', '수', 1037,  20,  22,  20,  38,  38, '오월', ['시상', '오', '여강']],
-        [93, '탐라', '수', 1130,  22,  21,  20,  43,  41, '동이', ['오', '사비', '계림', '이도']],
-        [94, '유구', '수',  921,  17,  18,  20,  37,  37, '동이', ['대', '왜']],
-    ];
-
-    private static function _generate(){
-        if(static::$constID || static::$constName || static::$constRegion){
-            return;
-        }
-
-        $constID = [];
-        $constName = [];
-        $constCity = [];
-        $constRegion = [];
-
-        $nameMap = [];
-
-        foreach (static::$initCity as $rawCity) {
-            $nameMap[$rawCity[1]] = $rawCity[0];
-        }
-
-        foreach (static::$buildInit as $key=>$val){
-            $key2 = static::$levelMap[$key];
-            if(key_exists($key2, static::$buildInit)){
-                continue;//혹시 모를 버그 방지
-            }
-            
-            static::$buildInit[$key2] = $val;
-        }
-
-        foreach(static::$initCity as $rawCity){
-            [
-                $id,
-                $name,
-                $level,
-                $population,
-                $agriculture,
-                $commerce,
-                $security,
-                $defence,
-                $wall,
-                $region,
-                $path
-            ] = $rawCity;
-
-            $level = static::$levelMap[$level];
-            $population *= 100;
-            $agriculture *= 100;
-            $commerce *= 100;
-            $security *= 100;
-            $defence *= 100;
-            $wall *= 100;
-            $region = static::$regionMap[$region];
-            $newPath = [];
-            foreach($path as $pathName){
-                $pathID = $nameMap[$pathName];
-                $newPath[$pathID] = $pathName;
-            }
-
-            $city = new CityInitialDetail(
-                $id,
-                $name,
-                $level,
-                $population,
-                $agriculture,
-                $commerce,
-                $security,
-                $defence,
-                $wall,
-                $region,
-                $newPath
-            );
-
-            $constID[$id] = $city;
-            $constName[$name] = $city;
-            if(!key_exists($region, $constRegion)){
-                $constRegion[$region] = [];
-            }
-            $constRegion[$region] = $city;
-        }
-
-        static::$constID = $constID;
-        static::$constName = $constName;
-        static::$constRegion = $constRegion;
-        
-    }
-
-    private static $buildInitCommon = [
-        'rate'=>50,
-        'trade'=>100,
-        'gen1'=>0,
-        'gen2'=>0,
-        'gen3'=>0
-    ];
-
-    private static $buildInit = [
-        '수'=>[
-            'pop' =>  5000,
-            'agri'=>   100,
-            'comm'=>   100,
-            'secu'=>   100,
-            'def' =>   500,
-            'wall'=>   500,
-        ],
-        '진'=>[
-            'pop' =>  5000,
-            'agri'=>   100,
-            'comm'=>   100,
-            'secu'=>   100,
-            'def' =>   500,
-            'wall'=>   500,
-        ],
-        '관'=>[
-            'pop' => 10000,
-            'agri'=>   100,
-            'comm'=>   100,
-            'secu'=>   100,
-            'def' =>  1000,
-            'wall'=>  1000,
-        ],
-        '이'=>[
-            'pop' => 50000,
-            'agri'=>  1000,
-            'comm'=>  1000,
-            'secu'=>  1000,
-            'def' =>  1000,
-            'wall'=>  1000,
-        ],
-        '소'=>[
-            'pop' =>100000,
-            'agri'=>  1000,
-            'comm'=>  1000,
-            'secu'=>  1000,
-            'def' =>  2000,
-            'wall'=>  2000,
-        ],
-        '중'=>[
-            'pop' =>100000,
-            'agri'=>  1000,
-            'comm'=>  1000,
-            'secu'=>  1000,
-            'def' =>  3000,
-            'wall'=>  3000,
-        ],
-        '대'=>[
-            'pop' =>150000,
-            'agri'=>  1000,
-            'comm'=>  1000,
-            'secu'=>  1000,
-            'def' =>  4000,
-            'wall'=>  4000,
-        ],
-        '특'=>[
-            'pop' =>150000,
-            'agri'=>  1000,
-            'comm'=>  1000,
-            'secu'=>  1000,
-            'def' =>  5000,
-            'wall'=>  5000,
-        ]
-    ];
-
-    private static function test(){
-        static::_generate();
-
-        foreach(static::all() as $id=>$city){
-            foreach($city->path as $connId=>$connCityText){
-                $connCity = static::byID($connId);
-                if(!key_exists($id, $connCity->path)){
-                    throw new \RuntimeException(sprintf('도시 연결이 올바르지 않음! %s <=> %s', $city->name, $connCity->name));
-                }
-            }
-        }
-    }
-
-    public static function build(){
-        static::_generate();
-        static::test();
-        
-        $queries = array_map(function(CityInitialDetail $city){ 
-            $initValue = static::$buildInit[$city->level];
-            $path = join('|', array_keys($city->path));
-            return [
-                'city'=>$city->id,
-                'name'=>$city->name,
-                'level'=>$city->level,
-                'path'=>$path,
-                'pop2'=>$city->population,
-                'agri2'=>$city->agriculture,
-                'comm2'=>$city->commerce,
-                'secu2'=>$city->security,
-                'def2'=>$city->defence,
-                'wall2'=>$city->wall,
-                'region'=>$city->region
-            ] + $initValue + static::$buildInitCommon;
-        }, array_values(static::$constID));
-
-        DB::db()->insert('city', $queries);
-    }
-}

hwe/sammo/CityConstBase.php

@@ -0,0 +1,354 @@
+<?php
+namespace sammo;
+
+class CityConstBase{
+    protected function __construct(){
+
+    }
+
+    protected static $constID = null;
+    protected static $constName = null;
+    protected static $constRegion = null;
+
+
+    public static $regionMap = [
+        '하북'=>1,1=>'하북',
+        '중원'=>2,2=>'중원',
+        '서북'=>3,3=>'서북',
+        '서촉'=>4,4=>'서촉',
+        '남중'=>5,5=>'남중',
+        '초'=>6,6=>'초',
+        '오월'=>7,7=>'오월',
+        '동이'=>8,8=>'동이'
+    ];
+    
+    public static $levelMap = [
+        '수'=>1,1=>'수',
+        '진'=>2,2=>'진',
+        '관'=>3,3=>'관',
+        '이'=>4,4=>'이',
+        '소'=>5,5=>'소',
+        '중'=>6,6=>'중',
+        '대'=>7,7=>'대',
+        '특'=>8,8=>'특'
+    ];
+
+    /**
+     * @return \sammo\CityInitialDetail[]
+     */
+    public static function all(){
+        static::_generate();
+        return static::$constID;
+    }
+    public static function byID(int $id): CityInitialDetail{
+        static::_generate();
+        return static::$constID[$id];
+    }
+
+    public static function byName(string $name): CityInitialDetail{
+        static::_generate();
+        return static::$constName[$name];
+    }
+
+    public static function byRegion(int $region): CityInitialDetail{
+        static::_generate();
+        return static::$constRegion[$region];
+    }
+
+    protected static $initCity = [
+        //id,  도시, 규모, 인구, 농,  상, 치, 성, 수,(x100)지역, x,  y, 연결도시
+        [ 1,   '업', '특', 6205,125,113,100,117,122, '하북', 345, 130, ['남피', '복양', '호관', '계교', '관도']], 
+        [ 2, '허창', '특', 5876,121,124,100,117,125, '중원', 330, 215, ['완', '진류', '초', '호로', '사수', '관도']], 
+        [ 3, '낙양', '특', 8357,117,120,100,121,124, '중원', 275, 180, ['호관', '호로', '사곡', '사수']], 
+        [ 4, '장안', '특', 5923,116,123,100,120,118, '서북', 145, 165, ['안정', '함곡', '기산']], 
+        [ 5, '성도', '특', 6525,123,125,100,125,123, '서촉',  25, 290, ['덕양', '강주', '면죽']], 
+        [ 6, '양양', '특', 5837,120,126,100,115,117,   '초', 255, 290, ['신야', '장판']], 
+        [ 7, '건업', '특', 6386,116,123,100,115,119, '오월', 505, 305, ['오', '합비', '광릉']], 
+        [ 8, '북평', '대', 4862,102, 95, 80,103, 99, '하북', 465,  65, ['역경', '백랑']], 
+        [ 9, '남피', '대', 5032, 99,101, 80,101,105, '하북', 395,  95, ['업', '평원', '역경']], 
+        [10,   '완', '대', 4724,103,100, 80,101, 99, '중원', 270, 235, ['허창', '여남', '신야', '호로']], 
+        [11, '수춘', '대', 5143, 99, 96, 80, 99, 95, '중원', 395, 270, ['서주', '여남', '초', '합비']], 
+        [12, '서주', '대', 4853,101, 98, 80,102, 97, '중원', 440, 250, ['수춘', '하비', '초', '패']], 
+        [13, '강릉', '대', 4850,105, 96, 80, 95, 96,   '초', 245, 335, ['장사', '무릉', '이릉', '장판']], 
+        [14, '장사', '대', 4710, 97, 99, 80,100,105,   '초', 255, 375, ['강릉', '시상', '계양', '무릉', '영릉']], 
+        [15, '시상', '대', 5252, 98,100,100, 99, 96, '오월', 360, 360, ['장사', '여강', '고창', '적벽', '파양']], 
+        [16, '위례', '대', 4926,100, 93, 80, 98,103, '동이', 620, 145, ['평양', '사비', '계림', '안평', '동황']], 
+        [17,   '계', '중', 3885, 75, 80, 60, 78, 81, '하북', 365,  35, ['진양', '역경']], 
+        [18, '복양', '중', 4185, 80, 83, 60, 82, 80, '중원', 410, 170, ['업', '진류', '계교', '정도']], 
+        [19, '진류', '중', 3957, 82, 80, 60, 80, 83, '중원', 365, 185, ['허창', '복양', '사수', '관도', '정도']], 
+        [20, '여남', '중', 3831, 77, 81, 60, 84, 77, '중원', 330, 260, ['완', '수춘', '초']], 
+        [21, '하비', '중', 4278, 85, 83, 60, 82, 78, '중원', 480, 235, ['서주', '광릉']], 
+        [22, '서량', '중', 3874, 77, 79, 60, 83, 80, '서북',  25,  50, ['천수', '강', '저']], 
+        [23, '하내', '중', 3736, 77, 81, 60, 81, 80, '서북', 230, 150, ['진양', '홍농', '흉노', '호관']], 
+        [24, '한중', '중', 4027, 77, 84, 60, 80, 85, '서촉', 135, 205, ['상용', '양평', '기산']], 
+        [25, '상용', '중', 3687, 78, 76, 60, 77, 81, '서촉', 185, 225, ['한중', '신야']], 
+        [26, '덕양', '중', 3803, 81, 84, 60, 79, 77, '서촉',  85, 275, ['성도', '강주', '자동', '영안']], 
+        [27, '강주', '중', 4126, 79, 80, 60, 84, 81, '서촉',  70, 310, ['성도', '덕양', '영안', '귀양', '주시']], 
+        [28, '건녕', '중', 3765, 82, 80, 60, 86, 81, '남중',  80, 400, ['귀양', '운남', '남영']], 
+        [29, '남해', '중', 3803, 82, 76, 60, 80, 81, '남중', 245, 480, ['교지', '상동', '대', '산월']], 
+        [30, '계양', '중', 3955, 83, 80, 60, 81, 77,   '초', 230, 400, ['장사', '영릉', '상동']], 
+        [31,   '오', '중', 4355, 77, 81, 60, 77, 76, '오월', 510, 345, ['건업', '회계', '파양', '탐라']], 
+        [32, '평양', '중', 3982, 78, 80, 60, 83, 78, '동이', 590, 100, ['위례', '졸본']], 
+        [33, '사비', '중', 4157, 77, 79, 60, 78, 80, '동이', 605, 205, ['위례', '계림', '탐라']], 
+        [34, '계림', '중', 3911, 80, 74, 60, 81, 78, '동이', 655, 200, ['위례', '사비', '이도', '탐라']], 
+        [35, '진양', '소', 3074, 56, 59, 40, 64, 59, '하북', 295,  60, ['계', '하내', '호관']], 
+        [36, '평원', '소', 3074, 62, 65, 40, 61, 63, '하북', 440, 115, ['남피', '북해', '계교']], 
+        [37, '북해', '소', 3146, 55, 63, 40, 63, 58, '하북', 470, 155, ['평원', '패', '동황']], 
+        [38,   '초', '소', 3286, 60, 62, 40, 62, 57, '중원', 365, 230, ['허창', '수춘', '서주', '여남', '정도']], 
+        [39,   '패', '소', 2877, 64, 58, 40, 58, 59, '중원', 430, 220, ['서주', '북해', '정도']], 
+        [40, '천수', '소', 2985, 59, 64, 40, 60, 58, '서북',  70, 105, ['서량', '안정', '저', '적도']], 
+        [41, '안정', '소', 2764, 57, 59, 40, 57, 62, '서북',  95, 145, ['장안', '천수', '가정']], 
+        [42, '홍농', '소', 2748, 57, 63, 40, 58, 63, '서북', 210, 175, ['하내', '사곡', '함곡']], 
+        [43, '하변', '소', 2785, 58, 62, 40, 60, 56, '서촉',  45, 190, ['가맹', '가정']], 
+        [44, '자동', '소', 2870, 57, 55, 40, 60, 58, '서촉',  75, 245, ['덕양', '양평', '가맹', '면죽']], 
+        [45, '영안', '소', 3153, 62, 59, 40, 58, 59, '서촉', 115, 295, ['덕양', '강주', '이릉']], 
+        [46, '귀양', '소', 2746, 58, 61, 40, 61, 58, '남중',  90, 360, ['강주', '건녕', '주시']], 
+        [47, '주시', '소', 2828, 60, 59, 40, 58, 63, '남중',  30, 345, ['강주', '귀양', '운남']], 
+        [48, '운남', '소', 3258, 62, 60, 40, 64, 61, '남중',  30, 415, ['건녕', '주시', '남만']], 
+        [49, '남영', '소', 2853, 59, 62, 40, 58, 57, '남중', 135, 405, ['건녕', '영릉', '남만']], 
+        [50, '교지', '소', 3195, 58, 59, 40, 58, 59, '남중', 130, 480, ['남해', '남만']], 
+        [51, '신야', '소', 2786, 60, 62, 40, 58, 55,   '초', 250, 260, ['양양', '완', '상용']], 
+        [52, '강하', '소', 3074, 55, 56, 40, 57, 60,   '초', 315, 295, ['장판', '적벽']], 
+        [53, '무릉', '소', 3196, 58, 63, 40, 63, 58,   '초', 195, 355, ['강릉', '장사', '영릉']], 
+        [54, '영릉', '소', 2849, 62, 58, 40, 62, 62,   '초', 190, 395, ['장사', '계양', '남영', '무릉']], 
+        [55, '상동', '소', 2767, 58, 59, 40, 62, 58,   '초', 210, 435, ['남해', '계양', '고창']], 
+        [56, '여강', '소', 2905, 56, 58, 40, 60, 55, '오월', 380, 315, ['시상', '합비', '적벽', '파양']], 
+        [57, '회계', '소', 3005, 64, 59, 40, 62, 64, '오월', 480, 395, ['오', '산월']], 
+        [58, '고창', '소', 2802, 57, 62, 40, 58, 63, '오월', 350, 405, ['시상', '상동', '산월']], 
+        [59,   '대', '소', 3256, 60, 62, 40, 57, 60, '오월', 450, 480, ['남해', '산월', '유구']], 
+        [60, '안평', '소', 2937, 63, 59, 40, 59, 63, '동이', 530,  80, ['위례', '졸본', '동황', '백랑']], 
+        [61, '졸본', '소', 2939, 55, 59, 40, 60, 58, '동이', 570,  65, ['평양', '안평', '오환']], 
+        [62, '이도', '소', 3174, 58, 61, 40, 58, 56, '동이', 680, 260, ['계림', '왜', '탐라']], 
+        [63,   '강', '이', 2095, 40, 42, 20, 43, 40, '서북',  95,  35, ['서량', '적도']], 
+        [64,   '저', '이', 1957, 40, 42, 20, 43, 42, '서북',  25, 120, ['서량', '천수', '가정']], 
+        [65, '흉노', '이', 2064, 40, 41, 20, 40, 38, '서북', 180,  95, ['하내', '적도']], 
+        [66, '남만', '이', 2378, 40, 42, 20, 43, 45, '남중',  80, 455, ['운남', '남영', '교지']], 
+        [67, '산월', '이', 2275, 40, 37, 20, 43, 38, '오월', 425, 430, ['남해', '회계', '고창', '대']], 
+        [68, '오환', '이', 2153, 42, 37, 20, 43, 40, '동이', 610,  20, ['졸본', '백랑']], 
+        [69,   '왜', '이', 2065, 39, 37, 20, 43, 41, '동이', 680, 320, ['이도', '유구']], 
+        [70, '호관', '관',  887, 19, 18, 20, 95, 96, '하북', 285, 140, ['업', '낙양', '하내', '진양']], 
+        [71, '호로', '관', 1112, 22, 21, 20,103, 98, '중원', 285, 205, ['허창', '낙양', '완']], 
+        [72, '사곡', '관', 1008, 21, 19, 20, 99,101, '서북', 240, 175, ['낙양', '홍농']], 
+        [73, '함곡', '관', 1081, 20, 22, 20,101,102, '서북', 180, 175, ['장안', '홍농']], 
+        [74, '사수', '관',  958, 17, 19, 20, 95, 96, '중원', 310, 185, ['허창', '낙양', '진류', '관도']], 
+        [75, '양평', '관',  868, 19, 19, 20, 97, 96, '서촉',  90, 220, ['한중', '자동', '기산']], 
+        [76, '가맹', '관',  855, 17, 18, 20, 96, 95, '서촉',  45, 225, ['하변', '자동']], 
+        [77, '역경', '진',  985, 18, 19, 20, 39, 41, '하북', 410,  65, ['북평', '남피', '계']], 
+        [78, '계교', '진', 1012, 21, 19, 20, 40, 42, '하북', 405, 135, ['업', '복양', '평원']], 
+        [79, '동황', '진',  992, 19, 21, 20, 38, 40, '하북', 515, 145, ['위례', '북해', '안평']], 
+        [80, '관도', '진', 1123, 22, 20, 20, 42, 43, '중원', 340, 165, ['업', '허창', '진류', '사수']], 
+        [81, '정도', '진', 1085, 21, 21, 20, 41, 38, '중원', 400, 210, ['복양', '진류', '초', '패']], 
+        [82, '합비', '진',  998, 20, 19, 20, 39, 41, '중원', 435, 285, ['건업', '수춘', '여강']], 
+        [83, '광릉', '진', 1001, 20, 21, 20, 41, 40, '중원', 490, 275, ['건업', '하비']], 
+        [84, '적도', '진',  952, 18, 17, 20, 38, 37, '서북', 130,  75, ['천수', '강', '흉노']], 
+        [85, '가정', '진',  931, 17, 17, 20, 36, 38, '서북',  40, 160, ['안정', '하변', '저']], 
+        [86, '기산', '진', 1005, 19, 18, 20, 41, 40, '서촉', 110, 180, ['장안', '한중', '양평']], 
+        [87, '면죽', '관', 1093, 22, 21, 20,108, 99, '서촉',  35, 255, ['성도', '자동']], 
+        [88, '이릉', '진',  968, 18, 19, 20, 39, 41,   '초', 215, 295, ['강릉', '영안']], 
+        [89, '장판', '진', 1032, 21, 20, 20, 40, 37,   '초', 280, 315, ['양양', '강릉', '강하', '적벽']], 
+        [90, '백랑', '진', 1052, 22, 19, 20, 38, 42, '동이', 530,  30, ['북평', '안평', '오환']], 
+        [91, '적벽', '수', 1117, 23, 21, 20, 42, 41, '오월', 330, 325, ['시상', '강하', '여강', '장판']], 
+        [92, '파양', '수', 1037, 20, 22, 20, 38, 38, '오월', 430, 350, ['시상', '오', '여강']], 
+        [93, '탐라', '수', 1130, 22, 21, 20, 43, 41, '동이', 605, 260, ['오', '사비', '계림', '이도']], 
+        [94, '유구', '수',  921, 17, 18, 20, 37, 37, '동이', 625, 435, ['대', '왜']]
+    ];
+
+    protected static function _generate(){
+        if(static::$constID || static::$constName || static::$constRegion){
+            return;
+        }
+
+        $constID = [];
+        $constName = [];
+        $constCity = [];
+        $constRegion = [];
+
+        $nameMap = [];
+
+        foreach (static::$initCity as $rawCity) {
+            $nameMap[$rawCity[1]] = $rawCity[0];
+        }
+
+        foreach (static::$buildInit as $key=>$val){
+            $key2 = static::$levelMap[$key];
+            if(key_exists($key2, static::$buildInit)){
+                continue;//혹시 모를 버그 방지
+            }
+            
+            static::$buildInit[$key2] = $val;
+        }
+
+        foreach(static::$initCity as $rawCity){
+            [
+                $id,
+                $name,
+                $level,
+                $population,
+                $agriculture,
+                $commerce,
+                $security,
+                $defence,
+                $wall,
+                $region,
+                $posX,
+                $posY,
+                $path
+            ] = $rawCity;
+
+            $level = static::$levelMap[$level];
+            $population *= 100;
+            $agriculture *= 100;
+            $commerce *= 100;
+            $security *= 100;
+            $defence *= 100;
+            $wall *= 100;
+            $region = static::$regionMap[$region];
+            $newPath = [];
+            foreach($path as $pathName){
+                $pathID = $nameMap[$pathName];
+                $newPath[$pathID] = $pathName;
+            }
+
+            $city = new CityInitialDetail(
+                $id,
+                $name,
+                $level,
+                $population,
+                $agriculture,
+                $commerce,
+                $security,
+                $defence,
+                $wall,
+                $region,
+                $posX,
+                $posY,
+                $newPath
+            );
+
+            $constID[$id] = $city;
+            $constName[$name] = $city;
+            if(!key_exists($region, $constRegion)){
+                $constRegion[$region] = [];
+            }
+            $constRegion[$region] = $city;
+        }
+
+        static::$constID = $constID;
+        static::$constName = $constName;
+        static::$constRegion = $constRegion;
+        
+    }
+
+    protected static $buildInitCommon = [
+        'rate'=>50,
+        'trade'=>100,
+        'gen1'=>0,
+        'gen2'=>0,
+        'gen3'=>0
+    ];
+
+    protected static $buildInit = [
+        '수'=>[
+            'pop' =>  5000,
+            'agri'=>   100,
+            'comm'=>   100,
+            'secu'=>   100,
+            'def' =>   500,
+            'wall'=>   500,
+        ],
+        '진'=>[
+            'pop' =>  5000,
+            'agri'=>   100,
+            'comm'=>   100,
+            'secu'=>   100,
+            'def' =>   500,
+            'wall'=>   500,
+        ],
+        '관'=>[
+            'pop' => 10000,
+            'agri'=>   100,
+            'comm'=>   100,
+            'secu'=>   100,
+            'def' =>  1000,
+            'wall'=>  1000,
+        ],
+        '이'=>[
+            'pop' => 50000,
+            'agri'=>  1000,
+            'comm'=>  1000,
+            'secu'=>  1000,
+            'def' =>  1000,
+            'wall'=>  1000,
+        ],
+        '소'=>[
+            'pop' =>100000,
+            'agri'=>  1000,
+            'comm'=>  1000,
+            'secu'=>  1000,
+            'def' =>  2000,
+            'wall'=>  2000,
+        ],
+        '중'=>[
+            'pop' =>100000,
+            'agri'=>  1000,
+            'comm'=>  1000,
+            'secu'=>  1000,
+            'def' =>  3000,
+            'wall'=>  3000,
+        ],
+        '대'=>[
+            'pop' =>150000,
+            'agri'=>  1000,
+            'comm'=>  1000,
+            'secu'=>  1000,
+            'def' =>  4000,
+            'wall'=>  4000,
+        ],
+        '특'=>[
+            'pop' =>150000,
+            'agri'=>  1000,
+            'comm'=>  1000,
+            'secu'=>  1000,
+            'def' =>  5000,
+            'wall'=>  5000,
+        ]
+    ];
+
+    protected static function test(){
+        static::_generate();
+
+        foreach(static::all() as $id=>$city){
+            foreach($city->path as $connId=>$connCityText){
+                $connCity = static::byID($connId);
+                if(!key_exists($id, $connCity->path)){
+                    throw new \RuntimeException(sprintf('도시 연결이 올바르지 않음! %s <=> %s', $city->name, $connCity->name));
+                }
+            }
+        }
+    }
+
+    public static function build(){
+        static::_generate();
+        static::test();
+
+        $queries = array_map(function(CityInitialDetail $city){ 
+            $initValue = static::$buildInit[$city->level];
+            $path = join('|', array_keys($city->path));
+            return [
+                'city'=>$city->id,
+                'name'=>$city->name,
+                'level'=>$city->level,
+                'path'=>$path,
+                'pop2'=>$city->population,
+                'agri2'=>$city->agriculture,
+                'comm2'=>$city->commerce,
+                'secu2'=>$city->security,
+                'def2'=>$city->defence,
+                'wall2'=>$city->wall,
+                'region'=>$city->region
+            ] + $initValue + static::$buildInitCommon;
+        }, array_values(static::$constID));
+
+        DB::db()->insert('city', $queries);
+    }
+}

hwe/sammo/CityInitialDetail.php

@@ -12,6 +12,8 @@ class CityInitialDetail{
     public $defence;
     public $wall;
     public $region;
+    public $posX;
+    public $posY;
     public $path;
 
     public function __construct(
@@ -25,6 +27,8 @@ class CityInitialDetail{
         int $defence,
         int $wall,
         int $region,
+        int $posX,
+        int $posY,
         array $path
     ){
         $this->id = $id;
@@ -37,6 +41,8 @@ class CityInitialDetail{
         $this->defence = $defence;
         $this->wall = $wall;
         $this->region = $region;
+        $this->posX = $posX;
+        $this->posY = $posY;
         $this->path = $path;
     }
 

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

hwe/sammo/Event/Action/RegNeutralNPC.php

@@ -0,0 +1,46 @@
+<?php
+namespace sammo\Event\Action;
+
+class RegNeutralNPC extends \sammo\Event\Action{
+
+    private $npc;
+
+    public function __construct(
+        int $affinity, 
+        string $name, 
+        $picturePath, 
+        int $nationID,
+        $locatedCity, 
+        int $leadership, 
+        int $power, 
+        int $intel, 
+        int $birth = 160, 
+        int $death = 300, 
+        $ego = null,
+        $char = '', 
+        $text = ''
+    ){
+        $this->npc = new \sammo\Scenario\NPC(
+            $affinity, 
+            $name, 
+            $picturePath, 
+            $nationID, 
+            $locatedCity, 
+            $leadership, 
+            $power, 
+            $intel, 
+            $birth, 
+            $death, 
+            $ego, 
+            $char, 
+            $text?:''
+        );
+        $this->npc = 6;
+    }
+
+    public function run($env=null){
+        $result = $this->npc->build($env);
+        return [__CLASS__, $result];
+    }
+
+}

hwe/sammo/GameConstBase.php

@@ -1,14 +1,16 @@
 <?php
 namespace sammo;
 
-class GameConst extends GameCustomConst
+class GameConstBase
 {
     /** @var string 버전 */
     public static $title = "삼국지 모의전투 PHP HiDCHe";
     /** @var string 코드 아래에 붙는 설명 코드 */
-    public static $banner = "KOEI의 이미지를 사용, 응용하였습니다 / 제작 : HideD(hided62@gmail.com)";
-    /** @var string 코드 아래에 붙는 설명 코드 */
-    public static $helper = "도움 주신 분들";
+    public static $banner = "KOEI의 이미지를 사용, 응용하였습니다 / 제작 : HideD(hided62@gmail.com) / <a href='https://sam.hided.net/wiki/hidche/credit' target='_blank' style='color:white;text-decoration: underline;'>Credit</a>";
+    /** @var string mapName 사용중인 지도명 */
+    public static $mapName = 'che';
+    /** @var string unitSet 사용중인 유닛셋 */
+    public static $unitSet = 'che';
     /** @var int 내정시 최하 민심 설정*/
     public static $develrate = 50;
     /** @var int 능력치 상승 경험치*/
@@ -36,15 +38,15 @@ class GameConst extends GameCustomConst
     /** @var int 풀징병시 훈련 1회 상승량*/
     public static $atmosDelta = 30;
     /** @var float 훈련시 사기 감소율*/
-    public static $atmosSideEffectByTraining = 0.98;
+    public static $atmosSideEffectByTraining = 1;
     /** @var float 계략 기본 성공률*/
-    public static $sabotageDefaultProb = 0.25;
+    public static $sabotageDefaultProb = 0.15;
     /** @var int 계략시 확률 가중치(수치가 클수록 변화가 적음 : (지력차/$firing + $basefiring)*/
     public static $sabotageProbCoefByStat = 300;
-    /** @var int 계략시 기본 수치 감소량*/
-    public static $sabotageDefaultAmount = 100;
-    /** @var int 계략시 수치 감소량($firingbase ~ $firingpower)*/
-    public static $sabotageAmountCoef = 400;
+    /** @var int 계략시 최소 수치 감소량*/
+    public static $sabotageDamageMin = 100;
+    /** @var int 계략시 최대 수치 감소량*/
+    public static $sabotageDamageMax = 500;
     /** @var string 기본 배경색깔 푸른색*/
     public static $basecolor = "#000044";
     /** @var string 기본 배경색깔 초록색*/
@@ -67,6 +69,10 @@ class GameConst extends GameCustomConst
     public static $exchangeFee = 0.01;
     /** @var float 성인 연령 */
     public static $adultAge = 14;
+    /** @var int 최대 계급 */
+    public static $maxDedLevel = 30;
+    /** @var int 최대 기술 레벨 */
+    public static $maxTechLevel = 12;
 
     /** @var int 초기 제한시 장수 제한 */
     public static $initialNationGenLimit = 10;
@@ -82,4 +88,6 @@ class GameConst extends GameCustomConst
 
     /** @var int 최대 턴(현재는 DB상 24턴으로 고정) */
     public static $maxTurn = 24;
+
+    public static $statGradeLevel = 5;
 }

hwe/sammo/GameUnitConst.php

@@ -1,161 +0,0 @@
-<?php
-namespace sammo;
-
-class GameUnitConst{
-    private function __construct(){
-
-    }
-
-    private static $constID = null;
-    private static $constName = null;
-    private static $constCity = null;
-    private static $constRegion = null;
-
-    /**
-     * @return \sammo\GameUnitDetail[]
-     */
-    public static function all(): array{
-        static::_generate();
-        return static::$constID;
-    }
-
-    public static function byID(int $id): GameUnitDetail{
-        static::_generate();
-        return static::$constID[$id];
-    }
-
-    public static function byName(string $name): GameUnitDetail{
-        static::_generate();
-        return static::$constName[$name];
-    }
-
-    public static function byCity(int $city): GameUnitDetail{
-        static::_generate();
-        return static::$constCity[$city];
-    }
-
-    public static function byRegion(int $region): GameUnitDetail{
-        static::_generate();
-        return static::$constRegion[$region];
-    }
-
-    private static function _generate(){
-
-        if(static::$constID || static::$constName || static::$constCity || static::$constRegion){
-            return;
-        }
-
-        $list = [
-            [ 0, '보병',     100, 150, 7, 10,  9,  9, 0, 0, true, ['표준적인 보병입니다.','보병은 방어특화입니다.']],
-            [ 1, '청주병',   100, 200, 7, 10, 10, 11, 1, '중원', true, ['저렴하고 튼튼합니다.']],
-            [ 2, '수병',     150, 150, 7, 10, 11, 10, 1, '오월', true, ['저렴하고 강력합니다.']],
-            [ 3, '자객병',   100, 150, 7, 20, 10, 10, 2, '저', true, ['은밀하고 날쌥니다.']],
-            [ 4, '근위병',   150, 200, 7, 10, 12, 12, 2, '낙양', true, ['최강의 보병입니다.']],
-            [ 5, '등갑병',   100, 250, 7,  5, 13, 10, 1, '남중', true, ['등갑을 두른 보병입니다.']],
-
-            [10, '궁병',     100, 100, 7, 20, 10, 10, 0, 0, true, ['표준적인 궁병입니다.','궁병은 회피특화입니다.']],
-            [11, '궁기병',   100, 100, 8, 30, 11, 12, 1, '동이', true, ['말을 타고 잘 피합니다.']],
-            [12, '연노병',   150, 100, 8, 20, 12, 11, 1, '서촉', true, ['화살을 연사합니다.']],
-            [13, '강궁병',   150, 150, 7, 20, 13, 13, 2, '양양', true, ['강건한 궁병입니다.']],
-            [14, '석궁병',   200, 100, 7, 20, 13, 13, 2, '건업', true, ['강력한 화살을 쏩니다.']],
-
-            [20, '기병',     150, 100, 7,  5, 11, 11, 0, 0, true, ['표준적인 기병입니다.','기병은 공격특화입니다.']],
-            [21, '백마병',   200, 100, 7,  5, 12, 13, 1, '하북', true, ['백마의 위용을 보여줍니다.']],
-            [22, '중장기병', 150, 150, 7,  5, 13, 12, 1, '서북', true, ['갑주를 두른 기병입니다.']],
-            [23, '돌격기병', 200, 100, 8,  5, 13, 11, 2,'흉노', true, ['저돌적으로 공격합니다.']],
-            [24, '철기병',   100, 200, 7,  5, 11, 13, 2, '강', true, ['철갑을 두른 기병입니다.']],
-            [25, '수렵기병', 150, 100, 8, 15, 12, 12, 2, '산월', true, ['날쎄고 빠른 기병입니다.']],
-            [26, '맹수병',   250, 200, 6,  0, 16, 16, 2, '남만', true, ['어느 누구보다 강력합니다.']],
-            [27, '호표기병', 200, 150, 7,  5, 14, 14, 2, '허창', true, ['정예 기병입니다.']],
-
-            [30, '귀병',      80,  80, 7,  5,  9,  9, 0, 0, true, ['계략을 사용하는 병종입니다.']],
-            [31, '신귀병',    80,  80, 7, 20, 10, 10, 1,'초', true, ['신출귀몰한 귀병입니다.']],
-            [32, '백귀병',    80, 130, 7,  5,  9, 11, 2, '오환', true, ['저렴하고 튼튼합니다.']],
-            [33, '흑귀병',   130,  80, 7,  5, 11,  9, 2, '왜', true, ['저렴하고 강력합니다.']],
-            [34, '악귀병',   130, 130, 7,  0, 12, 12, 2, '장안', true, ['백병전에도 능숙합니다.']],
-            [35, '남귀병',    60,  60, 7, 10,  8,  8, 0, 1000, false, ['전투를 포기하고 계략에 몰두합니다.']],
-            [36, '황귀병',   110, 110, 7,  0, 13, 10, 2, '낙양', true, ['고도로 훈련된 귀병입니다.']],
-            [37, '천귀병',    80, 130, 7, 15, 11, 12, 2, '성도', true, ['갑주를 두른 귀병입니다.']],
-            [38, '마귀병',   130,  80, 7, 15, 12, 11, 2, '업', true, ['날카로운 무기를 가진 귀병입니다.']],
-
-            [40, '정란',     100, 100, 6,  0, 15,  5, 0, 0, false, ['높은 구조물 위에서 공격합니다.']],
-            [41, '충차',     150, 100, 6,  0, 20,  5, 0, 1000, false, ['엄청난 위력으로 성벽을 부수어버립니다.']],
-            [42, '벽력거',   200, 100, 6,  0, 25,  5, 2, '업', true, ['상대에게 돌덩이를 날립니다.']],
-            [43, '목우',      50, 200, 5,  0, 30,  5, 2, '성도', true, ['상대를 저지하는 특수병기입니다.']]
-        ];
-
-        $constID = [];
-        $constName = [];
-        $constCity = [];
-        $constRegion = [];
-
-        foreach($list as $rawUnit){
-            list(
-                $id,
-                $name, 
-                $attack,
-                $defence,
-                $speed,
-                $avoid,
-                $cost,
-                $rice,
-                $recruitType,
-                $recruitCondition,
-                $recruitFirst,
-                $info
-            ) = $rawUnit;
-
-            //0인 경우는 기술치이다.
-            if(!$recruitFirst){
-                $info[] = "일정 시간이 지나야 사용 가능";
-            }
-
-            if($recruitType == 1){
-                $info[] = "{$recruitCondition}지역 소유시 가능";
-                $recruitCondition = CityConst::$regionMap[$recruitCondition];
-            }
-            else if($recruitType == 2){
-                $info[] = "{$recruitCondition} 소유시 가능";
-                $recruitCondition = CityConst::byName($recruitCondition)->id;
-            }
-
-            
-
-            $unit = new GameUnitDetail(
-                $id,
-                $name, 
-                $attack,
-                $defence,
-                $speed,
-                $avoid,
-                $cost,
-                $rice,
-                $recruitType,
-                $recruitCondition,
-                $recruitFirst,
-                $info
-            );
-
-            $constID[$id] = $unit;
-            $constName[$name] = $unit;
-            if($recruitType == 1){
-                if(!key_exists($recruitCondition, $constRegion)){
-                    $constRegion[$recruitCondition] = [];
-                }
-                $constRegion[$recruitCondition][] = $unit;
-            }
-            if($recruitType == 2){
-                if(!key_exists($recruitCondition, $constCity)){
-                    $constCity[$recruitCondition] = [];
-                }
-                $constCity[$recruitCondition][] = $unit;
-            }
-        }
-
-        static::$constID = $constID;
-        static::$constName = $constName;
-        static::$constCity = $constCity;
-        static::$constRegion = $constRegion;
-        
-    }
-}

hwe/sammo/GameUnitConstBase.php

@@ -0,0 +1,459 @@
+<?php
+namespace sammo;
+
+class GameUnitConstBase{
+    protected function __construct(){
+
+    }    
+
+    const T_CASTLE = -1;
+    const T_MISC = -2;
+    const T_FOOTMAN = 0;
+    const T_ARCHER = 1;
+    const T_CAVALRY = 2;
+    const T_WIZARD = 3;
+    const T_SIEGE = 4;
+
+    const DEFAULT_CREWTYPE = 0;
+    
+    
+
+    protected static $constID = null;
+    protected static $constName = null;
+    protected static $constCity = null;
+    protected static $constRegion = null;
+    protected static $constType = null;
+
+    protected static $typeData = [
+        self::T_FOOTMAN => '보병',
+        self::T_ARCHER => '궁병',
+        self::T_CAVALRY => '기병',
+        self::T_WIZARD => '귀병',
+        self::T_SIEGE => '차병',
+    ];
+
+    protected static $_buildData = [
+        [
+            -1, self::T_CASTLE, '성벽',
+            100, 100, 7, 0, 0,   99,  9,    
+            999999, null,     null,     999999, 
+            [],//성벽은 공격할 수 없다.
+            [],
+            ['성벽입니다.','생성할 수 없습니다.']
+        ],
+
+        [
+            0, self::T_FOOTMAN, '보병',
+            100, 150, 7, 10, 0,   9,  9,    
+            0, null,     null,     0, 
+            [self::T_ARCHER=>1.2, self::T_CAVALRY=>0.8, self::T_SIEGE=>1.2],
+            [self::T_ARCHER=>0.8, self::T_CAVALRY=>1.2, self::T_SIEGE=>0.8],
+            ['표준적인 보병입니다.','보병은 방어특화이며, 상대가 회피하기 어렵습니다.']
+        ],
+        [
+            1, self::T_FOOTMAN, '청주병',   
+            100, 200, 7, 10, 0,  10, 11, 
+            1000, null,     ['중원'], 0, 
+            [self::T_ARCHER=>1.2, self::T_CAVALRY=>0.8, self::T_SIEGE=>1.2],
+            [self::T_ARCHER=>0.8, self::T_CAVALRY=>1.2, self::T_SIEGE=>0.8],
+            ['저렴하고 튼튼합니다.']
+        ],
+        [
+            2, self::T_FOOTMAN, '수병',     
+            150, 150, 7, 10, 0,  11, 10, 
+            1000, null,     ['오월'], 0, 
+            [self::T_ARCHER=>1.2, self::T_CAVALRY=>0.8, self::T_SIEGE=>1.2],
+            [self::T_ARCHER=>0.8, self::T_CAVALRY=>1.2, self::T_SIEGE=>0.8],
+            ['저렴하고 강력합니다.']
+        ],
+        [
+            3, self::T_FOOTMAN, '자객병',   
+            100, 150, 7, 20, 0,  10, 10, 
+            2000, ['저'],   null,     0, 
+            [self::T_ARCHER=>1.2, self::T_CAVALRY=>0.8, self::T_SIEGE=>1.2],
+            [self::T_ARCHER=>0.8, self::T_CAVALRY=>1.2, self::T_SIEGE=>0.8],
+            ['은밀하고 날쌥니다.']
+        ],
+        [
+            4, self::T_FOOTMAN, '근위병',   
+            150, 200, 7, 10, 0,  12, 12, 
+            3000, ['낙양'], null,     0, 
+            [self::T_ARCHER=>1.2, self::T_CAVALRY=>0.8, self::T_SIEGE=>1.2],
+            [self::T_ARCHER=>0.8, self::T_CAVALRY=>1.2, self::T_SIEGE=>0.8],
+            ['최강의 보병입니다.']
+        ],
+        [
+            5, self::T_FOOTMAN, '등갑병',   
+            100, 250, 7,  5, 0,  13, 10, 
+            1000, null,     ['남중'], 0, 
+            [self::T_ARCHER=>1.2, self::T_CAVALRY=>0.8, self::T_SIEGE=>1.2],
+            [self::T_ARCHER=>0.8, self::T_CAVALRY=>1.2, self::T_SIEGE=>0.8],
+            ['등갑을 두른 보병입니다.']
+        ],
+
+        [
+            10, self::T_ARCHER, '궁병',     
+            100, 100, 7, 20, 0,  10, 10,    
+            0, null,     null,     0, 
+            [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
+            [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
+            ['표준적인 궁병입니다.','궁병은 회피특화입니다.']
+        ],
+        [
+            11, self::T_ARCHER, '궁기병',   
+            100, 100, 8, 30, 0,  11, 12, 
+            1000, null,     ['동이'], 0, 
+            [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
+            [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
+            ['말을 타고 잘 피합니다.']
+        ],
+        [
+            12, self::T_ARCHER, '연노병',   
+            150, 100, 8, 20, 0,  12, 11, 
+            1000, null,     ['서촉'], 0, 
+            [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
+            [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
+            ['화살을 연사합니다.']
+        ],
+        [
+            13, self::T_ARCHER, '강궁병',   
+            150, 150, 7, 20, 0,  13, 13, 
+            3000, ['양양'], null,     0, 
+            [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
+            [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
+            ['강건한 궁병입니다.']
+        ],
+        [
+            14, self::T_ARCHER, '석궁병',   
+            200, 100, 7, 20, 0,  13, 13, 
+            3000, ['건업'], null,     0, 
+            [self::T_CAVALRY=>1.2, self::T_FOOTMAN=>0.8, self::T_SIEGE=>1.2],
+            [self::T_CAVALRY=>0.8, self::T_FOOTMAN=>1.2, self::T_SIEGE=>0.8],
+            ['강력한 화살을 쏩니다.']
+        ],
+
+        [
+            20, self::T_CAVALRY, '기병',     
+            150, 100, 7,  5, 0,  11, 11,    
+            0, null,     null,     0, 
+            [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
+            [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
+            ['표준적인 기병입니다.','기병은 공격특화입니다.']
+        ],
+        [
+            21, self::T_CAVALRY, '백마병',   
+            200, 100, 7,  5, 0,  12, 13, 
+            1000, null,     ['하북'], 0, 
+            [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
+            [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
+            ['백마의 위용을 보여줍니다.']
+        ],
+        [
+            22, self::T_CAVALRY, '중장기병', 
+            150, 150, 7,  5, 0,  13, 12, 
+            1000, null,     ['서북'], 0, 
+            [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
+            [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
+            ['갑주를 두른 기병입니다.']
+        ],
+        [
+            23, self::T_CAVALRY, '돌격기병', 
+            200, 100, 8,  5, 0,  13, 11, 
+            2000, ['흉노'], null,     0, 
+            [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
+            [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
+            ['저돌적으로 공격합니다.']
+        ],
+        [
+            24, self::T_CAVALRY, '철기병',  
+            100, 200, 7,  5, 0,  11, 13, 
+            2000, ['강'],   null,     0, 
+            [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
+            [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
+            ['철갑을 두른 기병입니다.']],
+        [
+            25, self::T_CAVALRY, '수렵기병', 
+            150, 100, 8, 15, 0,  12, 12, 
+            2000, ['산월'], null,     0, 
+            [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
+            [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
+            ['날쎄고 빠른 기병입니다.']
+        ],
+        [
+            26, self::T_CAVALRY, '맹수병',   
+            250, 200, 6,  0, 0,  16, 16, 
+            2000, ['남만'], null,     0, 
+            [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
+            [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
+            ['어느 누구보다 강력합니다.']
+        ],
+        [
+            27, self::T_CAVALRY, '호표기병', 
+            200, 150, 7,  5, 0,  14, 14, 
+            3000, ['허창'], null,     0, 
+            [self::T_FOOTMAN=>1.2, self::T_ARCHER=>0.8, self::T_SIEGE=>1.2],
+            [self::T_FOOTMAN=>0.8, self::T_ARCHER=>1.2, self::T_SIEGE=>0.8],
+            ['정예 기병입니다.']
+        ],
+
+        [
+            30, self::T_WIZARD, '귀병',      
+            80,  80, 7,  5, 0.5,  9,  9,    
+            0, null,     null,     0, 
+            [self::T_SIEGE=>1.2],
+            [self::T_SIEGE=>0.8],
+            ['계략을 사용하는 병종입니다.']
+        ],
+        [
+            31, self::T_WIZARD, '신귀병',    
+            80,  80, 7, 20, 0.6, 10, 10, 
+            1000, null,     ['초'],   0, 
+            [self::T_SIEGE=>1.2],
+            [self::T_SIEGE=>0.8],
+            ['신출귀몰한 귀병입니다.']
+        ],
+        [
+            32, self::T_WIZARD, '백귀병',    
+            80, 130, 7,  5, 0.6,  9, 11, 
+            2000, ['오환'], null,     0, 
+            [self::T_SIEGE=>1.2],
+            [self::T_SIEGE=>0.8],
+            ['저렴하고 튼튼합니다.']
+        ],
+        [
+            33, self::T_WIZARD, '흑귀병',   
+            130,  80, 7,  5, 0.6, 11,  9, 
+            2000, ['왜'],   null,     0, 
+            [self::T_SIEGE=>1.2],
+            [self::T_SIEGE=>0.8],
+            ['저렴하고 강력합니다.']
+        ],
+        [
+            34, self::T_WIZARD, '악귀병',   
+            130, 130, 7,  0, 0.6, 12, 12, 
+            3000, ['장안'], null,     0, 
+            [self::T_SIEGE=>1.2],
+            [self::T_SIEGE=>0.8],
+            ['백병전에도 능숙합니다.']
+        ],
+        [
+            35, self::T_WIZARD, '남귀병',    
+            60,  60, 7, 10, 0.8,  8,  8, 
+            1000, null,     null,     0, 
+            [self::T_SIEGE=>1.2],
+            [self::T_SIEGE=>0.8],
+            ['전투를 포기하고 계략에 몰두합니다.']
+        ],
+        [
+            36, self::T_WIZARD, '황귀병',   
+            110, 110, 7,  0, 0.8, 13, 10, 
+            3000, ['낙양'], null,     0, 
+            [self::T_SIEGE=>1.2],
+            [self::T_SIEGE=>0.8],
+            ['고도로 훈련된 귀병입니다.']
+        ],
+        [
+            37, self::T_WIZARD, '천귀병',    
+            80, 130, 7, 15, 0.6, 11, 12, 
+            3000, ['성도'], null,     0, 
+            [self::T_SIEGE=>1.2],
+            [self::T_SIEGE=>0.8],
+            ['갑주를 두른 귀병입니다.']
+        ],
+        [
+            38, self::T_WIZARD, '마귀병',   
+            130,  80, 7, 15, 0.6, 12, 11, 
+            3000, ['업'],   null,     0, 
+            [self::T_SIEGE=>1.2],
+            [self::T_SIEGE=>0.8],
+            ['날카로운 무기를 가진 귀병입니다.']
+        ],
+
+        [
+            40, self::T_SIEGE, '정란',     
+            100, 100, 6,  0, 0,  15,  5,    
+            0, null,     null,     3, 
+            [self::T_FOOTMAN=>0.8, self::T_ARCHER=>0.8, self::T_CAVALRY=>0.8, self::T_WIZARD=>0.8, self::T_CASTLE=>1.8],
+            [self::T_FOOTMAN=>1.2, self::T_ARCHER=>1.2, self::T_CAVALRY=>1.2, self::T_WIZARD=>1.2],
+            ['높은 구조물 위에서 공격합니다.']
+        ],
+        [
+            41, self::T_SIEGE, '충차',     
+            150, 100, 6,  0, 0,  20,  5, 
+            1000, null,     null,     3, 
+            [self::T_FOOTMAN=>0.8, self::T_ARCHER=>0.8, self::T_CAVALRY=>0.8, self::T_WIZARD=>0.8, self::T_CASTLE=>2.4],
+            [self::T_FOOTMAN=>1.2, self::T_ARCHER=>1.2, self::T_CAVALRY=>1.2, self::T_WIZARD=>1.2],
+            ['엄청난 위력으로 성벽을 부수어버립니다.']
+        ],
+        [
+            42, self::T_SIEGE, '벽력거',   
+            200, 100, 6,  0, 0,  25,  5, 
+            3000, ['업'],   null,     0, 
+            [self::T_FOOTMAN=>0.8, self::T_ARCHER=>0.8, self::T_CAVALRY=>0.8, self::T_WIZARD=>0.8, self::T_CASTLE=>1.8],
+            [self::T_FOOTMAN=>1.2, self::T_ARCHER=>1.2, self::T_CAVALRY=>1.2, self::T_WIZARD=>1.2],
+            ['상대에게 돌덩이를 날립니다.']
+        ],
+        [
+            43, self::T_SIEGE, '목우',      
+            50, 200, 5,  0, 0,  30,  5, 
+            3000, ['성도'], null,     0, 
+            [self::T_FOOTMAN=>0.8, self::T_ARCHER=>0.8, self::T_CAVALRY=>0.8, self::T_WIZARD=>0.8],
+            [self::T_FOOTMAN=>1.2, self::T_ARCHER=>1.2, self::T_CAVALRY=>1.2, self::T_WIZARD=>1.2],
+            ['상대를 저지하는 특수병기입니다.']
+        ]
+    ];
+
+    /**
+     * @return \sammo\GameUnitDetail[]
+     */
+    public static function all(): array{
+        static::_generate();
+        return static::$constID;
+    }
+
+    public static function allType(): array{
+        return static::$typeData;
+    }
+
+    public static function byID(int $id): ?GameUnitDetail{
+        static::_generate();
+        return static::$constID[$id]??null;
+    }
+
+    public static function byName(string $name): ?GameUnitDetail{
+        static::_generate();
+        return static::$constName[$name]??null;
+    }
+
+    public static function byCity(int $city): array{
+        static::_generate();
+        return static::$constCity[$city]??[];
+    }
+
+    public static function byRegion(int $region): array{
+        static::_generate();
+        return static::$constRegion[$region]??[];
+    }
+
+    
+
+    public static function byType(int $type): array{
+        static::_generate();
+        if(!key_exists($type, static::$constType)){
+            return [];
+        }
+
+        return static::$constType[$type];
+    }
+
+    protected static function _generate(){
+
+        if(static::$constID || static::$constName || static::$constCity || static::$constRegion || static::$constType){
+            return;
+        }
+
+        $constID = [];
+        $constName = [];
+        $constCity = [];
+        $constRegion = [];
+        $constType = [];
+
+        foreach(static::$_buildData as $rawUnit){
+            [
+                $id,
+                $armType,
+                $name, 
+                $attack,
+                $defence,
+                $speed,
+                $avoid,
+                $magicCoef,
+                $cost,
+                $rice,
+                $reqTech,
+                $reqCities,
+                $reqRegions,
+                $reqYear,
+                $attackCoef,
+                $defenceCoef,
+                $info
+             ] = $rawUnit;
+
+            if($reqYear > 0){
+                $info[] = "{$reqYear}년 경과 후 사용 가능";
+            }
+
+            if($reqTech > 0){
+                $info[] = "기술력 {$reqTech} 이상 필요";
+            }
+
+            if($reqCities !== null){
+                $reqCities = array_map(function($reqCity) use (&$info){
+                    $info[] = "{$reqCity} 소유시 가능";
+                    return CityConst::byName($reqCity)->id;
+                }, $reqCities);
+            }
+
+            if($reqRegions !== null){
+                $reqRegions = array_map(function($reqRegion) use (&$info){
+                    $info[] = "{$reqRegion} 지역 소유시 가능";
+                    return CityConst::$regionMap[$reqRegion];
+                }, $reqRegions);
+            }
+            
+            $unit = new GameUnitDetail(
+                $id,
+                $armType,
+                $name, 
+                $attack,
+                $defence,
+                $speed,
+                $avoid,
+                $magicCoef,
+                $cost,
+                $rice,
+                $reqTech,
+                $reqCities,
+                $reqRegions,
+                $reqYear,
+                $attackCoef,
+                $defenceCoef,
+                $info
+            );
+
+            $constID[$id] = $unit;
+            $constName[$name] = $unit;
+            if(!key_exists($armType, $constType)){
+                $constType[$armType] = [];
+            }
+            $constType[$armType][] = $unit;
+
+            if($unit->reqCities){
+                foreach($unit->reqCities as $reqCity){
+                    if(!key_exists($reqCity, $constCity)){
+                        $constCity[$reqCity] = [];
+                    }
+                    $constCity[$reqCity][] = $unit;
+                }
+            }
+            
+
+            if($unit->reqRegions){
+                foreach($unit->reqRegions as $reqRegion){
+                    if(!key_exists($reqRegion, $constRegion)){
+                        $constRegion[$reqRegion] = [];
+                    }
+                    $constRegion[$reqRegion][] = $unit;
+                }
+            }
+
+        }
+
+        static::$constID = $constID;
+        static::$constName = $constName;
+        static::$constCity = $constCity;
+        static::$constRegion = $constRegion;
+        static::$constType = $constType;
+        
+    }
+}

hwe/sammo/GameUnitDetail.php

@@ -3,80 +3,197 @@ namespace sammo;
 
 class GameUnitDetail{
     public $id;
+    public $armType;
     public $name;
     public $attack;
     public $defence;
     public $speed;
     public $avoid;
+    public $magicCoef;
     public $cost;
     public $rice;
-    public $recruitType;
-    public $recruitCondition;
-    public $recruitFirst;
+    public $reqTech;
+    public $reqCities;
+    public $reqRegions;
+    public $reqYear;
+    public $attackCoef;
+    public $defenceCoef;
     public $info;
 
     public function __construct(
         int $id,
+        int $armType,
         string $name, 
         int $attack,
         int $defence,
         int $speed,
         int $avoid,
+        float $magicCoef,
         int $cost,
         int $rice,
-        int $recruitType,
-        int $recruitCondition,
-        bool $recruitFirst,
+        int $reqTech,
+        ?array $reqCities,
+        ?array $reqRegions,
+        int $reqYear,
+        array $attackCoef,
+        array $defenceCoef,
         array $info
     ){
+        $this->id = $id;
         $this->name = $name;
+        $this->armType = $armType;
         $this->attack = $attack;
         $this->defence = $defence;
         $this->speed = $speed;
         $this->avoid = $avoid;
+        $this->magicCoef = $magicCoef;
         $this->cost = $cost;
         $this->rice = $rice;
-        $this->recruitType = $recruitType;
-        $this->recruitCondition = $recruitCondition;
-        $this->recruitFirst = $recruitFirst;
+        $this->reqTech = $reqTech;
+        $this->reqCities = $reqCities;
+        $this->reqRegions = $reqRegions;
+        $this->reqYear = $reqYear;
+        $this->attackCoef = $attackCoef;
+        $this->defenceCoef = $defenceCoef;
         $this->info = $info;
     }
 
+    public function getShortName():string{
+        return StringUtil::subStringForWidth($this->name, 0, 4);
+    }
+
+    public function costWithTech(int $tech, int $crew=100):float{
+        return $this->cost * getTechCost($tech) * $crew / 100;
+    }
+
+    public function getAttackCoef($armType):float{
+        if($armType instanceof GameUnitDetail){
+            $armType = $armType->armType;
+        }
+        assert(is_numeric($armType), '$armType should be int or GameUnitDetail');
+        return $this->attackCoef[$armType]??1;
+    }
+
+    public function getDefenceCoef($armType):float{
+        if($armType instanceof GameUnitDetail){
+            $armType = $armType->armType;
+        }
+        assert(is_numeric($armType), '$armType should be int or GameUnitDetail');
+        return $this->defenceCoef[$armType]??1;
+    }
+
+    public function getComputedAttack(array $general, int $tech){
+        if($this->armType == GameUnitConst::T_CASTLE){
+            assert(isset($general['def']) && isset($general['wall']), '도시 정보가 입력되어야 함');
+            return ($general['def'] + $general['wall']*9) / 500 + 200;
+        }
+
+        if($this->armType == GameUnitConst::T_WIZARD){
+            $ratio = getGeneralIntel($general, true, true, true)*2 - 40;
+        }
+        else if($this->armType == GameUnitConst::T_SIEGE){
+            $ratio = getGeneralLeadership($general, true, true, true)*2 - 40;
+        }
+        else if($this->armType == GameUnitConst::T_MISC){
+            $ratio = getGeneralIntel($general, true, true, true) +
+                getGeneralLeadership($general, true, true, true) + 
+                getGeneralPower($general, true, true, true);
+            $ratio = $ratio*2/3 - 40;
+        }
+        else{
+            $ratio = getGeneralPower($general, true, true, true)*2 - 40;
+        }
+        if($ratio < 10){
+            $ratio = 10;
+        }
+        if($ratio > 100){
+            $ratio = 50 + $ratio/2;
+        }
+
+        $att = $this->attack + getTechAbil($tech);
+        return $att * $ratio / 100;
+    }
+
+    public function getComputedDefence(array $general, int $tech){
+        if($this->armType == GameUnitConst::T_CASTLE){
+            assert(isset($general['def']) && isset($general['wall']), '도시 정보가 입력되어야 함');
+            return ($general['def'] + $general['wall']*9) / 500 + 200;
+        }
+        $def = $this->defence + getTechAbil($tech);
+        $crew = ($general['crew'] / (7000 / 30)) + 70;
+        return $def * $crew / 100;
+    }
+
+    public function getCriticalRatio(array $general){
+        if($this->armType == GameUnitConst::T_CASTLE){
+            //성벽은 필살을 사용하지 않는다.
+            return 0;
+        }
+
+        //  무장 무력 : 65 5%, 70 10%, 75 15%, 80 20%
+        //  지장 지력 : 65 5%, 70  8%, 75 10%, 80 13%
+        //충차장 통솔:  65 5%, 70  8%, 75 10%, 80 13%
+        if($this->armType == GameUnitConst::T_WIZARD){
+            $mainstat = getGeneralIntel($general, false, true, true, false);
+            $coef = 0.4;
+        }
+        else if($this->armType == GameUnitConst::T_SIEGE){
+            $mainstat = getGeneralLeadership($general, false, true, true, false);
+            $coef = 0.4;
+        }
+        else if($this->armType == GameUnitConst::T_MISC){
+            $mainstat = getGeneralIntel($general, false, true, true, false) +
+            getGeneralLeadership($general, false, true, true, false) +
+            getGeneralPower($general, false, true, true, false);
+            $mainstat /= 3;
+            $coef = 0.4;
+        }
+        else{
+            $mainstat = getGeneralPower($general, false, true, true, false);
+            $coef = 0.5;
+        }
+
+        $ratio = max($mainstat - 65, 0);
+        $ratio *= $coef;
+
+        return min(50, $ratio) / 100;
+    }
+
     public function isValid($ownCities, $ownRegions, $relativeYear, $tech){
-        if($relativeYear < 3 && !$this->recruitFirst){
+        //음수 없음
+        $relativeYear = max(0, $relativeYear);
+
+        if($relativeYear < $this->reqYear){
             return false;
         }
 
-        if($this->recruitType == 0){
-            if($tech < $this->recruitCondition){
+        if($tech < $this->reqTech){
+            return false;
+        }
+
+        if($this->reqCities !== null){
+            $valid = false;
+            foreach($this->reqCities as $reqCity){
+                if(\key_exists($reqCity, $ownCities)){
+                    $valid = true;
+                    break;
+                }
+            }
+            if(!$valid){
                 return false;
             }
         }
 
-        if($this->recruitType == 1){
-            if(!key_exists($this->recruitCondition, $ownRegions)){
-                return false;
-            }
-            if ($tech < 1000) {
-                return false;
-            }
-        }
-
-        if($this->recruitType == 2){
-            $cityLevel = CityConst::byID($this->recruitCondition)->level;
-
-            if(!key_exists($this->recruitCondition, $ownCities)){
-                return false;
-            }
-            if($cityLevel == CityConst::$levelMap['특']){
-                if ($tech < 3000) {
-                    return false;
+        if($this->reqRegions !== null){
+            $valid = false;
+            foreach($this->reqRegions as $reqRegion){
+                if(\key_exists($reqRegion, $ownRegions)){
+                    $valid = true;
+                    break;
                 }
             }
-            else{ //if($cityLevel == '이')
-                if ($tech < 2000) {
-                    return false;
-                }
+            if(!$valid){
+                return false;
             }
         }
 

hwe/sammo/ResetHelper.php

@@ -143,6 +143,24 @@ class ResetHelper{
         ]);
 
         CityConst::build();
+        $cityPositions = [];
+        foreach(CityConst::all() as $city){
+            $cityPositions[$city->id] = [
+                $city->name,
+                $city->posX,
+                $city->posY
+            ];
+        }
+        Util::generateFileUsingSimpleTemplate(
+            __dir__.'/../templates/base_map.orig.js',
+            __dir__.'/../d_shared/base_map.js',
+            [
+                'cityPosition'=>Json::encode($cityPositions),
+                'regionMap'=>Json::encode(CityConst::$regionMap),
+                'levelMap'=>Json::encode(CityConst::$levelMap),
+            ],
+            true
+        );
 
 
         $turntime = date('Y-m-d H:i:s');
@@ -166,7 +184,7 @@ class ResetHelper{
         $killturn = 4800 / $turnterm;
         if($npcmode == 1) { $killturn = intdiv($killturn, 3); }
 
-        
+        $develcost = ($year - $startyear + 10) * 2;
 
         $env = [
             'scenario'=>$scenario,
@@ -175,12 +193,14 @@ class ResetHelper{
             'startyear'=>$startyear,
             'year'=> $year,
             'month'=> $month,
+            'map_theme' => $scenarioObj->getMapTheme(),
             'msg'=>'공지사항',//TODO:공지사항
             'maxgeneral'=>GameConst::$defaultMaxGeneral,
             'maxnation'=>GameConst::$defaultMaxNation,
             'conlimit'=>300,
             'gold_rate'=>100,
             'rice_rate'=>100,
+            'develcost'=>$develcost,
             'turntime'=>$turntime,
             'starttime'=>$starttime,
             'turnterm'=>$turnterm,
@@ -200,7 +220,8 @@ class ResetHelper{
                 'picture'=>$admin['picture'],
                 'imgsvr'=>$admin['imgsvr'],
                 'turntime'=>$turntime,
-                'killturn'=>9999
+                'killturn'=>9999,
+                'crewtype'=>GameUnitConst::DEFAULT_CREWTYPE
             ]);
         }
 
@@ -212,6 +233,7 @@ class ResetHelper{
             'server_id'=>$serverID,
             'date'=>$turntime,
             'winner_nation'=>null,
+            'map'=>$scenarioObj->getMapTheme(),
             'scenario'=>$scenario,
             'scenario_name'=>$scenarioObj->getTitle(),
             'env'=>Json::encode($env)

hwe/sammo/Scenario.php

@@ -22,6 +22,7 @@ class Scenario{
 
     private $generals;
     private $generalsEx;
+    private $generalsNeutral;
 
     private $tmpGeneralQueue = [];
 
@@ -151,6 +152,50 @@ class Scenario{
 
         }, Util::array_get($data['general_ex'], []));
 
+        $this->generalsNeutral = array_map(function($rawGeneral){
+            while(count($rawGeneral) < 14){
+                $rawGeneral[] = null;
+            }
+
+            list(
+                $affinity, $name, $picturePath, $nationName, $locatedCity, 
+                $leadership, $power, $intel, $level, $birth, $death, $ego,
+                $char, $text
+            ) = $rawGeneral;
+
+            if(key_exists($nationName, $this->nationsInv)){
+                $nationID = $this->nationsInv[$nationName]->id;;
+            }
+            else if(key_exists($nationName, $this->nations)){
+                $nationID = (int)$nationName;
+            }
+            else{
+                $nationID = 0;
+            }
+
+            $this->tmpGeneralQueue[$name] = $rawGeneral;
+
+            $npc = new Scenario\NPC(
+                $affinity, 
+                $name, 
+                $picturePath, 
+                $nationID, 
+                $locatedCity, 
+                $leadership, 
+                $power, 
+                $intel, 
+                $level, 
+                $birth, 
+                $death, 
+                $ego,
+                $char, 
+                $text
+            );
+            $npc->npc = 6;
+            return $npc;
+
+        }, Util::array_get($data['general_neutral'], []));
+
         $this->initialEvents = array_map(function($rawEvent){
             $cond = $rawEvent[0];
             $action = array_slice($rawEvent, 1);
@@ -182,15 +227,20 @@ class Scenario{
         $default = Json::decode(file_get_contents($defaultPath));
 
         $stat = [
-            'statTotal'=>$this->data['stat']['total']??$default['stat']['total'],
-            'statMin'=>$this->data['stat']['min']??$default['stat']['min'],
-            'statMax'=>$this->data['stat']['max']??$default['stat']['max'],
-            'statNPCMax'=>$this->data['stat']['npcMax']??$default['stat']['npcMax'],
-            'statChiefMin'=>$this->data['stat']['chiefMin']??$default['stat']['chiefMin'],
+            'defaultStatTotal'=>$this->data['stat']['total']??$default['stat']['total'],
+            'defaultStatMin'=>$this->data['stat']['min']??$default['stat']['min'],
+            'defaultStatMax'=>$this->data['stat']['max']??$default['stat']['max'],
+            'defaultStatNPCMax'=>$this->data['stat']['npcMax']??$default['stat']['npcMax'],
+            'chiefStatMin'=>$this->data['stat']['chiefMin']??$default['stat']['chiefMin'],
         ];
 
-        $this->gameConf = array_merge($stat);
+        $this->gameConf = array_merge($stat, $this->data['map']??[], $this->data['const']??[]);
+
         $this->iconPath = $this->data['iconPath']??$default['iconPath'];
+
+        $this->gameConf['mapName'] = $this->gameConf['mapName']??'che';
+        $this->gameConf['unitSet'] = $this->gameConf['unitSet']??'che';
+
         return $this->gameConf;
     }
 
@@ -242,10 +292,23 @@ class Scenario{
         return $this->generalsEx;
     }
 
+    public function getNPCneutral(){
+        $this->initFull();
+        return $this->generalsNeutral;
+    }
+
     public function getNation(){
         $this->initFull();
         return $this->nations;
     }
+    
+    public function getMapTheme(){
+        return $this->gameConf['mapName'];
+    }
+
+    public function getUnitSet(){
+        return $this->gameConf['unitSet'];
+    }
 
     public function getScenarioBrief(){
         $this->initFull();
@@ -253,6 +316,7 @@ class Scenario{
         $nations = [];
         $nationGeneralCnt = [];
         $nationGeneralExCnt = [];
+        $nationGeneralNeutralCnt = [];
 
         foreach($this->generals as $general){
             $nationID = $general->nationID;
@@ -274,15 +338,27 @@ class Scenario{
             }
         }
 
+        foreach($this->generalsNeutral as $general){
+            $nationID = $general->nationID;
+            if(!key_exists($nationID, $nationGeneralNeutralCnt)){
+                $nationGeneralNeutralCnt[$nationID] = 1;
+            }
+            else{
+                $nationGeneralNeutralCnt[$nationID] += 1;
+            }
+        }
+
         return [
             'year'=>$this->getYear(),
             'title'=>$this->getTitle(),
             'npc_cnt'=>count($this->getNPC()),
             'npcEx_cnt'=>count($this->getNPCex()),
+            'npcNeutral_cnt'=>count($this->getNPCneutral()),
             'nation'=>array_map(function($nation) use ($nationGeneralCnt, $nationGeneralExCnt){
                 $brief = $nation->getBrief();
                 $brief['generals'] = Util::array_get($nationGeneralCnt[$nation->getID()], 0);
                 $brief['generalsEx'] = Util::array_get($nationGeneralExCnt[$nation->getID()], 0);
+                $brief['generalsNeutral'] = Util::array_get($nationGeneralNeutralCnt[$nation->getID()], 0);
 
                 return $brief;
             },$this->getNation())
@@ -337,6 +413,23 @@ class Scenario{
                 $remainGenerals[$birth][] = array_merge(['RegNPC'], $rawGeneral);
             }
         }
+
+        foreach($this->generalsNeutral as $general){
+            if($general->build($env)){
+                if($general->nationID){
+                    $this->nations[$general->nationID]->addGeneral($general);
+                }
+                continue;
+            }
+
+            $rawGeneral = $this->tmpGeneralQueue[$general->name];
+            $birth = $general->birth; 
+            if(!key_exists($birth, $remainGenerals)){
+                $remainGenerals[$birth] = [];
+            }
+            $remainGenerals[$birth][] = array_merge(['RegNeutralNPC'], $rawGeneral);
+        }
+        
         return $remainGenerals;
     }
 
@@ -357,12 +450,25 @@ class Scenario{
 
     public function buildConf(){
         $path = __dir__.'/../d_setting';
-        Util::generateFileUsingSimpleTemplate(
-            $path.'/GameCustomConst.orig.php',
-            $path.'/GameCustomConst.php',
-            $this->gameConf,
-            true
-        );
+
+        $mapPath = __dir__.'/../scenario/map';
+        $unitPath = __dir__.'/../scenario/unit';
+
+        $mapName = $this->gameConf['mapName'];
+        $unitSet = $this->gameConf['unitSet'];
+
+
+        if(!file_exists("$mapPath/$mapName.php")){
+            throw new \RuntimeException('맵 파일이 올바르게 지정되지 않음! : '.$mapName);
+        }
+        if(!file_exists("$unitPath/$unitSet.php")){
+            throw new \RuntimeException('유닛 파일이 올바르게 지정되지 않음! : '.$unitSet);
+        }
+
+        Util::generatePHPClassFile($path.'/GameConst.php', $this->gameConf, 'GameConstBase', 'sammo');
+
+        copy("$mapPath/$mapName.php", $path.'/CityConst.php');
+        copy("$unitPath/$unitSet.php", $path.'/GameUnitConst.php');
     }
 
     public function build($env=[]){

hwe/sammo/Scenario/NPC.php

@@ -4,6 +4,7 @@ use \sammo\Util;
 use \sammo\JosaUtil;
 use \sammo\DB;
 use \sammo\CityHelper;
+use \sammo\GameUnitConst;
 
 class NPC{
 
@@ -21,6 +22,7 @@ class NPC{
     public $ego;
     public $charDomestic = 0; 
     public $charWar = 0; 
+    public $npc = 2;
     public $text;
 
     //[  1,     "헌제",1002,  1,    null, 17, 13, 61, 0, 170, 250, "안전",    null, "산 넘어 산이로구나..."],
@@ -210,8 +212,8 @@ class NPC{
 
         $db->insert('general',[
             'npcid'=>$npcID,
-            'npc'=>2,
-            'npc_org'=>2,
+            'npc'=>$this->npc,
+            'npc_org'=>$this->npc,
             'affinity'=>$affinity,
             'name'=>$name,
             'picture'=>$picturePath,
@@ -226,7 +228,7 @@ class NPC{
             'gold'=>1000,
             'rice'=>1000,
             'crew'=>0,
-            'crewtype'=>0,
+            'crewtype'=>GameUnitConst::DEFAULT_CREWTYPE,
             'train'=>0,
             'atmos'=>0,
             'weap'=>0,

hwe/sammo/WarUnit.php

@@ -0,0 +1,429 @@
+<?php
+namespace sammo;
+
+class WarUnit{
+    protected $raw;
+    protected $rawNation;
+
+    protected $logger;
+    protected $crewType;
+
+    protected $killedCurr = 0;
+    protected $killed = 0;
+    protected $deadCurr = 0;
+    protected $dead = 0;
+
+    protected $isAttacker = false;
+
+    protected $updatedVar = [];
+
+    protected $currPhase = 0;
+    protected $prePhase = 0;
+
+    protected $atmosBonus = 0;
+    protected $trainBonus = 0;
+
+    protected $oppose;
+    protected $warPower;
+    protected $warPowerMultiply = 1.0;
+
+    protected $activatedSkill = [];
+    protected $logActivatedSkill = [];
+    protected $isFinished = false;
+
+    private function __construct(){
+    }
+    
+    protected function clearActivatedSkill(){
+        foreach($this->activatedSkill as $skillName=>$state){
+            if(!$state){
+                continue;
+            }
+
+            if(!key_exists($skillName, $this->logActivatedSkill)){
+                $this->logActivatedSkill[$skillName] = 1;
+            }
+            else{
+                $this->logActivatedSkill[$skillName] += 1;
+            }
+        }
+        $this->activatedSkill = [];
+    }
+
+    function getActivatedSkillLog():array{
+        return $this->logActivatedSkill;
+    }
+
+    function getRaw():array{
+        return $this->raw;
+    }
+
+    function getRawNation():array{
+        return $this->rawNation;
+    }
+
+    function getVar(string $key){
+        return $this->raw[$key];
+    }
+
+    function updateVar(string $key, $value){
+        if($this->raw[$key] === $value){
+            return;
+        }
+        $this->raw[$key] = $value;
+        $this->updatedVar[$key] = true;
+    }
+
+    function updateVarWithLimit(string $key, $value, $min = null, $max = null){
+        if($min !== null && $value < $min){
+            $value = $min;
+        }
+        if($max !== null && $value > $max){
+            $value = $max;
+        }
+        $this->updateVar($key, $value);
+    }
+
+    function increaseVar(string $key, $value)
+    {
+        if($value === 0){
+            return;
+        }
+        $this->raw[$key] += $value;
+        $this->updatedVar[$key] = true;
+    }
+
+    function increaseVarWithLimit(string $key, $value, $min = null, $max = null){
+        $targetValue = $this->raw[$key] + $value;
+        if($min !== null && $targetValue < $min){
+            $targetValue = $min;
+        }
+        if($max !== null && $targetValue > $max){
+            $targetValue = $max;
+        }
+        $this->updateVar($key, $targetValue);
+    }
+
+    function multiplyVar(string $key, $value)
+    {
+        if($value === 1){
+            return;
+        }
+        $this->raw[$key] *= $value;
+        $this->updatedVar[$key] = true;
+    }
+
+    function multiplyVarWithLimit(string $key, $value, $min = null, $max = null){
+        $targetValue = $this->raw[$key] * $value;
+        if($min !== null && $targetValue < $min){
+            $targetValue = $min;
+        }
+        if($max !== null && $targetValue > $max){
+            $targetValue = $max;
+        }
+        $this->updateVar($key, $targetValue);
+    }
+
+    function getNationVar(string $key){
+        return $this->rawNation[$key];
+    }
+
+    function getPhase():int{
+        return $this->currPhase;
+    }
+
+    function getRealPhase():int{
+        return $this->prePhase + $this->currPhase;
+    }
+
+    function getName():string{
+        return 'EMPTY';
+    }
+
+    function isAttacker():bool{
+        return $this->isAttacker;
+    }
+
+    function getCrewType():GameUnitDetail{
+        return $this->crewType;
+    }
+
+    function getCrewTypeName():string{
+        return $this->getCrewType()->name;
+    }
+
+    function getCrewTypeShortName():string{
+        return $this->getCrewType()->getShortName();
+    }
+
+    function getLogger():ActionLogger{
+        return $this->logger;
+    }
+
+    function getKilled():int{
+        return $this->killed;
+    }
+
+    function getDead():int{
+        return $this->dead;
+    }
+
+    function getKilledCurrentBattle():int{
+        return $this->killedCurr;
+    }
+
+    function getDeadCurrentBattle():int{
+        return $this->deadCurr;
+    }
+
+    function getSpecialDomestic():int{
+        return 0;
+    }
+
+    function getSpecialWar():int{
+        return 0;
+    }
+
+    function getItem():int{
+        return 0;
+    }
+
+    function getMaxPhase():int{
+        return $this->getCrewType()->speed;
+    }
+
+    function setPrePhase(int $phase){
+        $this->prePhase = $phase;
+    }
+
+    function addPhase(){
+        $this->currPhase += 1;
+    }
+
+    function setOppose(?WarUnit $oppose){
+        $this->oppose = $oppose;
+        $this->killedCurr = 0;
+        $this->deadCurr = 0;
+        $this->clearActivatedSkill();
+    }
+
+    function getOppose():?WarUnit{
+        return $this->oppose;
+    }
+
+    function getWarPower(){
+        return $this->warPower * $this->warPowerMultiply;
+    }
+
+    function getRawWarPower(){
+        return $this->warPower;
+    }
+
+    function getWarPowerMultiply(){
+        return $this->warPowerMultiply;
+    }
+    
+    function setWarPowerMultiply($multiply = 1.0){
+        $this->warPowerMultiply = $multiply;
+    }
+
+    function multiplyWarPowerMultiply($multiply){
+        $this->warPowerMultiply *= $multiply;
+    }
+
+    function computeWarPower(){
+        $oppose = $this->oppose;
+
+        $myAtt = $this->getCrewType()->getComputedAttack($this->getRaw(), $this->getNationVar('tech'));
+        $opDef = $oppose->getCrewType()->getComputedDefence($oppose->getRaw(), $oppose->getNationVar('tech'));
+        // 감소할 병사 수
+        $warPower = GameConst::$armperphase + $myAtt - $opDef;
+        $opposeWarPowerMultiply = 1.0;
+
+        if($warPower < 100){
+            //최소 전투력 50 보장
+            $warPower = max(0, $warPower);
+            $warPower = ($warPower + 100) / 2;
+            $warPower = rand($warPower, 100);
+        }
+
+        $warPower *= CharAtmos(
+            $this->getComputedAtmos(), 
+            $this->getCharacter()
+        );
+        
+        $warPower /= CharTrain(
+            $oppose->getComputedTrain(), 
+            $oppose->getCharacter()
+        );
+
+        if($this instanceof WarUnitGeneral){
+            $genDexAtt = getGenDex($this->getRaw(), $this->getCrewType()->id);
+        }
+        else{
+            $genDexAtt = ($this->cityRate - 60) * 7200;
+        }
+        
+        if($this instanceof WarUnitGeneral){
+            $oppDexDef = getGenDex($oppose->getRaw(), $this->getCrewType()->id);
+        }
+        else{
+            $oppDexDef = ($this->cityRate - 60) * 7200;
+        }
+        
+        $warPower *= getDexLog($genDexAtt, $oppDexDef);
+        
+        $warPower *= $this->getCrewType()->getAttackCoef($oppose->getCrewType());
+        $opposeWarPowerMultiply *= $this->getCrewType()->getDefenceCoef($oppose->getCrewType());
+
+        $this->warPower = $warPower;
+        $this->oppose->setWarPowerMultiply($opposeWarPowerMultiply);
+
+        return [$warPower, $opposeWarPowerMultiply];
+    }
+
+    function addTrain(int $train){
+        return;
+    }
+
+    function addAtmos(int $atmos){
+        return;
+    }
+
+    function addTrainBonus(int $trainBonus){
+        $this->trainBonus += $trainBonus;
+    }
+
+    function addAtmosBonus(int $atmosBonus){
+        $this->atmosBonus += $atmosBonus;
+    }
+
+    function getComputedTrain(){
+        return GameConst::$maxTrainByCommand;
+    }
+
+    function getComputedAtmos(){
+        return GameConst::$maxAtmosByCommand;
+    }
+
+    function getComputedCriticalRatio():float{
+        return $this->getCrewType()->getCriticalRatio($this->getRaw());
+    }
+
+    function getComputedAvoidRatio():float{
+        return $this->getCrewType()->avoid / 100;
+    }
+
+    function addWin(){
+    }
+
+    function addLose(){
+    }
+
+    function finishBattle(){
+        throw new NotInheritedMethodException();
+    }
+
+    function getCharacter():int{
+        return 0;
+    }
+
+    function useBattleInitItem():bool{
+        return false;
+    }
+
+    function beginPhase():void{
+        $this->clearActivatedSkill();
+        $this->computeWarPower();
+    }
+
+    function checkBattleBeginSkill():bool{
+        return false;
+    }
+
+    function checkBattleBeginItem():bool{
+        return false;
+    }
+
+    function applyBattleBeginSkillAndItem():bool{
+        return false;
+    }
+
+    function hasActivatedSkill(string $skillName):bool{
+        return $this->activatedSkill[$skillName] ?? false;
+    }
+
+    function activateSkill(... $skillNames){
+        foreach($skillNames as $skillName){
+            $this->activatedSkill[$skillName] = true;
+        }
+    }
+
+    function deactivateSkill(... $skillNames){
+        foreach($skillNames as $skillName){
+            $this->activatedSkill[$skillName] = false;
+        }
+    }
+
+    function checkPreActiveSkill():bool{
+        return false;
+    }
+
+    function checkActiveSkill():bool{
+        return false;
+    }
+
+    function checkPostActiveSkill():bool{
+        return false;
+    }
+
+    function applyActiveSkill(){
+        yield true;
+    }
+
+    function getHP():int{
+        throw new NotInheritedMethodException();
+    }
+
+    function decreaseHP(int $damage):int{
+        $this->dead += $damage;
+        throw new NotInheritedMethodException();
+    }
+
+    function increaseKilled(int $damage):int{
+        $this->killed += $damage;
+        throw new NotInheritedMethodException();
+    }
+
+    function calcDamage():int{
+        $warPower = $this->getWarPower();
+        $warPower *= Util::randRange(0.9, 1.1);
+        return Util::round($warPower);
+    }
+
+    function tryWound():bool{
+        return false;
+    }
+
+    function continueWar(&$noRice):bool{
+        //전투가 가능하면 true
+        $noRice = false;
+        return false;
+    }
+
+    function logBattleResult(){
+        $this->getLogger()->pushBattleResultTemplate($this, $this->getOppose());
+    }
+
+    function applyDB($db):bool{
+        throw new NotInheritedMethodException();
+    }
+
+
+    function criticalDamage():float{
+        //전특, 병종에 따라 필살 데미지가 달라질지도 모르므로 static 함수는 아닌 것으로
+        return Util::randRange(1.3, 2.0);
+    }
+
+
+}

hwe/sammo/WarUnitCity.php

@@ -0,0 +1,154 @@
+<?php
+namespace sammo;
+
+class WarUnitCity extends WarUnit{
+    protected $hp;
+
+    protected $cityRate;
+
+    function __construct($raw, $rawNation, $year, $month, $cityRate){
+        $this->raw = $raw;
+        $this->rawNation = $rawNation;
+
+        $this->isAttacker = false;
+        $this->cityRate = $cityRate;
+
+        $this->logger = new ActionLogger(
+            0, 
+            $this->getVar('nation'), 
+            $year, 
+            $month, 
+            false
+        );
+        $this->crewType = GameUnitConst::byID(GameUnitConst::T_CASTLE);
+
+        $this->hp = $this->getVar('def') * 10; 
+
+        //수비자 보정
+        if($this->getCityVar('level') == 1){
+            $this->trainBonus += 5;
+        }
+        else if($this->getCityVar('level') == 3){
+            $this->trainBonus += 5;
+        }
+    }
+
+    function getName():string{
+        return $this->getVar('name');
+    }
+
+    function getCityVar(string $key){
+        return $this->raw[$key];
+    }
+
+    function increaseKilled(int $damage):int{
+        $this->killed += $damage;
+        $this->killedCurr += $damage;
+        return $this->killed;
+    }
+
+    function getComputedTrain(){
+        return $this->cityRate + $this->trainBonus;
+    }
+
+    function getComputedAtmos(){
+        return $this->cityRate + $this->atmosBonus;
+    }
+
+    function getHP():int{
+        return $this->hp;
+    }
+
+    function decreaseHP(int $damage):int{
+        $damage = min($damage, $this->hp);
+        $this->dead += $damage;
+        $this->deadCurr += $damage;
+        $this->hp -= $damage;
+        $this->increaseVarWithLimit('wall', -$damage/20, 0);
+        
+        return $this->hp;
+    }
+
+    function continueWar(&$noRice):bool{
+        //전투가 가능하면 true
+        $noRice = false;
+        if($this->getHP() <= 0){
+            return false;
+        }
+
+        //도시 성벽은 쌀이 소모된다고 항복하지 않음
+        return true;
+    }
+
+    function heavyDecreseWealth(){
+        $this->multiplyVar('agri', 0.5);
+        $this->multiplyVar('comm', 0.5);
+        $this->multiplyVar('secu', 0.5);
+    }
+
+    function finishBattle(){
+        if($this->isFinished){
+            return;
+        }
+        $this->clearActivatedSkill();
+        $this->isFinished = true;
+
+        $this->updateVar('def', Util::round($this->getHP() / 10));
+        $this->updateVar('wall', Util::round($this->getVar('wall')));
+
+        //NOTE: 전투로 인한 사망자는 여기서 처리하지 않음
+
+        $decWealth = $this->getKilled() / 10;
+        $this->increaseVarWithLimit('agri', -$decWealth, 0);
+        $this->increaseVarWithLimit('comm', -$decWealth, 0);
+        $this->increaseVarWithLimit('secu', -$decWealth, 0);
+    }
+
+    function addConflict():bool{
+        $conflict = Json::decode($this->getVar('conflict'));
+        $oppose = $this->getOppose();
+
+        $nationID = $oppose->getNationVar('nation');
+        $newConflict = false;
+        
+        $dead = max(1, $this->dead);
+
+        if(!$conflict || $this->getHP() == 0){ // 선타, 막타 보너스
+            $dead *= 1.05;
+        }
+
+        if(!$conflict){
+            $conflict = [$nationID => $dead];
+        }
+        else if(key_exists($nationID, $conflict)){
+            $conflict[$nationID] += $dead;
+            arsort($conflict);
+        }
+        else{
+            $conflict[$nationID] = $dead;
+            arsort($conflict);
+            $newConflict = true;
+        }
+
+        $this->updateVar('conflict', Json::encode($conflict));
+
+        return $newConflict;
+    }
+    
+
+    function applyDB($db):bool{
+        $updateVals = [];
+        foreach(array_keys($this->updatedVar) as $key){
+            $updateVals[$key] = $this->raw[$key];
+        }
+
+        if(!$updateVals){
+            return false;
+        }
+        
+        $db->update('city', $updateVals, 'city=%i', $this->raw['city']);
+        $this->getLogger()->rollback(); //수비 도시의 로그는 기록하지 않음
+        return $db->affectedRows() > 0;
+    }
+
+}

hwe/sammo/WarUnitGeneral.php

@@ -0,0 +1,988 @@
+<?php
+namespace sammo;
+
+class WarUnitGeneral extends WarUnit{
+    protected $rawCity;
+
+    protected $bonusPhase = 0;
+
+    function __construct($raw, $rawCity, $rawNation, $isAttacker, $year, $month){
+        setLeadershipBonus($raw, $rawNation['level']);
+
+        $this->raw = $raw;
+        $this->rawCity = $rawCity; //read-only
+        $this->rawNation = $rawNation; //read-only
+        $this->isAttacker = $isAttacker;
+
+        $this->logger = new ActionLogger(
+            $this->getVar('no'), 
+            $this->getVar('nation'), 
+            $year, 
+            $month,
+            false
+        );
+        $this->crewType = GameUnitConst::byID($this->getVar('crewtype'));
+
+        $cityLevel = $this->getCityVar('level');
+
+        if($isAttacker){
+            //공격자 보정
+            if($cityLevel == 2){
+                $this->atmosBonus += 5;
+            }
+            if($rawNation['capital'] == $this->getCityVar('city')){
+                $this->atmosBonus += 5;
+            }
+        }
+        else{
+            //수비자 보정
+            if($cityLevel == 1){
+                $this->trainBonus += 5;
+            }
+            else if($cityLevel == 3){
+                $this->trainBonus += 5;
+            }
+        }
+    }
+
+    function getName():string{
+        return $this->getVar('name');
+    }
+
+    function getCityVar(string $key){
+        return $this->rawCity[$key];
+    }
+    
+    function getSpecialDomestic():int{
+        return $this->getVar('special');
+    }
+
+    function setOppose(?WarUnit $oppose){
+        parent::setOppose($oppose);
+        $this->increaseVar('warnum', 1);
+
+        if($this->isAttacker){
+            $this->updateVar('recwar', $this->getVar('turntime'));
+        }
+        else if($oppose !== null){
+            $this->updateVar('recwar', $oppose->getVar('turntime'));
+        }
+    }
+
+    function getSpecialWar():int{
+        return $this->getVar('special2');
+    }
+
+    function getCharacter():int{
+        return $this->getVar('personal');
+    }
+
+    function getItem():int{
+        return $this->getVar('item');
+    }
+
+    function getMaxPhase():int{
+        $phase = $this->getCrewType()->speed;
+        if($this->getSpecialWar() == 60){
+            $phase += 1;
+        }
+        return $phase + $this->bonusPhase;
+    }
+
+    function addTrain(int $train){
+        $this->increaseVarWithLimit('train', $train, 0, GameConst::$maxTrainByWar);
+    }
+
+    function addAtmos(int $atmos){
+        $this->increaseVarWithLimit('atmos', $atmos, 0, GameConst::$maxAtmosByWar);
+    }
+
+    function getComputedTrain(){
+        $train = $this->getVar('train');
+        $train += $this->trainBonus;
+        
+        return $train;
+    }
+
+    function getComputedAtmos(){
+        $atmos = $this->getVar('atmos');
+        $atmos += $this->atmosBonus;
+        
+        return $atmos;
+    }
+
+    function getComputedCriticalRatio():float{
+        $critialRatio = $this->getCrewType()->getCriticalRatio($this->getRaw());
+
+        $specialWar = $this->getSpecialWar();
+        $item = $this->getItem();
+
+        if($specialWar == 61){
+            if($this->isAttacker){
+                $critialRatio += 0.1;
+            }
+        }
+        else if($specialWar == 71){
+            $critialRatio += 0.2;
+        }
+        return $critialRatio;
+    }
+
+    function getComputedAvoidRatio():float{
+        $specialWar = $this->getSpecialWar();
+        $item = $this->getItem();
+
+        $avoidRatio = $this->getCrewType()->avoid / 100;
+        $avoidRatio *= $this->getComputedTrain() / 100;
+
+        //특기보정 : 궁병
+        if($specialWar == 51){
+            $avoidRatio += 0.2;
+        }
+
+        //도구 보정 : 둔갑천서, 태평요술
+        if($item == 26 || $item == 25){
+            $avoidRatio += 0.2;
+        }
+
+        if($this->getOppose()->getCrewType()->armType == GameUnitConst::T_FOOTMAN){
+            $avoidRatio *= 0.75;
+        }
+
+        return $avoidRatio;
+    }
+
+    function addWin(){
+        $this->increaseVar('killnum', 1);
+        $this->multiplyVarWithLimit('atmos', 1.1, null, GameConst::$maxAtmosByWar);
+
+        $this->addStatExp(1);
+    }
+
+    function addStatExp(int $value = 1){
+        if($this->crewType->armType == GameUnitConst::T_WIZARD) {   // 귀병
+            $this->increaseVar('intel2', $value);
+        } elseif($this->crewType->armType == GameUnitConst::T_SIEGE) {   // 차병
+            $this->increaseVar('leader2', $value);
+        } else {
+            $this->increaseVar('power2', $value);
+        }
+    }
+
+    function addLevelExp(float $value){
+        if(!$this->isAttacker){
+            $value *= 0.8;
+        }
+        $value *= getCharExpMultiplier($this->getCharacter());
+        $this->increaseVar('experience', $value);
+    }
+
+    function addDedication(float $value){
+        $value *= getCharDedMultiplier($this->getCharacter());
+        $this->increaseVar('dedication', $value);
+    }
+
+    function addLose(){
+        $this->increaseVar('deathnum', 1);
+        $this->addStatExp(1);
+    }
+
+    
+
+    protected function getWarPowerMultiplyBySpecialWar():array{
+        //TODO: 장기적으로 if문이 아니라 객체를 이용하여 처리해야함
+        $myWarPowerMultiply = 1.0;
+        $opposeWarPowerMultiply = 1.0;
+
+        $specialWar = $this->getSpecialWar();
+
+        if($specialWar == 53){
+            if($this->getOppose() instanceof WarUnitCity){
+                $myWarPowerMultiply *= 2;
+            }
+        }
+        else if($specialWar == 52){
+            if($this->isAttacker){
+                $myWarPowerMultiply *= 1.20;
+            }
+            else{
+                $myWarPowerMultiply *= 1.10;
+            }
+            
+        }
+        else if($specialWar == 60){
+            if($this->isAttacker){
+                $myWarPowerMultiply *= 1.10;
+            }
+            
+        }
+        else if($specialWar == 61){
+            $myWarPowerMultiply *= 1.10;
+        }
+        else if($specialWar == 50){
+            if($this->isAttacker){
+                $opposeWarPowerMultiply *= 0.9;
+            }
+            else{
+                $opposeWarPowerMultiply *= 0.8;
+            }
+        }
+        else if($specialWar == 75){
+            $opposeCrewType = $this->oppose->getCrewType();
+            if($opposeCrewType->reqCities || $opposeCrewType->reqRegions){
+                $myWarPowerMultiply *= 1.1;
+                $opposeWarPowerMultiply *= 0.9;
+            }
+        }
+
+
+        return [$myWarPowerMultiply, $opposeWarPowerMultiply];
+    }
+
+    function computeWarPower(){
+        [$warPower,$opposeWarPowerMultiply] = parent::computeWarPower();
+
+        $generalNo = $this->getVar('no');
+        $genLevel = $this->getVar('level');
+
+        if($this->isAttacker){
+            if($genLevel == 12){
+                $warPower *= 1.10;
+            }
+            else if($genLevel == 11 | $genLevel == 10 || $genLevel == 8 || $genLevel == 6){
+                $warPower *= 1.05;
+            }
+        }
+        else{
+            if($genLevel == 12){
+                $opposeWarPowerMultiply *= 0.90;
+            }
+            else if($genLevel == 11 || $genLevel == 9 || $genLevel == 7 || $genLevel == 5){
+                $opposeWarPowerMultiply *= 0.95;
+            }
+            else if($genLevel == 4 && $generalNo == $this->getCityVar('gen1')){
+                $opposeWarPowerMultiply *= 0.95;
+            }
+            else if($genLevel == 3 && $generalNo == $this->getCityVar('gen2')){
+                $opposeWarPowerMultiply *= 0.95;
+            }
+            else if($genLevel == 2 && $generalNo == $this->getCityVar('gen3')){
+                $opposeWarPowerMultiply *= 0.95;
+            }
+        }
+
+        $expLevel = $this->getVar('explevel');
+
+        if($this->getOppose() instanceof WarUnitCity){
+            $warPower *= 1 + $expLevel / 600;
+        }
+        else{
+            $warPower /= max(0.01, 1 - $expLevel / 300);
+            $opposeWarPowerMultiply *= max(0.01, 1 - $expLevel / 300);
+        }
+        
+
+        [$specialMyWarPowerMultiply, $specialOpposeWarPowerMultiply] = $this->getWarPowerMultiplyBySpecialWar();
+        $warPower *= $specialMyWarPowerMultiply;
+        $opposeWarPowerMultiply *= $specialOpposeWarPowerMultiply;
+
+        $this->warPower = $warPower;
+        $this->oppose->setWarPowerMultiply($opposeWarPowerMultiply);
+        return [$warPower,$opposeWarPowerMultiply];
+    }
+
+    ///전투 개시 시에 작동하여 1회에만 작동하는 아이템
+    function useBattleInitItem():bool{
+        $item = $this->getItem();
+
+        if($item == 0){
+            return false;
+        }
+
+        $itemActivated = false;
+        $itemConsumed = false;
+        $itemName = getItemName($item);
+
+        if($item == 3){
+            //탁주 사용
+            $this->addAtmos(3);
+            $itemActivated = true;
+            $itemConsumed = true;
+        }
+        else if($item >= 14 && $item <= 16){
+            //의적주, 두강주, 보령압주 사용
+            $this->addAtmosBonus(5);
+            $itemActivated = true;
+        }
+        else if($item >= 19 && $item <= 20){
+            //춘화첩, 초선화 사용
+            $this->addAtmosBonus(7);
+            $itemActivated = true;
+        }
+        else if($item == 4){
+            //청주 사용
+            $this->addTrain(3);
+            $itemActivated = true;
+            $itemConsumed = true;
+        }
+        else if($item >= 12 && $item <= 13){
+            //과실주, 이강주 사용
+            $this->addTrainBonus(5);
+            $itemActivated = true;
+        }
+        else if($item >= 18 && $item <= 18){
+            //철벽서, 단결도 사용
+            $this->addTrainBonus(7);
+            $itemActivated = true;
+        }
+
+        if($itemConsumed){
+            $this->updateVar('item', 0);
+            $josaUl = JosaUtil::pick($itemName, '을');
+            $this->getLogger()->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 사용!", ActionLogger::PLAIN);
+        }
+
+        return $itemActivated;
+    }
+
+    ///전투 개시 시에 작동하여 매 장수마다 작동하는 스킬
+    function checkBattleBeginSkill():bool{
+        $skillResult = false;
+        $oppose = $this->getOppose();
+
+        $specialWar = $this->getSpecialWar();
+        if (
+            $specialWar == 70 &&
+            $this->oppose instanceof WarUnitGeneral &&
+            !$this->hasActivatedSkill('저격') &&
+            Util::randBool(1/3)
+        ) {
+            $this->activateSkill('저격');
+            $skillResult = true;
+        }
+        
+        return $skillResult;
+    }
+
+    ///전투 개시 시에 작동하여 매 장수마다 작동하는 아이템
+    function checkBattleBeginItem():bool{
+        $item = $this->getItem();
+        $oppose = $this->getOppose();
+        if(!$item){
+            return false;
+        }
+
+        $itemActivated = false;
+        $itemConsumed = false;
+        $itemName = getItemName($item);
+
+        if(
+            $item == 2 &&
+            $this->oppose instanceof WarUnitGeneral &&
+            !$this->hasActivatedSkill('저격') &&
+            Util::randBool(1/5)
+        ){
+            //수극
+            $itemActivated = true;
+            $itemConsumed = true;
+            $this->activateSkill('저격', '수극');
+        }
+
+        if($itemConsumed){
+            //NOTE: 소비 아이템은 하나인가?, 1회용인가?
+            $this->updateVar('item', 0);
+            $josaUl = JosaUtil::pick($itemName, '을');
+            $this->getLogger()->pushGeneralActionLog("<C>{$itemName}</>{$josaUl} 사용!", ActionLogger::PLAIN);
+        }
+        
+        return $itemActivated;
+    }
+
+    function applyBattleBeginSkillAndItem():bool{
+        $result = false;
+        $oppose = $this->getOppose();
+
+        if($oppose->hasActivatedSkill('저격')){
+            $result = true;
+
+            $oppose->getLogger()->pushGeneralActionLog("상대를 <C>저격</>했다!", ActionLogger::PLAIN);
+            $oppose->getLogger()->pushGeneralBattleDetailLog("상대를 <C>저격</>했다!", ActionLogger::PLAIN);
+            $this->getLogger()->pushGeneralActionLog("상대에게 <R>저격</>당했다!", ActionLogger::PLAIN);
+            $this->getLogger()->pushGeneralBattleDetailLog("상대에게 <R>저격</>당했다!", ActionLogger::PLAIN);
+
+            if($oppose->hasActivatedSkill('수극')){
+                $this->increaseVarWithLimit('injury', Util::randRangeInt(20, 40), null, 80);
+            }
+            else{
+                $this->increaseVarWithLimit('injury', Util::randRangeInt(20, 60), null, 80);
+            }
+            
+        }
+
+        return $result;
+    }
+
+    function getHP():int{
+        return $this->getVar('crew');
+    }
+
+    function addDex(GameUnitDetail $crewType, float $exp){
+        $armType = $crewType->armType;
+
+        if($armType == GameUnitConst::T_CASTLE){
+            $armType = GameUnitConst::T_SIEGE;
+        }
+
+        if($armType < 0){
+            return;
+        }
+
+        if($armType == GameUnitConst::T_WIZARD) {
+            $exp *= 0.9;
+        }
+        else if($armType == GameUnitConst::T_SIEGE) {
+            $exp *= 0.9;
+        }
+        $exp *= ($this->getComputedTrain() + $this->getComputedAtmos()) / 200;
+
+        $ntype = $armType*10;
+        $dexType = "dex{$ntype}";
+
+        $this->increaseVar($dexType, $exp);
+    }
+
+    function decreaseHP(int $damage):int{
+        $damage = min($damage, $this->getVar('crew'));
+
+        $this->dead += $damage;
+        $this->deadCurr += $damage;
+        $this->increaseVar('crew', -$damage);
+
+        $addDex = $damage;
+        if(!$this->isAttacker){
+            $addDex *= 0.9;
+        }
+        $this->addDex($this->oppose->getCrewType(), $addDex);
+
+        return $this->getVar('crew');
+    }
+
+    function increaseKilled(int $damage):int{
+        $this->addLevelExp($damage / 50);
+
+        $rice = $damage / 100;
+        if(!$this->isAttacker){
+            $rice *= 0.8;
+        }
+
+        $rice *= $this->crewType->rice;
+        $rice *= getTechCost($this->getNationVar('tech'));
+
+        $this->increaseVarWithLimit('rice', -$rice, 0);
+        
+        $addDex = $damage;
+        if(!$this->isAttacker){
+            $addDex *= 0.9;
+        }
+        $this->addDex($this->getCrewType(), $addDex);
+
+        $this->killed += $damage;
+        $this->killedCurr += $damage;
+        return $this->killed;
+    }
+
+    function checkPreActiveSkill():bool{
+        $activated = false;
+
+        $oppose = $this->getOppose();
+        $specialWar = $this->getSpecialWar();
+        $item = $this->getItem();
+        $crewType = $this->getCrewType();
+
+        if(
+            $specialWar == 63 &&
+            $this->getPhase() == 0 &&
+            $this->getHP() >= 1000 &&
+            $this->getComputedAtmos() >= 90 &&
+            $this->getComputedTrain() >= 90
+        ){
+            $this->activateSkill('위압');
+            $activated = true;
+        }
+
+        if($specialWar == 62){
+            $oppose->activateSkill('필살불가');
+            $oppose->activateSkill('계략약화');
+            $activated = true;
+        }
+
+        if($specialWar == 60){
+            $oppose->activateSkill('회피불가');
+            $oppose->activateSkill('저지불가');
+        }
+
+        return $activated;
+    }
+
+    function checkActiveSkill():bool{
+        $activated = false;
+
+        $oppose = $this->getOppose();
+        $specialWar = $this->getSpecialWar();
+        $item = $this->getItem();
+        $crewType = $this->getCrewType();
+
+        if(
+            !$this->hasActivatedSkill('특수') &&
+            !$this->hasActivatedSkill('저지불가') &&
+            !$this->isAttacker &&
+            $crewType->name == '목우'
+        ){
+            //XXX: 병종에 특수 스킬이 달려있도록 설정해야함
+            $ratio = $this->getComputedAtmos() + $this->getComputedTrain();
+            if(Util::randBool($ratio / 400)){
+                $this->activateSkill('특수', '저지');
+                $activated = true;
+            }
+        }
+
+        if(
+            !$this->hasActivatedSkill('특수') &&
+            !$this->hasActivatedSkill('필살불가') &&
+            Util::randBool($this->getComputedCriticalRatio())
+        ){
+            $this->activateSkill('특수', '필살시도', '필살');
+            $activated = true;
+        }
+
+        if(
+            !$this->hasActivatedSkill('특수') &&
+            !$this->hasActivatedSkill('회피불가') &&
+            Util::randBool($this->getComputedAvoidRatio())
+        ){
+            $this->activateSkill('특수', '회피시도', '회피');
+            $activated = true;
+        }
+
+        //계략
+        if($crewType->magicCoef){
+            $magicRatio = getGeneralIntel($this->raw, true, true, true, false) / 100;
+            $magicRatio *= $crewType->magicCoef;
+
+            if($specialWar == 41){
+                $magicRatio += 0.2;
+            }
+
+            if(Util::randBool($magicRatio)){
+                $magicSuccessRatio = 0.7;
+                if($specialWar == 40){
+                    $magicSuccessRatio += 0.2;
+                }
+                if($specialWar == 41){
+                    $magicSuccessRatio += 0.2;
+                }
+                if($specialWar == 42){
+                    $magicSuccessRatio += 0.1;
+                }
+                if($specialWar == 44){
+                    $magicSuccessRatio += 1;
+                }
+                if($this->hasActivatedSkill('계략약화')){
+                    $magicSuccessRatio -= 0.1;
+                }
+
+                if($oppose instanceof WarUnitCity){
+                    $magic = Util::choiceRandom(['급습', '위보',' 혼란']);
+                }
+                else{
+                    $magic = Util::choiceRandom(['위보', '매복', '반목', '화계', '혼란']);
+                }
+                $this->activateSkill('계략시도', $magic);
+                
+                if(Util::randBool($magicSuccessRatio)){
+                    $this->activateSkill('계략');
+                }
+                else{
+                    $this->activateSkill('계략실패');
+                }
+            }
+        }
+
+        //의술
+        if($specialWar == 73 && Util::randBool(0.2)){
+            $this->activateSkill('치료');
+            $activated = true;
+        }
+
+        return $activated;
+    }
+
+    function checkPostActiveSkill():bool{
+        $activated = false;
+
+        $oppose = $this->getOppose();
+        $specialWar = $this->getSpecialWar();
+        $item = $this->getItem();
+        $crewType = $this->getCrewType();
+
+        if($specialWar == 74 && $oppose->hasActivatedSkill('필살')){
+            if($this->isAttacker){
+                if(Util::randBool(1/3)){
+                    $this->activateSkill('진노', '격노');
+                    $activated = true;
+                }
+                else if(Util::randBool(1/4)){
+                    $this->activateSkill('격노');
+                    $activated = true;
+                }
+            }
+            else{
+                if(Util::randBool(1/2)){
+                    $this->activateSkill('격노');
+                    $activated = true;
+                }
+            }
+        }
+
+        if(
+            $specialWar == 74 &&
+            $oppose->hasActivatedSkill('회피')
+        ){
+            if($this->isAttacker){
+                if(Util::randBool(1/3)){
+                    $this->activateSkill('진노', '격노');
+                    $oppose->deactivateSkill('회피');
+                    $activated = true;
+                }
+                else if(Util::randBool(1/4)){
+                    $this->activateSkill('격노');
+                    $oppose->deactivateSkill('회피');
+                    $activated = true;
+                }
+            }
+            else{
+                if(Util::randBool(1/2)){
+                    $this->activateSkill('격노');
+                    $oppose->deactivateSkill('회피');
+                    $activated = true;
+                }
+            }
+        }
+
+        if(
+            ($item == 23 || $item == 24) &&
+            !$this->hasActivatedSkill('치료') &&
+            Util::randBool(0.2)
+        ){
+            $this->activateSkill('치료');
+            $activated = true;
+        }
+
+        //계략
+        if(
+            $specialWar == 45 &&
+            $oppose->hasActivatedSkill('계략') &&
+            Util::randBool(0.3)
+        ){
+            $this->activateSkill('반계');
+            $oppose->deactivateSkill('계략');
+            $activated = true;
+        }
+
+        if(
+            $specialWar == 42 && 
+            $this->hasActivatedSkill('계략')
+        ){
+            $this->warPowerMultiply *= 1.3;
+        }
+
+        if(
+            $specialWar == 43 && 
+            $this->hasActivatedSkill('계략')
+        ){
+            $this->warPowerMultiply *= 1.5;
+        }
+
+        return $activated;
+    }
+
+    function applyActiveSkill(){
+        $oppose = $this->getOppose();
+        $crewType = $this->getCrewType();
+
+        $specialWar = $this->getSpecialWar();
+
+        $thisLogger = $this->getLogger();
+        $opposeLogger = $oppose->getLogger();
+
+        if($this->hasActivatedSkill('저지')){
+            
+            $this->addDex($oppose->getCrewType(), $oppose->getWarPower() * 0.5 * 0.9);
+            $this->addDex($this->getCrewType(), $this->getWarPower() * 0.5 * 0.9);
+
+            $this->setWarPowerMultiply(0);
+            $oppose->setWarPowerMultiply(0);
+
+            $thisLogger->pushGeneralBattleDetailLog('상대를 <C>저지</>했다!</>');
+            $opposeLogger->pushGeneralBattleDetailLog('저지</>당했다!</>');
+            //저지는 특수함.
+
+            
+            return;
+        }
+
+        yield true;
+
+        //계략 세트
+        if($this->hasActivatedSkill('계략')){
+            $tableToGeneral = [
+                '위보'=>1.2,
+                '매복'=>1.4,
+                '반목'=>1.6,
+                '화계'=>1.8,
+                '혼란'=>2.0
+            ];
+            $tableToCity = [
+                '급습'=>1.2,
+                '위보'=>1.4,
+                '혼란'=>1.6
+            ];
+            if($specialWar == 45){
+                $tableToGeneral['반목'] *= 2;
+            }
+
+            if($oppose instanceof WarUnitCity){
+                $table = $tableToCity;
+            }
+            else{
+                $table = $tableToGeneral;
+            }
+
+            foreach($table as $skillKey => $skillMultiply){
+                if($this->hasActivatedSkill($skillKey)){
+                    $josaUl = \sammo\JosaUtil::pick($skillKey, '을');
+                    $thisLogger->pushGeneralBattleDetailLog("<D>{$skillKey}</>{$josaUl} <C>성공</>했다!");
+                    $opposeLogger->pushGeneralBattleDetailLog("<D>{$skillKey}</>에 당했다!");
+
+                    $this->multiplyWarPowerMultiply($skillMultiply);
+                    break;
+                }
+            }
+        }
+
+        yield true;
+
+        //반계 세트
+        if($this->hasActivatedSkill('반계')){
+            $table = [
+                '위보'=>1.2,
+                '매복'=>1.4,
+                '반목'=>1.6,
+                '화계'=>1.8,
+                '혼란'=>2.0
+            ];
+            foreach($table as $skillKey => $skillMultiply){
+                if($oppose->hasActivatedSkill($skillKey)){
+                    $josaUl = \sammo\JosaUtil::pick($skillKey, '을');
+                    $thisLogger->pushGeneralBattleDetailLog("<C>●</><C>반계</>로 상대의 <D>{$skillKey}</>{$josaUl} 되돌렸다!");
+                    $opposeLogger->pushGeneralBattleDetailLog("<D>{$skillKey}</>{$josaUl} <R>역으로</> 당했다!");
+
+                    $this->multiplyWarPowerMultiply($skillMultiply);
+                    break;
+                }
+            }
+        }
+
+        yield true;
+
+        //계략 실패 세트
+        if($this->hasActivatedSkill('계략실패')){
+            $tableToGeneral = [
+                '위보'=>1.1,
+                '매복'=>1.2,
+                '반목'=>1.3,
+                '화계'=>1.4,
+                '혼란'=>1.5
+            ];
+            $tableToCity = [
+                '급습'=>1.1,
+                '위보'=>1.2,
+                '혼란'=>1.3
+            ];
+            if($oppose instanceof WarUnitCity){
+                $table = $tableToCity;
+            }
+            else{
+                $table = $tableToGeneral;
+            }
+            foreach($table as $skillKey => $skillMultiply){
+                if($this->hasActivatedSkill($skillKey)){
+                    $josaUl = \sammo\JosaUtil::pick($skillKey, '을');
+                    $thisLogger->pushGeneralBattleDetailLog("<D>{$skillKey}</>{$josaUl} <R>실패</>했다!");
+                    $opposeLogger->pushGeneralBattleDetailLog("<D>{$skillKey}</>{$josaUl} 간파했다!");
+
+                    $this->multiplyWarPowerMultiply(1/$skillMultiply);
+                    $oppose->multiplyWarPowerMultiply($skillMultiply);
+                    break;
+                }
+            }
+        }
+
+        yield true;
+
+        if($this->hasActivatedSkill('치료')){
+            $thisLogger->pushGeneralBattleDetailLog("<C>치료</>했다!</>");
+            $oppose->multiplyWarPowerMultiply(1/1.5);
+        }
+
+        yield true;
+
+        if($this->hasActivatedSkill('필살')){
+            $thisLogger->pushGeneralBattleDetailLog('<C>필살</>공격!</>');
+            $opposeLogger->pushGeneralBattleDetailLog('상대의 <R>필살</>공격!</>');
+
+            $this->multiplyWarPowerMultiply($this->criticalDamage());
+        }
+
+        yield true;
+
+        if($this->hasActivatedSkill('회피')){
+            $thisLogger->pushGeneralBattleDetailLog('<C>회피</>했다!</>');
+            $opposeLogger->pushGeneralBattleDetailLog('상대가 <R>회피</>했다!</>');
+
+            $oppose->multiplyWarPowerMultiply(0.2);
+        }
+
+        yield true;
+
+        if($this->hasActivatedSkill('진노')){
+            if($oppose->hasActivatedSkill('필살')){
+                $thisLogger->pushGeneralBattleDetailLog('상대의 필살 공격에 <C>진노</>했다!</>');
+                $opposeLogger->pushGeneralBattleDetailLog('필살 공격에 상대가 <R>진노</>했다!</>');
+            }
+            else if($oppose->hasActivatedSkill('회피시도')){
+                $thisLogger->pushGeneralBattleDetailLog('상대의 회피 시도에 <C>진노</>했다!</>');
+                $opposeLogger->pushGeneralBattleDetailLog('회피 시도에 상대가 <R>진노</>했다!</>');
+            }
+            
+            $this->bonusPhase += 1;
+            $this->multiplyWarPowerMultiply($this->criticalDamage());
+        }
+        else if($this->hasActivatedSkill('격노')){
+            if($oppose->hasActivatedSkill('필살')){
+                $thisLogger->pushGeneralBattleDetailLog('상대의 필살 공격에 <C>격노</>했다!</>');
+                $opposeLogger->pushGeneralBattleDetailLog('필살 공격에 상대가 <R>격노</>했다!</>');
+            }
+            else if($oppose->hasActivatedSkill('회피시도')){
+                $thisLogger->pushGeneralBattleDetailLog('상대의 회피 시도에 <C>격노</>했다!</>');
+                $opposeLogger->pushGeneralBattleDetailLog('회피 시도에 상대가 <R>격노</>했다!</>');
+            }
+
+            $this->multiplyWarPowerMultiply($this->criticalDamage());
+        }
+
+        yield true;
+
+        if($this->hasActivatedSkill('위압')){
+            $thisLogger->pushGeneralBattleDetailLog('상대에게 <C>위압</>을 줬다!</>');
+            $opposeLogger->pushGeneralBattleDetailLog('상대에게 <R>위압</>받았다!</>');
+
+            $oppose->setWarPowerMultiply(0);
+        }
+
+        yield true;
+    }
+
+    function tryWound():bool{
+        if(!Util::randBool(0.05)){
+            return false;
+        }
+
+        $this->increaseVarWithLimit('injury', Util::randRangeInt(10, 80), null, 80);
+        $this->getLogger()->pushGeneralActionLog("전투중 <R>부상</>당했다!", ActionLogger::PLAIN);
+
+        return true;
+    }
+
+    function continueWar(&$noRice):bool{
+        if($this->getHP() <= 0){
+            $noRice = false;
+            return false;
+        }
+        if($this->getVar('rice') <= $this->getHP() / 100){
+            $noRice = true;
+            return false;
+        }
+        return true;
+    }
+
+    ///checkAbility의 method 버전
+    function checkStatChange():bool{
+        //FIXME: 장기적으로는 General 클래스가 별도로 있어야 함
+        $logger = $this->getLogger();
+        $limit = GameConst::$upgradeLimit;
+
+        $table = [
+            ['통솔', 'leader'],
+            ['무력', 'power'],
+            ['지력', 'intel'],
+        ];
+
+        $result = false;
+
+        foreach($table as [$statNickName, $statName]){
+            $statExpName = $statName.'2';
+
+            if($this->getVar($statExpName) < 0){
+                $logger->pushGeneralActionLog("<R>{$statNickName}</>이 <C>1</> 떨어졌습니다!", ActionLogger::PLAIN);
+                $this->increaseVar($statExpName, $limit);
+                $this->increaseVar($statName, -1);
+                $result = true;
+            }
+            else if($this->getVar($statExpName) >= $limit){
+                $logger->pushGeneralActionLog("<R>{$statNickName}</>이 <C>1</> 올랐습니다!", ActionLogger::PLAIN);
+                $this->increaseVar($statExpName, -$limit);
+                $this->increaseVar($statName, 1);
+                $result = true;
+            }
+        }
+
+        return $result;
+    }
+
+    function finishBattle(){    
+        if($this->isFinished){
+            return;
+        }
+        $this->clearActivatedSkill();
+        $this->isFinished = true;
+
+        $this->increaseVar('killcrew', $this->killed);
+        $this->increaseVar('deathcrew', $this->dead);
+        
+        $this->updateVar('rice', Util::round($this->getVar('rice')));
+        $this->updateVar('experience', Util::round($this->getVar('experience')));
+        $this->updateVar('dedication', Util::round($this->getVar('dedication')));
+
+        $this->checkStatChange();
+    }
+
+    /**
+     * @param \MeekroDB $db
+     */
+    function applyDB($db):bool{
+        $updateVals = [];
+        foreach(array_keys($this->updatedVar) as $key){
+            $updateVals[$key] = $this->raw[$key];
+        }
+
+        if(!$updateVals){
+            return false;
+        }
+        
+        $db->update('general', $updateVals, 'no=%i', $this->raw['no']);
+        $this->getLogger()->flush();
+        return $db->affectedRows() > 0;
+    }
+
+}

hwe/scenario/map/che.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace sammo;
+
+class CityConst extends CityConstBase{
+    
+}

hwe/scenario/map/ludo_rathowm.php

@@ -0,0 +1,125 @@
+<?php
+
+namespace sammo;
+
+class CityConst extends CityConstBase{
+    public static $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교',
+    ];
+
+    protected static $initCity = [
+        //id,  도시,            규모, 인구, 농,  상, 치, 성, 수,(x100)지역,             x,   y, 연결도시
+        [ 1, '구 마왕성',       '특', 8000,120,120,100,120,120, '호넷 마인령',        35, 142, ['악의 탑','한탄의 협곡','유황의 숲']],
+        [ 2, '악의 탑',         '이', 3500, 40, 40, 20, 40, 40, '호넷 마인령',        45,  40, ['반리요새 A','구 마왕성']],
+        [ 3, '실키의 성',       '중', 5500, 80, 80, 60, 80, 80, '호넷 마인령',        45, 270, ['유황의 숲','카스케도바우','죽음의 대지']],
+        [ 4, '카스케도바우',    '중', 5500, 80, 80, 60, 80, 80, '호넷 마인령',       120, 276, ['실키의 성','케셀링크의 성']],
+        [ 5, '붉은 집',         '수', 2500, 20, 20, 20, 40, 40, '케이브리스 마인령',  70, 335, ['케이브리스의 성','케셀링크의 성']],
+        [ 6, '케셀링크의 성',   '대', 7000,100,100, 80,100,100, '케이브리스 마인령', 135, 338, ['붉은 집','메이드의 묘지','카스케도바우','뼈의 숲']],
+        [ 7, '케이브리스의 성', '특', 8000,120,120,100,120,120, '케이브리스 마인령',  37, 384, ['붉은 집','푸른 집','죽음의 대지']],
+        [ 8, '푸른 집',         '수', 2500, 20, 20, 20, 40, 40, '케이브리스 마인령',  59, 446, ['케이브리스의 성','메이드의 묘지','카미라의 성']],
+        [ 9, '한탄의 협곡',     '소', 4500, 60, 60, 40, 60, 60, '호넷 마인령',        97, 152, ['구 마왕성','반리요새 B']],
+        [10, '뼈의 숲',         '소', 4500, 60, 60, 40, 60, 60, '케이브리스 마인령', 160, 386, ['케셀링크의 성','마지노 A']],
+        [11, '유황의 숲',       '소', 4500, 60, 60, 40, 60, 60, '호넷 마인령',        72, 209, ['구 마왕성','실키의 성']],
+        [12, '카미라의 성',     '대', 7000,100,100, 80,100,100, '케이브리스 마인령', 130, 460, ['푸른 집','갈라놓은 숲']],
+        [13, '메이드의 묘지',   '이', 3500, 40, 40, 20, 40, 40, '케이브리스 마인령', 102, 380, ['케셀링크의 성','푸른 집']],
+        [14, '갈라놓은 숲',     '소', 4500, 60, 60, 40, 60, 60, '케이브리스 마인령', 186, 472, ['카미라의 성','마지노 B']],
+        [15, '죽음의 대지',     '이', 3500, 40, 40, 20, 40, 40, '케이브리스 마인령',  10, 320, ['케이브리스의 성','실키의 성']],
+        [16, '녹의 마을',       '소', 4500, 60, 60, 40, 60, 60, '카라의 숲',         202, 290, ['마지노 A','파리티라온']],
+        [17, '펜실 카우',       '이', 3500, 40, 40, 20, 40, 40, '카라의 숲',         297, 267, ['파리티라온','라보리']],
+        [18, '샹그릴라',        '대', 7000,100,100, 80,100,100, '샹그릴라',          374, 272, ['스도리 13','보르고 Z','사바사바','릿치']],
+        [19, '파리티라온',      '중', 5500, 80, 80, 60, 80, 80, '제스 북부',         259, 332, ['녹의 마을','마지노 A','왕자의 탑','펜실 카우']],
+        [20, '왕자의 탑',       '소', 4500, 60, 60, 40, 60, 60, '제스 북부',         259, 367, ['파리티라온','도약의 탑','일요일의 탑','라그나로크 아크']],
+        [21, '도약의 탑',       '소', 4500, 60, 60, 40, 60, 60, '제스 남부',         265, 406, ['왕자의 탑','라그나로크 아크','탄창의 탑','마크']],
+        [22, '일요일의 탑',     '소', 4500, 60, 60, 40, 60, 60, '제스 북부',         324, 358, ['왕자의 탑','라그나로크 아크','탄창의 탑','나가르모르']],
+        [23, '탄창의 탑',       '소', 4500, 60, 60, 40, 60, 60, '제스 남부',         331, 409, ['도약의 탑','라그나로크 아크','일요일의 탑','올드제스']],
+        [24, '라그나로크 아크', '특', 8000,120,120,100,120,120, '제스 북부',         295, 385, ['왕자의 탑','도약의 탑','도약의 탑','탄창의 탑','일요일의 탑']],
+        [25, '알텐누',          '중', 5500, 80, 80, 60, 80, 80, '제스 남부',         293, 482, ['마크','마지노 B']],
+        [26, '마크',            '중', 5500, 80, 80, 60, 80, 80, '제스 남부',         288, 436, ['알텐누','호박성','도약의 탑']],
+        [27, '호박성',          '이', 3500, 40, 40, 20, 40, 40, '제스 남부',         328, 458, ['마크','올드제스']],
+        [28, '올드제스',        '특', 8000,120,120,100,120,120, '제스 남부',         367, 444, ['탄창의 탑','호박성','테이브','카이즈']],
+        [29, '테이브',          '소', 4500, 60, 60, 40, 60, 60, '제스 남부',         385, 406, ['이탈리아','올드제스']],
+        [30, '이탈리아',        '대', 7000,100,100, 80,100,100, '제스 북부',         375, 361, ['테이브','사바사바','아담의탑']],
+        [31, '나가르모르',      '중', 5500, 80, 80, 60, 80, 80, '제스 북부',         322, 322, ['일요일의 탑','사바사바']],
+        [32, '사바사바',        '대', 7000,100,100, 80,100,100, '제스 북부',         375, 324, ['나가르모르','이탈리아','샹그릴라']],
+        [33, '아담의탑',        '진', 2500, 20, 20, 20, 40, 40, '제스 북부',         420, 340, ['이탈리아','파라파라성채']],
+        [34, '마지노 A',        '관', 2500, 20, 20, 20, 90, 90, '제스 북부',         215, 365, ['뼈의 숲','녹의 마을','파리티라온']],
+        [35, '마지노 B',        '관', 2500, 20, 20, 20, 90, 90, '제스 남부',         243, 477, ['갈라놓은 숲','알텐누']],
+        [36, '이코마',          '중', 5500, 80, 80, 60, 80, 80, '헬만 서부',         211,  60, ['반리요새 A','거대전함','워크랜드','로렌그라드']],
+        [37, '워크랜드',        '소', 4500, 60, 60, 40, 60, 60, '헬만 서부',         177,  90, ['이코마','로렌그라드']],
+        [38, '로렌그라드',      '대', 7000,100,100, 80,100,100, '헬만 서부',         200, 126, ['파르나스','랑그바우','이코마','반리요새 B','워크랜드']],
+        [39, '파르나스',        '중', 5500, 80, 80, 60, 80, 80, '헬만 서부',         204, 171, ['로렌그라드','세미타포']],
+        [40, '라보리',          '중', 5500, 80, 80, 60, 80, 80, '헬만 서부',         225, 219, ['펜실 카우','스도리 17']],
+        [41, '랑그바우',        '특', 8000,120,120,100,120,120, '헬만 서부',         263, 135, ['로렌그라드','마이크로그라드']],
+        [42, '거대전함',        '이', 3500, 40, 40, 20, 40, 40, '헬만 서부',         273,  21, ['이코마','파스','호라가의  탑','시베리아']],
+        [43, '세미타포',        '소', 4500, 60, 60, 40, 60, 60, '헬만 서부',         268, 174, ['파르나스','스도리 17']],
+        [44, '스도리 17',       '진', 2500, 20, 20, 20, 40, 40, '헬만 서부',         296, 214, ['라보리','세미타포','스도리 13']],
+        [45, '스도리 13',       '진', 2500, 20, 20, 20, 40, 40, '헬만 서부',         359, 217, ['샹그릴라','폰','스도리 17','코사크','보르고 Z']],
+        [46, '마이크로그라드',  '소', 4500, 60, 60, 40, 60, 60, '헬만 서부',         316, 166, ['폰','랑그바우','스도리 10']],
+        [47, '폰',              '중', 5500, 80, 80, 60, 80, 80, '헬만 서부',         377, 187, ['마이크로그라드','스도리 13','코사크']],
+        [48, '파스',            '중', 5500, 80, 80, 60, 80, 80, '헬만 서부',         286,  90, ['거대전함','큐로브','스도리 10']],
+        [49, '큐로브',          '소', 4500, 60, 60, 40, 60, 60, '헬만 서부',         341,  96, ['파스','소로토이']],
+        [50, '스도리 10',       '진', 2500, 20, 20, 20, 40, 40, '헬만 서부',         337, 137, ['파스','로제스그라드','마이크로그라드']],
+        [51, '소로토이',        '소', 4500, 60, 60, 40, 60, 60, '헬만 동부',         382, 119, ['큐로브','바바로프스']],
+        [52, '로제스그라드',    '특', 8000,120,120,100,120,120, '헬만 동부',         401, 148, ['스도리 10','바바로프스','아크그라드']],
+        [53, '코사크',          '중', 5500, 80, 80, 60, 80, 80, '헬만 동부',         419, 204, ['스도리 13','보르고 Z','폰']],
+        [54, '아크그라드',      '소', 4500, 60, 60, 40, 60, 60, '헬만 동부',         452, 179, ['로그 B','로제스그라드','야크트크']],
+        [55, '야크트크',        '소', 4500, 60, 60, 40, 60, 60, '헬만 동부',         437, 129, ['아크그라드','바바로프스','고라크']],
+        [56, '시베리아',        '대', 7000,100,100, 80,100,100, '헬만 동부',         394,  55, ['바바로프스','호라가의  탑','거대전함']],
+        [57, '바바로프스',      '중', 5500, 80, 80, 60, 80, 80, '헬만 동부',         418,  89, ['시베리아','야크트크','소로토이','로제스그라드']],
+        [58, '호라가의  탑',    '관', 2500, 20, 20, 20, 90, 90, '헬만 동부',         561,  20, ['시베리아','거대전함','떨어진 궁도']],
+        [59, '고라크',          '중', 5500, 80, 80, 60, 80, 80, '헬만 동부',         478, 146, ['블라디보스토크','로그 A','야크트크']],
+        [60, '블라디보스토크',  '이', 3500, 40, 40, 20, 40, 40, '헬만 동부',         500, 109, ['고라크','로그 A']],
+        [61, '보르고 Z',        '관', 2500, 20, 20, 20, 90, 90, '헬만 동부',         436, 245, ['코사크','스도리 13','로그 B', '샹그릴라']],
+        [62, '로그 A',          '관', 2500, 20, 20, 20, 90, 90, '헬만 동부',         506, 183, ['고라크','블라디보스토크','로그 B','스케일']],
+        [63, '로그 B',          '관', 2500, 20, 20, 20, 90, 90, '헬만 동부',         475, 216, ['아크그라드','로그 A','보르고 Z','마우네스']],
+        [64, '반리요새 A',      '진', 2500, 20, 20, 20, 40, 40, '헬만 서부',         149,  18, ['악의 탑','이코마']],
+        [65, '반리요새 B',      '진', 2500, 20, 20, 20, 40, 40, '헬만 서부',         151, 153, ['로렌그라드','한탄의 협곡']],
+        [66, '파라파라성채',    '진', 2500, 20, 20, 20, 40, 40, '리자스 남부',       449, 315, ['아담의탑','릿치']],
+        [67, '릿치',            '중', 5500, 80, 80, 60, 80, 80, '리자스 남부',       476, 288, ['푸아','마우네스','파라파라성채','샹그릴라']],
+        [68, '푸아',            '소', 4500, 60, 60, 40, 60, 60, '리자스 남부',       528, 289, ['릿치','록아스']],
+        [69, '마우네스',        '소', 4500, 60, 60, 40, 60, 60, '리자스 남부',       502, 250, ['릿치','로그 B','노스']],
+        [70, '스케일',          '대', 7000,100,100, 80,100,100, '리자스 북부',       542, 198, ['로그 A','아란','노스']],
+        [71, '아란',            '중', 5500, 80, 80, 60, 80, 80, '리자스 북부',       596, 154, ['떨어진 궁도','포나라','스케일','브리테리아']],
+        [72, '떨어진 궁도',     '이', 3500, 40, 40, 20, 40, 40, '리자스 북부',       598, 111, ['호라가의  탑','아란']],
+        [73, '포나라',          '소', 4500, 60, 60, 40, 60, 60, '리자스 북부',       640, 168, ['아란','브리테리아','웨스']],
+        [74, '브리테리아',      '대', 7000,100,100, 80,100,100, '리자스 북부',       587, 205, ['아란','웨스','포나라']],
+        [75, '파란치',          '소', 4500, 60, 60, 40, 60, 60, '리자스 북부',       667, 229, ['웨스','이스']],
+        [76, '노스',            '중', 5500, 80, 80, 60, 80, 80, '리자스 남부',       563, 255, ['스케일','마우네스','오크','리자스성']],
+        [77, '오크',            '중', 5500, 80, 80, 60, 80, 80, '리자스 남부',       577, 295, ['노스','사우스','지오']],
+        [78, '리자스성',        '특', 8000,120,120,100,120,120, '리자스 남부',       611, 245, ['노스','사우스','웨스']],
+        [79, '사우스',          '소', 4500, 60, 60, 40, 60, 60, '리자스 남부',       618, 285, ['리자스성','오크','이스']],
+        [80, '이스',            '중', 5500, 80, 80, 60, 80, 80, '리자스 남부',       656, 269, ['사우스','파란치','오크스']],
+        [81, '오크스',          '중', 5500, 80, 80, 60, 80, 80, '리자스 남부',       650, 311, ['이스','한나','오슈']],
+        [82, '웨스',            '중', 5500, 80, 80, 60, 80, 80, '리자스 북부',       632, 212, ['리자스성','포나라','파란치','브리테리아']],
+        [83, '오슈',            '이', 3500, 40, 40, 20, 40, 40, 'JAPAN',             688, 308, ['오크스','오와리']],
+        [84, '오와리',          '특', 8000,120,120,100,120,120, 'JAPAN',             679, 394, ['오슈','모로코']],
+        [85, '모로코',          '수', 2500, 20, 20, 20, 40, 40, 'JAPAN',             627, 450, ['오와리','포르투갈']],
+        [86, '지오',            '중', 5500, 80, 80, 60, 80, 80, '자유도시 동부',     578, 333, ['오크','렛드','M랜드']],
+        [87, '한나',            '소', 4500, 60, 60, 40, 60, 60, '자유도시 동부',     632, 342, ['오크스','M랜드']],
+        [88, 'M랜드',           '대', 7000,100,100, 80,100,100, '자유도시 동부',     616, 379, ['지오','한나','렛드','포르투갈']],
+        [89, '포르투갈',        '중', 5500, 80, 80, 60, 80, 80, '자유도시 동부',     599, 422, ['M랜드','투신도시','모로코']],
+        [90, '투신도시',        '이', 3500, 40, 40, 20, 40, 40, '자유도시 동부',     553, 415, ['포르투갈','커스텀','파란쵸 왕국']],
+        [91, '화성',            '소', 4500, 60, 60, 40, 60, 60, '자유도시 서부',     503, 482, ['커스텀']],
+        [92, '커스텀',          '특', 8000,120,120,100,120,120, '자유도시 서부',     506, 416, ['투신도시','지브테리아','라지르','파란쵸 왕국','화성']],
+        [93, '라지르',          '소', 4500, 60, 60, 40, 60, 60, '자유도시 서부',     530, 358, ['렛드','커스텀','아이스']],
+        [94, '록아스',          '중', 5500, 80, 80, 60, 80, 80, '자유도시 서부',     489, 329, ['아이스','푸아']],
+        [95, '지브테리아',      '대', 7000,100,100, 80,100,100, '자유도시 서부',     452, 370, ['아이스','카이즈','커스텀']],
+        [96, '파란쵸 왕국',     '이', 3500, 40, 40, 20, 40, 40, '자유도시 동부',     537, 458, ['커스텀','투신도시']],
+        [97, '아이스',          '소', 4500, 60, 60, 40, 60, 60, '자유도시 서부',     489, 375, ['록아스','지브테리아','라지르']],
+        [98, '렛드',            '중', 5500, 80, 80, 60, 80, 80, '자유도시 서부',     566, 372, ['라지르','M랜드','지오']],
+        [99, '카이즈',          '이', 3500, 40, 40, 20, 40, 40, 'AL교',              439, 425, ['올드제스','지브테리아']],
+    ];
+}

hwe/scenario/map/miniche.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace sammo;
+
+class CityConst extends CityConstBase{
+    protected static $initCity = [
+        //id,  도시, 규모, 인구, 농,  상, 치, 성, 수,(x100)지역, x,  y, 연결도시
+        [1,  '낙양', '특', 8357,117,120,100,121,124, '중원', 285, 176, ['하내', '홍농', '호로']],
+        [2,  '성도', '특', 6525,123,125,100,125,123, '서촉',  30, 285, ['덕양', '강주']],
+        [3,  '건업', '특', 6386,116,123,100,115,119, '오월', 507, 303, ['광릉', '합비', '오']],
+        [4,  '업',   '특', 6205,125,113,100,117,122, '하북', 355, 135, ['하내', '거록', '남피', '제남', '진류']],
+        [5,  '장안', '특', 5923,116,123,100,120,118, '서북', 162, 173, ['안정', '오장원', '한중', '홍농']],
+        [6,  '허창', '특', 5876,121,124,100,117,125, '중원', 325, 218, ['호로', '진류', '초', '여남', '완']],
+        [7,  '양양', '특', 5837,120,126,100,115,117, '초',   259, 295, ['신야', '강릉', '강하']],
+        [8,  '시상', '대', 5252, 98,100, 80, 99, 96, '오월', 357, 357, ['적벽', '여강', '단양', '상동', '장사']],
+        [9,  '수춘', '대', 5143, 99, 96, 80, 99, 95, '중원', 385, 270, ['여남', '초', '하비', '합비']],
+        [10, '한중', '대', 5137, 96,101, 80,102,103, '서촉', 130, 218, ['무도', '오장원', '장안', '상용', '자동']],
+        [11, '남피', '대', 5032, 99,101, 80,101,105, '하북', 410,  93, ['계', '북평', '평원', '업', '거록']],
+        [12, '위례', '대', 4926,100, 93, 80, 98,103, '동이', 618, 140, ['평양', '북해', '웅진', '계림']],
+        [13, '북평', '대', 4862,102, 95, 80,103, 99, '하북', 442,  53, ['계', '요동', '남피']],
+        [14, '강릉', '대', 4850,105, 96, 80, 95, 96, '초',   245, 330, ['이릉', '양양', '적벽', '장사', '무릉']],
+        [15, '완',   '대', 4724,103,100, 80,101, 99, '중원', 275, 235, ['허창', '여남', '신야']],
+        [16, '장사', '대', 4710, 97, 99, 80,100,105, '초',   258, 373, ['강릉', '시상', '계양', '무릉']],
+        [17, '오',   '중', 4355, 77, 81, 60, 77, 76, '오월', 515, 340, ['건업', '단양', '회계', '탐라']],
+        [18, '하비', '중', 4278, 85, 83, 60, 82, 78, '중원', 460, 240, ['패', '북해', '광릉', '수춘']],
+        [19, '복양', '중', 4185, 80, 83, 60, 82, 80, '중원', 412, 170, ['제남', '진류', '패']],
+        [20, '웅진', '중', 4157, 77, 79, 60, 78, 80, '동이', 615, 205, ['위례', '계림', '탐라']],
+        [21, '강주', '중', 4126, 79, 80, 60, 84, 81, '서촉',  75, 305, ['성도', '덕양', '영안', '주제', '월수']],
+        [22, '무도', '중', 4027, 77, 84, 60, 80, 85, '서촉',  55, 191, ['저', '한중', '자동']],
+        [23, '국내', '중', 3982, 78, 80, 60, 83, 78, '동이', 596,  48, ['요동', '오환', '평양']],
+        [24, '진류', '중', 3957, 82, 80, 60, 80, 83, '중원', 370, 175, ['업', '복양', '패', '초', '허창', '호로']],
+        [25, '계양', '중', 3955, 83, 80, 60, 81, 77, '초',   242, 408, ['영릉', '장사', '상동']],
+        [26, '계림', '중', 3911, 80, 74, 60, 81, 78, '동이', 660, 195, ['위례', '웅진', '왜']],
+        [27, '계',   '중', 3885, 75, 80, 60, 78, 81, '하북', 386,  55, ['진양', '북평', '남피']],
+        [28, '무위', '중', 3874, 77, 79, 60, 83, 80, '서북',  56,  76, ['강', '안정', '천수', '저']],
+        [29, '제남', '중', 3831, 77, 81, 60, 84, 77, '하북', 402, 132, ['업', '평원', '복양']],
+        [30, '남해', '중', 3803, 82, 76, 60, 80, 81, '오월', 270, 474, ['상동', '산월', '교지']],
+        [31, '덕양', '중', 3803, 81, 84, 60, 79, 77, '서촉',  73, 276, ['자동', '영안', '강주', '성도']],
+        [32, '하내', '중', 3736, 77, 81, 60, 81, 80, '하북', 295, 140, ['진양', '업', '낙양', '하동']],
+        [33, '상용', '중', 3687, 78, 76, 60, 77, 81, '서촉', 190, 220, ['한중', '신야']],
+        [34, '초',   '소', 3286, 60, 62, 40, 62, 57, '중원', 375, 225, ['허창', '진류', '패', '수춘', '여남']],
+        [35, '운남', '소', 3258, 62, 60, 40, 64, 61, '남중',  45, 405, ['월수', '건녕', '남만']],
+        [36, '대',   '소', 3256, 60, 62, 40, 57, 60, '오월', 450, 470, ['산월', '회계', '왜']],
+        [37, '하동', '소', 3208, 60, 60, 40, 62, 55, '서북', 240, 140, ['흉노', '진양', '하내', '홍농']],
+        [38, '무릉', '소', 3196, 58, 63, 40, 63, 58, '초',   195, 352, ['강릉', '장사', '영릉']],
+        [39, '교지', '소', 3195, 58, 59, 40, 58, 59, '남중', 136, 480, ['남만', '남해']],
+        [40, '단양', '소', 3183, 62, 64, 40, 58, 57, '오월', 440, 350, ['여강', '오', '건안', '시상']],
+        [41, '영안', '소', 3153, 62, 59, 40, 58, 59, '서촉', 116, 282, ['덕양', '이릉', '강주']],
+        [42, '북해', '소', 3146, 55, 63, 40, 63, 58, '하북', 470, 150, ['평원', '위례', '하비']],
+        [43, '합비', '진',  998, 20, 19, 20, 39, 41, '중원', 420, 294, ['수춘', '건업', '여강']],
+        [44, '이릉', '진',  968, 18, 19, 20, 39, 41, '초',   188, 275, ['영안', '강릉']],
+        [45, '건녕', '소', 3082, 58, 59, 40, 63, 56, '남중',  85, 390, ['주제', '장가', '운남']],
+        [46, '강하', '소', 3074, 55, 56, 40, 57, 60, '초',   320, 299, ['양양', '적벽', '여강']],
+        [47, '진양', '소', 3074, 56, 59, 40, 64, 59, '하북', 310,  75, ['흉노', '하동', '하내', '거록', '계']],
+        [48, '평원', '소', 3074, 62, 65, 40, 61, 63, '하북', 445, 110, ['남피', '제남', '북해']],
+        [49, '회계', '소', 3005, 64, 59, 40, 62, 64, '오월', 485, 390, ['오', '건안', '대']],
+        [50, '천수', '소', 2985, 59, 64, 40, 60, 58, '서북',  76, 140, ['무위', '안정', '오장원', '저']],
+        [51, '평양', '소', 2939, 55, 59, 40, 60, 58, '동이', 606,  97, ['국내', '위례']],
+        [52, '요동', '소', 2937, 63, 59, 40, 59, 63, '동이', 549,  26, ['북평', '오환', '국내']],
+        [53, '거록', '소', 2936, 61, 57, 40, 64, 58, '하북', 355,  95, ['진양', '남피', '업']],
+        [54, '여강', '소', 2905, 56, 58, 40, 60, 55, '오월', 392, 325, ['합비', '단양', '시상', '강하']],
+        [55, '패',   '소', 2877, 64, 58, 40, 58, 59, '중원', 425, 210, ['진류', '복양', '하비', '초']],
+        [56, '자동', '소', 2870, 57, 55, 40, 60, 58, '서촉',  62, 240, ['무도', '한중', '덕양']],
+        [57, '광릉', '소', 2867, 61, 55, 40, 60, 62, '오월', 478, 270, ['하비', '건업']],
+        [58, '장가', '소', 2853, 59, 62, 40, 58, 57, '남중', 136, 395, ['건녕', '영릉', '남만']],
+        [59, '영릉', '소', 2849, 62, 58, 40, 62, 62, '초',   197, 390, ['무릉', '계양', '장가']],
+        [60, '월수', '소', 2828, 60, 59, 40, 58, 63, '남중',  39, 349, ['강주', '주제', '운남']],
+        [61, '건안', '소', 2802, 57, 62, 40, 58, 63, '오월', 440, 420, ['단양', '회계', '산월']],
+        [62, '신야', '소', 2786, 60, 62, 40, 58, 55, '초',   245, 255, ['상용', '완', '양양']],
+        [63, '탐라', '수', 1130, 22, 21, 20, 43, 41, '동이', 614, 259, ['웅진', '왜', '오']],
+        [64, '상동', '소', 2767, 58, 59, 40, 62, 58, '초',   285, 405, ['계양', '시상', '남해']],
+        [65, '안정', '소', 2764, 57, 59, 40, 57, 62, '서북', 135, 130, ['강', '무위', '천수', '장안']],
+        [66, '여남', '소', 2749, 63, 56, 40, 64, 64, '중원', 335, 255, ['완', '허창', '초', '수춘']],
+        [67, '홍농', '소', 2748, 57, 63, 40, 58, 63, '서북', 220, 170, ['하동', '낙양', '장안']],
+        [68, '주제', '소', 2746, 58, 61, 40, 61, 58, '남중',  93, 357, ['강주', '월수', '건녕']],
+        [69, '남만', '이', 2378, 40, 42, 20, 43, 45, '남중',  90, 454, ['운남', '장가', '교지']],
+        [70, '산월', '이', 2275, 40, 37, 20, 43, 38, '오월', 373, 447, ['건안', '대', '남해']],
+        [71, '오환', '이', 2153, 42, 37, 20, 43, 40, '동이', 628,  19, ['요동', '국내']],
+        [72, '강',   '이', 2095, 40, 42, 20, 43, 40, '서북', 154,  70, ['무위', '안정']],
+        [73, '왜',   '이', 2065, 39, 37, 20, 43, 41, '동이', 681, 292, ['계림', '탐라', '대']],
+        [74, '흉노', '이', 2064, 40, 41, 20, 40, 38, '서북', 227,  79, ['진양', '하동']],
+        [75, '저',   '이', 1957, 40, 42, 20, 43, 42, '서북',  24, 123, ['무위', '천수', '무도']],
+        [76, '호로', '관',  958, 17, 19, 20, 95, 96, '중원', 317, 182, ['낙양', '진류', '허창']],
+        [77, '오장원','진',1005, 19, 18, 20, 41, 40, '서북', 104, 175, ['천수', '장안', '한중']],
+        [78, '적벽', '수', 1117, 23, 21, 20, 42, 41, '오월', 335, 330, ['강하', '강릉', '시상']],
+    ];
+}

hwe/scenario/scenario_0.json

@@ -1,5 +1,5 @@
 {
-    "title":"【공백지】 공백지",
+    "title":"【공백지】 일반",
     "startYear":180,
     "history":[
     ]

hwe/scenario/scenario_1.json

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

hwe/scenario/scenario_1010.json

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