Merge branch 'devel' into siegetank

conflict
서버 루트 js include 순서 변경
2019-05-05 15:59:10 +09:00 · 2019-05-04 17:10:08 +09:00 · 2019-05-04 17:08:58 +09:00 · 2019-05-04 17:02:48 +09:00 · 2019-05-04 16:39:06 +09:00 · 2019-05-04 14:01:09 +09:00
20 changed files with 825 additions and 503 deletions
@@ -223,9 +223,7 @@ foreach($types as $idx=>[$typeName, $typeValue, $typeFunc]){
 <?php
 //유니크 아이템 소유자
 $itemTypes = [
-    ["명 마", 'horse', function($v){return getHorseName($v);}, 7, 26, []],
-    ["명 검", 'weap', function($v){return getWeapName($v);}, 7, 26, []],
-    ["명 서", 'book', function($v){return getBookName($v);}, 7, 26, []],
+    ["명 마", 'horse', function($v){return getHorseName($v);}, 11, 40, []],
    ["도 구", 'item', function($v){return displayItemInfo($v);}, 7, 26, []],
 ];

@@ -46,20 +46,10 @@ if (($btn == "설정저장" || $detachNPC) && $me['myset'] > 0) {
        $submit = 'hidden';
    }

-    if($mode == 0){
-        $db->update('general', [
-            'myset'=>$db->sqleval('myset-1'),
-            'mode'=>$mode,
-            'train'=>max(0, $me['train'] - 3),
-            'atmos'=>max(0, $me['atmos'] - 3),
-        ], 'owner=%i AND mode!=%i', $userID, $mode);
-    }
-    else{
-        $db->update('general', [
-            'myset'=>$db->sqleval('myset-1'),
-            'mode'=>$mode
-        ], 'owner=%i AND mode!=%i', $userID, $mode);
-    }
+    $db->update('general', [
+        'myset'=>$db->sqleval('myset-1'),
+        'mode'=>$mode
+    ], 'owner=%i AND mode!=%i', $userID, $mode);

    if($db->affectedRows()){
        $me['myset'] -= 1;
@@ -286,7 +286,7 @@ $startYear = $gameStor->getValue('startyear');
                        <span class="input-group-text">명마</span>
                    </div>
                    <select class="custom-select form_general_horse">
-                        <?php foreach(range(0, 26) as $horseID): ?>
+                        <?php foreach(range(0, 40) as $horseID): ?>
                            <option value="<?=$horseID?>"><?=getHorseName($horseID)?></option>
                        <?php endforeach; ?>
                    </select>
@@ -294,7 +294,7 @@ $startYear = $gameStor->getValue('startyear');
                        <span class="input-group-text">무기</span>
                    </div>
                    <select class="custom-select form_general_weap">
-                        <?php foreach(range(0, 26) as $weapID): ?>
+                        <?php foreach(range(0, 6) as $weapID): ?>
                            <option value="<?=$weapID?>"><?=getWeapName($weapID)?></option>
                        <?php endforeach; ?>
                    </select>
@@ -302,7 +302,7 @@ $startYear = $gameStor->getValue('startyear');
                        <span class="input-group-text">서적</span>
                    </div>
                    <select class="custom-select form_general_book">
-                        <?php foreach(range(0, 26) as $bookID): ?>
+                        <?php foreach(range(0, 6) as $bookID): ?>
                            <option value="<?=$bookID?>"><?=getBookName($bookID)?></option>
                        <?php endforeach; ?>
                    </select>
@@ -2239,7 +2239,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'] < 100)  { $prob = $gen['cnt'] * 5; }  // 5~6개월에 하나씩 등장
+    if($admin['scenario'] < 1000)  { $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개 등장
@@ -2251,72 +2251,43 @@ function uniqueItem($general, $log, $vote=0) {
    if(rand() % $prob == 0) {
        //셋중 선택
        $selGroup = [
-            20 - $db->queryFirstField('SELECT count(*) from general where weap > 6'),
-            20 - $db->queryFirstField('SELECT count(*) from general where book > 6'),
-            20 - $db->queryFirstField('SELECT count(*) from general where horse > 6'),
-            20 - $db->queryFirstField('SELECT count(*) from general where item > 6')
+            'horse'=>30 - $db->queryFirstField('SELECT count(*) from general where horse > 10'),
+            'item'=>20 - $db->queryFirstField('SELECT count(*) from general where item > 6')
        ];
-        $sel = Util::choiceRandomUsingWeight($selGroup);
-        switch($sel) {
-        case 0: $type = "weap"; break;
-        case 1: $type = "book"; break;
-        case 2: $type = "horse"; break;
-        case 3: $type = "item"; break;
-        }
-        $query = "select no,{$type} from general where {$type}>6";
-        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-        $count = MYDB_num_rows($result);
-        if($count < 20) {
-            for($i=0; $i < $count; $i++) {
-                $gen = MYDB_fetch_array($result);
-                $occupied[$gen[$type]] = 1;
+        $type = Util::choiceRandomUsingWeight($selGroup);
+
+        if($type == 'horse'){
+            foreach($db->queryFirstColumn('SELECT horse FROM general WHERE horse > 10') as $horse){
+                $occupied[$horse] = 1;
            }
-            for($i=7; $i <= 26; $i++) {
+            for($i = 11; $i <= 40; $i++){
                if(!Util::array_get($occupied[$i])) {
-                    $item[] = $i;
+                    $remainItems[] = $i;
                }
            }
-            $it = $item[rand() % count($item)]??0;
+        }
+        else{
+            foreach($db->queryFirstColumn('SELECT item FROM general WHERE item > 6') as $item){
+                $occupied[$item] = 1;
+            }
+            for($i = 7; $i <= 26; $i++){
+                if(!Util::array_get($occupied[$i])) {
+                    $remainItems[] = $i;
+                }
+            }
+        }
+
+        if($remainItems) {
+            
+            $it = Util::choiceRandom($remainItems);

            $query = "update general set {$type}='$it' where no='{$general['no']}'";
            MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");

            $nation = getNationStaticInfo($general['nation']);

-            switch($sel) {
-            case 0:
-                $josaUl = JosaUtil::pick(getWeapName($it), '을');
-                $josaYi = JosaUtil::pick($general['name'], '이');
-                $log[] = "<C>●</><C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".getWeapName($it)."</>{$josaUl} 습득");
-                if($vote == 0) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getWeapName($it)."</>{$josaUl} 습득했습니다!";
-                }
-                break;
-            case 1:
-                $josaUl = JosaUtil::pick(getBookName($it), '을');
-                $josaYi = JosaUtil::pick($general['name'], '이');
-                $log[] = "<C>●</><C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                $alllog[0] = "<C>●</>{$admin['month']}월:<Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                pushGeneralHistory($general, "<C>●</>{$admin['year']}년 {$admin['month']}월:<C>".getBookName($it)."</>{$josaUl} 습득");
-                if($vote == 0) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【아이템】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 1) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【설문상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 2) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【랜덤임관상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                } elseif($vote == 3) {
-                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getBookName($it)."</>{$josaUl} 습득했습니다!";
-                }
-                break;
-            case 2:
+            switch($type) {
+            case 'horse':
                $josaUl = JosaUtil::pick(getHorseName($it), '을');
                $josaYi = JosaUtil::pick($general['name'], '이');
                $log[] = "<C>●</><C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
@@ -2332,7 +2303,7 @@ function uniqueItem($general, $log, $vote=0) {
                    $history[] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【건국상품】</b></><D><b>{$nation['name']}</b></>의 <Y>{$general['name']}</>{$josaYi} <C>".getHorseName($it)."</>{$josaUl} 습득했습니다!";
                }
                break;
-            case 3:
+            case 'item':
                $josaUl = JosaUtil::pick(getItemName($it), '을');
                $josaYi = JosaUtil::pick($general['name'], '이');
                $log[] = "<C>●</><C>".getItemName($it)."</>{$josaUl} 습득했습니다!";
@@ -535,60 +535,16 @@ function getWeapName($weap) : ?string {
        case  4: $weapname = '목검(+4)'; break;
        case  5: $weapname = '죽창(+5)'; break;
        case  6: $weapname = '소부(+6)'; break;
-
-        case  7: $weapname = '동추(+7)'; break;
-        case  8: $weapname = '철편(+7)'; break;
-        case  9: $weapname = '철쇄(+7)'; break;
-        case 10: $weapname = '맥궁(+7)'; break;
-        case 11: $weapname = '유성추(+8)'; break;
-        case 12: $weapname = '철질여골(+8)'; break;
-        case 13: $weapname = '쌍철극(+9)'; break;
-        case 14: $weapname = '동호비궁(+9)'; break;
-        case 15: $weapname = '삼첨도(+10)'; break;
-        case 16: $weapname = '대부(+10)'; break;
-        case 17: $weapname = '고정도(+11)'; break;
-        case 18: $weapname = '이광궁(+11)'; break;
-        case 19: $weapname = '철척사모(+12)'; break;
-        case 20: $weapname = '칠성검(+12)'; break;
-        case 21: $weapname = '사모(+13)'; break;
-        case 22: $weapname = '양유기궁(+13)'; break;
-        case 23: $weapname = '언월도(+14)'; break;
-        case 24: $weapname = '방천화극(+14)'; break;
-        case 25: $weapname = '청홍검(+15)'; break;
-        case 26: $weapname = '의천검(+15)'; break;
    }
    return $weapname;
 }

 function getWeapEff($weap) : ?int{
-    switch($weap) {
-        case  7: $weap =  7; break;
-        case  8: $weap =  7; break;
-        case  9: $weap =  7; break;
-        case 10: $weap =  7; break;
-        case 11: $weap =  8; break;
-        case 12: $weap =  8; break;
-        case 13: $weap =  9; break;
-        case 14: $weap =  9; break;
-        case 15: $weap = 10; break;
-        case 16: $weap = 10; break;
-        case 17: $weap = 11; break;
-        case 18: $weap = 11; break;
-        case 19: $weap = 12; break;
-        case 20: $weap = 12; break;
-        case 21: $weap = 13; break;
-        case 22: $weap = 13; break;
-        case 23: $weap = 14; break;
-        case 24: $weap = 14; break;
-        case 25: $weap = 15; break;
-        case 26: $weap = 15; break;
-        default: break;
-    }
    return $weap;
 }

 function getBookName($book) : ?string {
-    switch($book) {
+    switch ($book) {
        case  0: $bookname = '-'; break;
        case  1: $bookname = '효경전(+1)'; break;
        case  2: $bookname = '회남자(+2)'; break;
@@ -596,55 +552,11 @@ function getBookName($book) : ?string {
        case  4: $bookname = '건상역주(+4)'; break;
        case  5: $bookname = '여씨춘추(+5)'; break;
        case  6: $bookname = '사민월령(+6)'; break;
-
-        case  7: $bookname = '위료자(+7)'; break;
-        case  8: $bookname = '사마법(+7)'; break;
-        case  9: $bookname = '한서(+7)'; break;
-        case 10: $bookname = '논어(+7)'; break;
-        case 11: $bookname = '전론(+8)'; break;
-        case 12: $bookname = '사기(+8)'; break;
-        case 13: $bookname = '장자(+9)'; break;
-        case 14: $bookname = '역경(+9)'; break;
-        case 15: $bookname = '시경(+10)'; break;
-        case 16: $bookname = '구국론(+10)'; break;
-        case 17: $bookname = '상군서(+11)'; break;
-        case 18: $bookname = '춘추전(+11)'; break;
-        case 19: $bookname = '산해경(+12)'; break;
-        case 20: $bookname = '맹덕신서(+12)'; break;
-        case 21: $bookname = '관자(+13)'; break;
-        case 22: $bookname = '병법24편(+13)'; break;
-        case 23: $bookname = '한비자(+14)'; break;
-        case 24: $bookname = '오자병법(+14)'; break;
-        case 25: $bookname = '노자(+15)'; break;
-        case 26: $bookname = '손자병법(+15)'; break;
    }
    return $bookname;
 }

 function getBookEff($book) : ?int {
-    switch($book) {
-        case  7: $book =  7; break;
-        case  8: $book =  7; break;
-        case  9: $book =  7; break;
-        case 10: $book =  7; break;
-        case 11: $book =  8; break;
-        case 12: $book =  8; break;
-        case 13: $book =  9; break;
-        case 14: $book =  9; break;
-        case 15: $book = 10; break;
-        case 16: $book = 10; break;
-        case 17: $book = 11; break;
-        case 18: $book = 11; break;
-        case 19: $book = 12; break;
-        case 20: $book = 12; break;
-        case 21: $book = 13; break;
-        case 22: $book = 13; break;
-        case 23: $book = 14; break;
-        case 24: $book = 14; break;
-        case 25: $book = 15; break;
-        case 26: $book = 15; break;
-        default: break;
-    }
    return $book;
 }

@@ -657,56 +569,77 @@ function getHorseName($horse) : ?string {
        case  4: $horsename = '나귀(+4)'; break;
        case  5: $horsename = '갈색마(+5)'; break;
        case  6: $horsename = '흑색마(+6)'; break;
-
        case  7: $horsename = '백마(+7)'; break;
-        case  8: $horsename = '백마(+7)'; break;
-        case  9: $horsename = '기주마(+7)'; break;
-        case 10: $horsename = '기주마(+7)'; break;
-        case 11: $horsename = '양주마(+8)'; break;
-        case 12: $horsename = '양주마(+8)'; break;
-        case 13: $horsename = '과하마(+9)'; break;
-        case 14: $horsename = '과하마(+9)'; break;
-        case 15: $horsename = '대완마(+10)'; break;
-        case 16: $horsename = '대완마(+10)'; break;
-        case 17: $horsename = '서량마(+11)'; break;
-        case 18: $horsename = '서량마(+11)'; break;
-        case 19: $horsename = '사륜거(+12)'; break;
-        case 20: $horsename = '사륜거(+12)'; break;
-        case 21: $horsename = '절영(+13)'; break;
-        case 22: $horsename = '적로(+13)'; break;
-        case 23: $horsename = '적란마(+14)'; break;
-        case 24: $horsename = '조황비전(+14)'; break;
-        case 25: $horsename = '한혈마(+15)'; break;
-        case 26: $horsename = '적토마(+15)'; break;
+        case  8: $horsename = '기주마(+8)'; break;
+        case  9: $horsename = '양주마(+9)'; break;
+        case 10: $horsename = '과하마(+10)'; break;
+        case 11: $horsename = '대완마(+11)'; break;
+        case 12: $horsename = '대완마(+11)'; break;
+        case 13: $horsename = '대완마(+11)'; break;
+        case 14: $horsename = '서량마(+12)'; break;
+        case 15: $horsename = '서량마(+12)'; break;
+        case 16: $horsename = '서량마(+12)'; break;
+        case 17: $horsename = '화종마(+13)'; break;
+        case 18: $horsename = '화종마(+13)'; break;
+        case 19: $horsename = '화종마(+13)'; break;
+        case 20: $horsename = '옥룡마(+14)'; break;
+        case 21: $horsename = '옥룡마(+14)'; break;
+        case 22: $horsename = '옥룡마(+14)'; break;
+        case 23: $horsename = '사륜거(+15)'; break;
+        case 24: $horsename = '사륜거(+15)'; break;
+        case 25: $horsename = '사륜거(+15)'; break;
+        case 26: $horsename = '적로(+16)'; break;
+        case 27: $horsename = '적로(+16)'; break;
+        case 28: $horsename = '적로(+16)'; break;
+        case 29: $horsename = '적란마(+17)'; break;
+        case 30: $horsename = '적란마(+17)'; break;
+        case 31: $horsename = '적란마(+17)'; break;
+        case 32: $horsename = '조황비전(+18)'; break;
+        case 33: $horsename = '조황비전(+18)'; break;
+        case 34: $horsename = '조황비전(+18)'; break;
+        case 35: $horsename = '한혈마(+19)'; break;
+        case 36: $horsename = '한혈마(+19)'; break;
+        case 37: $horsename = '한혈마(+19)'; break;
+        case 38: $horsename = '적토마(+20)'; break;
+        case 39: $horsename = '적토마(+20)'; break;
+        case 40: $horsename = '적토마(+20)'; break;
    }
    return $horsename;
 }

 function getHorseEff($horse) : ?int {
-    switch($horse) {
-        case  7: $horse =  7; break;
-        case  8: $horse =  7; break;
-        case  9: $horse =  7; break;
-        case 10: $horse =  7; break;
-        case 11: $horse =  8; break;
-        case 12: $horse =  8; break;
-        case 13: $horse =  9; break;
-        case 14: $horse =  9; break;
-        case 15: $horse = 10; break;
-        case 16: $horse = 10; break;
-        case 17: $horse = 11; break;
-        case 18: $horse = 11; break;
-        case 19: $horse = 12; break;
-        case 20: $horse = 12; break;
-        case 21: $horse = 13; break;
-        case 22: $horse = 13; break;
-        case 23: $horse = 14; break;
-        case 24: $horse = 14; break;
-        case 25: $horse = 15; break;
-        case 26: $horse = 15; break;
-        default: break;
-    }
-    return $horse;
+    return [
+        11=>11,
+        12=>11,
+        13=>11,
+        14=>12,
+        15=>12,
+        16=>12,
+        17=>13,
+        18=>13,
+        19=>13,
+        20=>14,
+        21=>14,
+        22=>14,
+        23=>15,
+        24=>15,
+        25=>15,
+        26=>16,
+        27=>16,
+        28=>16,
+        29=>17,
+        30=>17,
+        31=>17,
+        32=>18,
+        33=>18,
+        34=>18,
+        35=>19,
+        36=>19,
+        37=>19,
+        38=>20,
+        39=>20,
+        40=>20,
+    ][$horse]??$horse;
 }

 function getItemName($item) : ?string {
@@ -801,6 +734,10 @@ function getItemCost($weap) : int {
        case  4: $weapcost = 10000; break;
        case  5: $weapcost = 15000; break;
        case  6: $weapcost = 21000; break;
+        case  7: $weapcost = 28000; break;
+        case  8: $weapcost = 36000; break;
+        case  9: $weapcost = 45000; break;
+        case  10: $weapcost = 55000; break;
        default: $weapcost = 200; break;
    }
    return $weapcost;
@@ -881,4 +818,4 @@ function newColor($color) : string {

 function backColor($color) : string {
    return newColor($color);
-}
+}
@@ -346,16 +346,85 @@ function preUpdateMonthly() {
    //미보급도시 10% 감소
    $query = "update city set pop=pop*0.9,rate=rate*0.9,agri=agri*0.9,comm=comm*0.9,secu=secu*0.9,def=def*0.9,wall=wall*0.9 where supply='0'";
    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    //미보급도시 장수 5% 감소
-    $query = "select city,nation from city where supply='0'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $cityCount = MYDB_num_rows($result);
-    for($i=0; $i < $cityCount; $i++) {
-        $city = MYDB_fetch_array($result);
-        //병 훈 사 5%감소
-        $query = "update general set crew=crew*0.95,atmos=atmos*0.95,train=train*0.95 where city='{$city['city']}' and nation='{$city['nation']}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+
+
+    $relYear = $admin['year'] - $admin['startyear'];
+    $relMaxTech = Util::valueFit(
+        floor($relYear / 5) + 1,
+        1, 
+        GameConst::$maxTechLevel
+    ) * 1000;
+
+    foreach($db->queryAllLists('SELECT count(no), nation FROM general WHERE nation != 0 GROUP BY nation') as [$genCnt, $nationID]){
+        $genCnt = Util::valueFit($genCnt, GameConst::$initialNationGenLimit);
+        $nationType = getNationStaticInfo($nationID)['type'];
+
+        //자동 기술연구
+        $techOffset = 20;
+        if(in_array($nationType, [3, 13])){
+            $techOffset *= 1.05;
+        }
+        else if(in_array($nationType, [5, 6, 7, 8, 12])){
+            $techOffset *= 0.95;
+        }
+        $db->update('nation', [
+            'totaltech'=>$db->sqleval(
+                'if(tech >= %i, totaltech, totaltech + %i)',
+                $relMaxTech,
+                $techOffset * $genCnt
+            ),
+            'tech'=>$db->sqleval('totaltech / %i', $genCnt)
+        ], 'nation = %i', $nationID);
+
+        //내정이 덜 찬곳은 1%p씩 증가. 내정이 오버된 곳은 1%씩 감소.
+        $setValues = [];
+
+        //인구는 고정
+        $setValues['pop'] = $db->sqleval('if(pop > pop2, GREATEST(pop2, pop*0.99), pop)');
+
+        //농지, 상업
+        if(in_array($nationType, [2, 12])){    
+            $agriOffset = 1.1;
+        }
+        else if(in_array($nationType, [8, 11])){
+            $agriOffset = 0.9;
+        }
+        else{
+            $agriOffset = 1;
+        }
+        
+        $setValues['agri'] = $db->sqleval('if(agri > agri2, GREATEST(agri2, agri*0.99), LEAST(agri2, agri + 80*%d))', $agriOffset);
+        $setValues['comm'] = $db->sqleval('if(comm > comm2, GREATEST(comm2, comm*0.99), LEAST(comm2, comm + 80*%d))', $agriOffset);
+
+        //치안
+        if(in_array($nationType, [1, 4])){    
+            $secuOffset = 1.1;
+        }
+        else if(in_array($nationType, [6, 9])){
+            $secuOffset = 0.9;
+        }
+        else{
+            $secuOffset = 1;
+        }
+        $setValues['secu'] = $db->sqleval('if(secu > secu2, GREATEST(secu2, secu*0.99), LEAST(secu2, secu + 60*%d))', $secuOffset);
+
+        //수비, 성벽
+        if(in_array($nationType, [3, 5, 10, 11])){
+            $defOffset = 1.1; 
+        }
+        else if(in_array($nationType, [4, 7, 8, 13])){
+            $defOffset = 0.9;
+        }
+        else{
+            $defOffset = 1;
+            
+        }
+        $setValues['def'] = $db->sqleval('if(def > def2, GREATEST(def2, def*0.99), LEAST(def2, def + 80*%d))', $defOffset);
+        $setValues['wall'] = $db->sqleval('if(wall > wall2, GREATEST(wall2, wall*0.99), LEAST(wall2, wall + 80*%d))', $defOffset);
+
+        $db->update('city', $setValues, 'nation = %i AND supply = 1', $nationID);
    }
+
    //민심30이하 공백지 처리
    $query = "select city,name,gen1,gen2,gen3 from city where rate<='30' and supply='0'";
    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1031,45 +1100,46 @@ function updateNationState() {
            }

            
+            $maxTroopLeader = [
+                1=>0,
+                2=>2,
+                3=>4,
+                4=>6,
+                5=>8,
+                6=>10,
+                7=>12,
+            ][$nationlevel]??0;
            $lastAssemblerID = $gameStor->assembler_id??0;
-            for($levelGen = max(1, $oldLevel) + 1; $levelGen <= $nationlevel; $levelGen+=1){
-                if(in_array($levelGen, [3, 5, 7])){
-                    $genStep = 2;
-                }
-                else{
-                    $genStep = 1;
-                }
-                
-                while($genStep > 0){
-                    $lastAssemblerID += 1;
-                    $npcObj = new Scenario\NPC(
-                        999, sprintf('부대장%3d',$lastAssemblerID), null, $nation['nation'], null, 
-                        10, 10, 10, 1, $admin['year'] - 15, $admin['year'] + 15,  '은둔', '척사'
-                    );
-                    $npcObj->npc = 5;
-                    $npcObj->build($admin);
-                    $npcID = $npcObj->generalID;
+            $currentTroopLeaderCnt = $db->queryFirstField('SELECT count(no) FROM general WHERE nation = %i AND npc = 5', $nation['nation']);
+            while($currentTroopLeaderCnt < $maxTroopLeader){
+                $currentTroopLeaderCnt++;
+                $lastAssemblerID += 1;
+                $npcObj = new Scenario\NPC(
+                    999, sprintf('부대장%3d',$lastAssemblerID), null, $nation['nation'], null, 
+                    10, 10, 10, 1, $admin['year'] - 15, $admin['year'] + 15,  '은둔', '의술'
+                );
+                $npcObj->npc = 5;
+                $npcObj->build($admin);
+                $npcID = $npcObj->generalID;

-                    $db->insert('troop', [
-                        'name'=>$npcObj->realName,
-                        'nation'=>$nation['nation'],
-                        'no'=>$npcID
-                    ]);
-                    $troopID = $db->insertId();
+                $db->insert('troop', [
+                    'name'=>$npcObj->realName,
+                    'nation'=>$nation['nation'],
+                    'no'=>$npcID
+                ]);
+                $troopID = $db->insertId();

-                    $command = EncodeCommand(0, 0, 0, 26); //집합
-                    $db->update('general', [
-                        'troop'=>$troopID,
-                        'turn0'=>$command,
-                        'turn1'=>$command,
-                        'turn2'=>$command,
-                        'turn3'=>$command,
-                        'turn4'=>$command,
-                        'turn5'=>$command,
-                        'killturn'=>80
-                    ], 'no=%i', $npcID);
-                    $genStep -= 1;
-                }
+                $command = EncodeCommand(0, 0, 0, 26); //집합
+                $db->update('general', [
+                    'troop'=>$troopID,
+                    'turn0'=>$command,
+                    'turn1'=>$command,
+                    'turn2'=>$command,
+                    'turn3'=>$command,
+                    'turn4'=>$command,
+                    'turn5'=>$command,
+                    'killturn'=>80
+                ], 'no=%i', $npcID);
            }
            $gameStor->assembler_id = $lastAssemblerID;

@@ -22,6 +22,22 @@ function SetDevelop($genType, $no, $city, $tech) {
    $command = EncodeCommand(0, 0, 0, 9); //조달
    switch($genType) {
    case 0: //무장
+        if($prob < 30) {
+            if($city['po'] < $city['de']) { $command = EncodeCommand(0, 0, 0, 7); } //정장
+            elseif($city['de'] < 99) { $command = EncodeCommand(0, 0, 0, 5); } //수비
+            else { $command = EncodeCommand(0, 0, 0, 9); } //조달
+        } elseif($prob < 60) {
+            if($city['po'] < $city['wa']) { $command = EncodeCommand(0, 0, 0, 7); } //정장
+            elseif($city['wa'] < 99) { $command = EncodeCommand(0, 0, 0, 6); } //성벽
+            else { $command = EncodeCommand(0, 0, 0, 9); } //조달
+        } elseif($prob < 90) {
+            if($city['po'] < $city['se']) { $command = EncodeCommand(0, 0, 0, 7); } //정장
+            elseif($city['se'] < 99) { $command = EncodeCommand(0, 0, 0, 8); } //치안
+            else { $command = EncodeCommand(0, 0, 0, 9); } //조달
+        } else {
+            $command = EncodeCommand(0, 0, 0, 29);
+        }
+        break;
    case 2: //무내정장
        if($prob < 30) {
            if($city['de'] < 99) { $command = EncodeCommand(0, 0, 0, 5); } //수비
@@ -40,15 +56,34 @@ function SetDevelop($genType, $no, $city, $tech) {
        }
        break;
    case 1: //지장
+        if($prob < 40) {
+            if($city['po'] < $city['ag']) { $command = EncodeCommand(0, 0, 0, 7); } //정장
+            elseif($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            elseif($city['ag'] < 99) { $command = EncodeCommand(0, 0, 0, 1); } //농업
+            else { $command = EncodeCommand(0, 0, 0, 9); } //조달
+        } elseif($prob < 80) {
+            if($city['po'] < $city['co']) { $command = EncodeCommand(0, 0, 0, 7); } //정장
+            elseif($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            elseif($city['co'] < 99) { $command = EncodeCommand(0, 0, 0, 2); } //상업
+            else { $command = EncodeCommand(0, 0, 0, 9); } //조달
+        } elseif($prob < 90) {
+            if($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
+            elseif($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            else { $command = EncodeCommand(0, 0, 0, 9); } //조달
+        } else {
+            if($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3 + (rand() % 2) * 6); } //기술, 조달
+            else { $command = EncodeCommand(0, 0, 0, 29); }
+        }
+        break;
    case 3: //지내정장
        if($prob < 40) {
-            if($city['ag'] < 99) { $command = EncodeCommand(0, 0, 0, 1); } //농업
-            elseif($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            if($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            elseif($city['ag'] < 99) { $command = EncodeCommand(0, 0, 0, 1); } //농업
            elseif($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
            else { $command = EncodeCommand(0, 0, 0, 9); } //조달
        } elseif($prob < 80) {
-            if($city['co'] < 99) { $command = EncodeCommand(0, 0, 0, 2); } //상업
-            elseif($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            if($tech < 10000) { $command = EncodeCommand(0, 0, 0, 3); } //기술
+            elseif($city['co'] < 99) { $command = EncodeCommand(0, 0, 0, 2); } //상업
            elseif($city['po'] < 99) { $command = EncodeCommand(0, 0, 0, 7); } //정장
            else { $command = EncodeCommand(0, 0, 0, 9); } //조달
        } elseif($prob < 90) {
@@ -96,72 +131,7 @@ function SetCrew($no, $nationID, $personal, $gold, $leader, $genType, $tech, $de
    [$startyear, $year] = $gameStor->getValuesAsArray(['startyear', 'year']);
    $relYear = Util::valueFit($year-$startyear, 0);

-    $type = 0;
-    switch($genType) {
-    case 0: //무장
-    case 2: //무내정장
-        $dex0 = $dex0 + rand()%1000;
-        $dex10 = $dex10 + rand()%1000;
-        $dex20 = $dex20 + rand()%1000;
-        $sel = 0;
-        // 보궁기 선택
-        if($dex0 > $dex10) {
-            if($dex0 > $dex20) {
-                $sel = 0;
-            } else {
-                $sel = 2;
-            }
-        } else {
-            if($dex10 > $dex20) {
-                $sel = 1;
-            } else {
-                $sel = 2;
-            }
-        }
-
-        
-
-        $types = [];
-        switch($sel) {
-        case 0:
-            foreach(GameUnitConst::byType(GameUnitConst::T_FOOTMAN) as $crewtype){
-                if($crewtype->isValid($cities, $regions, $relYear, $tech)){
-                    $types[] = $crewtype->id;
-                }
-            }
-            break;
-        case 1:
-            foreach(GameUnitConst::byType(GameUnitConst::T_ARCHER) as $crewtype){
-                if($crewtype->isValid($cities, $regions, $relYear, $tech)){
-                    $types[] = $crewtype->id;
-                }
-            }
-            break;
-        case 2:
-            foreach(GameUnitConst::byType(GameUnitConst::T_CAVALRY) as $crewtype){
-                if($crewtype->isValid($cities, $regions, $relYear, $tech)){
-                    $types[] = $crewtype->id;
-                }
-            }
-            break;
-        }
-        break;
-    case 1: //지장
-    case 3: //지내정장
-        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;
-    }
+    $type = GameUnitConst::DEFAULT_CREWTYPE;

    

@@ -229,8 +229,6 @@ function process_1(&$general, $type) {
        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. $dtype 실패. <1>$date</>";
    } elseif($general['gold'] < $admin['develcost']) {
        $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. $dtype 실패. <1>$date</>";
-    } elseif($city["$stype"] >= $city["$stype"."2"]) {
-        $log[] = "<C>●</>{$admin['month']}월:{$dtype}{$btype} 충분합니다. $dtype 실패. <1>$date</>";
    } else {
        // 민심 50 이하이면 50과 같게
        if($city['rate'] < GameConst::$develrate) { $city['rate'] = GameConst::$develrate; }
@@ -278,19 +276,7 @@ function process_1(&$general, $type) {
        $exp = CharExperience($exp, $general['personal']);
        $ded = CharDedication($ded, $general['personal']);

-        if($city['front'] == 1){
-            if($city['city'] == $nation['capital']){
-                $degrade = 1 - ($admin['year'] - $admin['startyear'] - 5) * 0.025;
-                $score *= Util::valueFit($degrade, 0.5, 1);
-            }
-            else{
-                $score *= 0.5;
-            }
-            
-        }
-
        $score += $city["$stype"];
-        if($score > $city["{$stype}2"]) { $score = $city["{$stype}2"]; }
        // 내정 상승
        $query = "update city set {$stype}='$score' where city='{$general['city']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -538,8 +524,6 @@ function process_5(&$general, $type) {
        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. $dtype 실패. <1>$date</>";
    } elseif($general['gold'] < $admin['develcost']) {
        $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. $dtype 실패. <1>$date</>";
-    } elseif($city["$stype"] >= $city["$stype"."2"]) {
-        $log[] = "<C>●</>{$admin['month']}월:{$dtype}는 충분합니다. $dtype 실패. <1>$date</>";
    } else {
        // 민심 50 이하이면 50과 같게
        if($city['rate'] < GameConst::$develrate) { $city['rate'] = GameConst::$develrate; }
@@ -583,35 +567,11 @@ function process_5(&$general, $type) {
        $exp = $score * 0.7;
        $ded = $score * 1.0;

-        if($city['front'] == 1){
-            if($city['city'] == $nation['capital']){
-                if($stype == 'def'){
-                    $degrade = 1 - ($admin['year'] - $admin['startyear'] - 5) * 0.025;
-                    $score *= Util::valueFit($degrade, 0.5, 1);
-                }
-                else{
-                    $degrade = 1 - ($admin['year'] - $admin['startyear'] - 5) * 0.0375;
-                    $score *= Util::valueFit($degrade, 0.25, 1);
-                }
-            }
-            else{
-                if($stype == 'def'){
-                    $score *= 0.5;
-                }
-                else{
-                    $score *= 0.25;
-                }
-            }
-            
-            
-        }
-
        // 성격 보정
        $exp = CharExperience($exp, $general['personal']);
        $ded = CharDedication($ded, $general['personal']);

        $score += $city["$stype"];
-        if($score > $city["{$stype}2"]) { $score = $city["{$stype}2"]; }
        // 내정 상승
        $query = "update city set {$stype}='$score' where city='{$general['city']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -658,8 +618,6 @@ function process_7(&$general) {
        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. 정착 장려 실패. <1>$date</>";
    } elseif($general['rice'] < $admin['develcost'] * 2) {
        $log[] = "<C>●</>{$admin['month']}월:군량이 모자랍니다. 정착 장려 실패. <1>$date</>";
-    } elseif($city['pop'] >= $city['pop2']) {
-        $log[] = "<C>●</>{$admin['month']}월:이미 포화상태입니다. 정착 장려 실패. <1>$date</>";
    } else {
        $score = getGeneralLeadership($general, true, true, true);
        $score = $score * (100 + $general['explevel']/5)/100;
@@ -701,7 +659,6 @@ function process_7(&$general) {
        $ded = CharDedication($ded, $general['personal']);

        $score = $city['pop'] + ($score * 10);
-        if($score > $city['pop2']) { $score = $city['pop2']; }
        // 민심 상승
        $query = "update city set pop='$score' where city='{$general['city']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -799,7 +756,6 @@ function process_8(&$general) {
        $ded = CharDedication($ded, $general['personal']);

        $score += $city["$stype"];
-        if($score > $city["{$stype}2"]) { $score = $city["{$stype}2"]; }
        // 내정 상승
        $query = "update city set {$stype}='$score' where city='{$general['city']}'";
        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -2284,7 +2240,7 @@ function process_48(&$general) {
        $log[] = "<C>●</>{$admin['month']}월:도시에 상인이 없습니다. 장비매매 실패. <1>$date</>";
    } elseif($city['secu']/1000 < $type) {
        $log[] = "<C>●</>{$admin['month']}월:이 도시에서는 구할 수 없었습니다. 구입 실패. <1>$date</>";
-    } elseif($type > 6 || $type < 0) {
+    } elseif(($isweap == 2 && $type > 10) || ($isweap != 2 && $type > 6) || $type < 0) {
        $log[] = "<C>●</>{$admin['month']}월:구입할 수 있는 물건이 아닙니다. 구입 실패. <1>$date</>";
    } elseif($general['gold'] < $cost && $type != 0) {
        $log[] = "<C>●</>{$admin['month']}월:자금이 모자랍니다. 구입 실패. <1>$date</>";
@@ -55,8 +55,6 @@ function process_23(&$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($what == 1 && $amount <= 0) {
        $log[] = "<C>●</>{$admin['month']}월:국고가 부족합니다. 포상 실패. <1>$date</>";
    } elseif($what == 2 && $amount <= 0) {
@@ -150,8 +148,6 @@ function process_24(&$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($gen['nation'] != $general['nation']) {
        $log[] = "<C>●</>{$admin['month']}월:아국 장수가 아닙니다. 몰수 실패. <1>$date</>";
    } else {
@@ -257,10 +253,6 @@ function process_27(&$general) {
        $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. <Y>{$you['name']}</> 발령 실패. <1>$date</>";
    } elseif($city['nation'] != $general['nation']) {
        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. <Y>{$you['name']}</> 발령 실패. <1>$date</>";
-    } elseif($destcity['supply'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. <Y>{$you['name']}</> 발령 실패. <1>$date</>";
-    } elseif($city['supply'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. <Y>{$you['name']}</> 발령 실패. <1>$date</>";
    } elseif($destcity['nation'] != $general['nation']) {
        $log[] = "<C>●</>{$admin['month']}월:아국 도시가 아닙니다. <Y>{$you['name']}</> 발령 실패. <1>$date</>";
    } elseif($general['nation'] != $you['nation']) {
@@ -317,12 +309,7 @@ function process_51(&$general) {
        pushGenLog($general, ["<C>●</>{$month}월:아국이 아닙니다. 권고 실패. <1>$date</>"]);
        return;
    } 
-    
-    if($supply === 0) {
-        pushGenLog($general, ["<C>●</>{$month}월:고립된 도시입니다. 권고 실패. <1>$date</>"]);
-        return;
-    }
-    
+        
    // 상대에게 발송
    $src = new MessageTarget(
        $general['no'], 
@@ -415,8 +402,6 @@ function process_52(&$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</>";
    } else {
        // 본국 자원 감소
        $query = "update nation set gold=gold-'$gold',rice=rice-'$rice',surlimit=surlimit+12 where nation='{$general['nation']}'";
@@ -502,11 +487,6 @@ function process_53(&$general) {
        return;
    }
    
-    if($supply === 0) {
-        pushGenLog($general, ["<C>●</>{$month}월:고립된 도시입니다. 제의 실패. <1>$date</>"]);
-        return;
-    }
-
    // 상대에게 발송
    $src = new MessageTarget(
        $general['no'], 
@@ -576,12 +556,7 @@ function process_61(&$general) {
        pushGenLog($general, ["<C>●</>{$month}월:아국이 아닙니다. 제의 실패. <1>$date</>"]);
        return;
    }
-    
-    if($supply === 0) {
-        pushGenLog($general, ["<C>●</>{$month}월:고립된 도시입니다. 제의 실패. <1>$date</>"]);
-        return;
-    }
-    
+        
    // 상대에게 발송
    $src = new MessageTarget(
        $general['no'], 
@@ -668,8 +643,6 @@ function process_62(&$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($dip['state'] == 0) {
        $log[] = "<C>●</>{$admin['month']}월:아국과 이미 교전중입니다. 선포 실패. <1>$date</>";
    } elseif($dip['state'] == 1) {
@@ -765,11 +738,6 @@ function process_63(&$general) {
        return;
    }
    
-    if($supply === 0) {
-        pushGenLog($general, ["<C>●</>{$month}월:고립된 도시입니다. 제의 실패. <1>$date</>"]);
-        return;
-    }
-
    // 상대에게 발송
    $src = new MessageTarget(
        $general['no'], 
@@ -837,11 +805,6 @@ function process_64(&$general) {
        return;
    }
    
-    if($supply === 0) {
-        pushGenLog($general, ["<C>●</>{$month}월:고립된 도시입니다. 제의 실패. <1>$date</>"]);
-        return;
-    }
-
    // 상대에게 발송
    $src = new MessageTarget(
        $general['no'], 
@@ -922,8 +885,6 @@ function process_65(&$general) {
        $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 초토화 실패. <1>$date</>";
    } elseif($nation['capital'] == $destcity['city']) {
        $log[] = "<C>●</>{$admin['month']}월:수도입니다. 초토화 실패. <1>$date</>";
-    } elseif($city['supply'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. 초토화 실패. <1>$date</>";
    } elseif($destcity['nation'] != $general['nation']) {
        $log[] = "<C>●</>{$admin['month']}월:아국 영토가 아닙니다. 초토화 실패. <1>$date</>";
    } elseif($citycount <= 4) {
@@ -1011,8 +972,6 @@ function process_66(&$general) {
        $log[] = "<C>●</>{$admin['month']}월:아국이 아닙니다. 천도 실패. <1>$date</>";
    } elseif($general['level'] < 5) {
        $log[] = "<C>●</>{$admin['month']}월:수뇌부가 아닙니다. 천도 실패. <1>$date</>";
-    } elseif($city['supply'] == 0) {
-        $log[] = "<C>●</>{$admin['month']}월:고립된 도시입니다. 천도 실패. <1>$date</>";
    } elseif($destcity['nation'] != $general['nation']) {
        $log[] = "<C>●</>{$admin['month']}월:아국 영토가 아닙니다. 천도 실패. <1>$date</>";
    } elseif($destcity['city'] == $nation['capital'] || !key_exists($destcity['city'], $nearCities)){
@@ -2088,7 +2047,7 @@ function process_76(&$general) {
                    '$npccount','$npc','$npc','$affinity','$name','$picture','{$nation['nation']}',
                    '{$general['city']}','$leader','$power','$intel','{$avgGen['exp']}','{$avgGen['ded']}',
                    '1','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0',
-                    '0','0','0','$turntime','$killturn','{$avgGen['age']}','1','$personal','0','0','0','0','',
+                    '0','0','0','$turntime','$killturn','{$avgGen['age']}','1','$personal','20','0','70','0','',
                    '0','$bornyear','$deadyear',
                    '{$dexVal[0]}','{$dexVal[1]}','{$dexVal[2]}','{$dexVal[3]}','{$avgGen['dex40']}'
                )",
@@ -495,8 +495,8 @@ function process_29(&$general) {
            $bornyear = $admin['year'];
            $deadyear = $admin['year'] + 3;
            $age = 20;
-            $specage = Util::round((GameConst::$retirementYear - $age)/12) + $age;
-            $specage2 = Util::round((GameConst::$retirementYear - $age)/3) + $age;
+            $specage = $age;
+            $specage2 = $age;
            //$specage = $age + 1 + rand() % 3;
            //$specage2 = $age + 5 + rand() % 5;
            // 20년 ~ 50년
@@ -514,7 +514,7 @@ function process_29(&$general) {
                    '$npccount','$npc','$npc','$affinity','$name','$picture','$scoutNation',
                    '{$general['city']}','$leader','$power','$intel','{$avgGen['exp']}','{$avgGen['ded']}',
                    '$scoutLevel','100','100','0','".GameUnitConst::DEFAULT_CREWTYPE."','0','0','0',
-                    '0','0','0','$turntime','$killturn','$age','1','$personal','0','$specage','0','$specage2','',
+                    '0','0','0','$turntime','$killturn','$age','1','$personal','20','$specage','70','$specage2','',
                    '0','$bornyear','$deadyear',
                    '{$dexVal[0]}','{$dexVal[1]}','{$dexVal[2]}','{$dexVal[3]}','{$avgGen['dex40']}'
                )",
@@ -160,11 +160,16 @@ function popIncrease() {
            $wall = $city['wall'];
        } else {
            $ratio = (20 - $rate[$city['nation']])/200;  // 20일때 0% 0일때 10% 100일때 -40%
-            $agri = $city['agri'] + intval($city['agri'] * $ratio);  //내정도 증감
-            $comm = $city['comm'] + intval($city['comm'] * $ratio);
-            $secu = $city['secu'] + intval($city['secu'] * $ratio);
-            $def  = $city['def']  + intval($city['def']  * $ratio);
-            $wall = $city['wall'] + intval($city['wall'] * $ratio);
+            $agri = $city['agri'];  //내정도 증감
+            $comm = $city['comm'];
+            $secu = $city['secu'];
+            $def  = $city['def'] ;
+            $wall = $city['wall'];
+            if($ratio < 0 || $city['agri'] < $city['agri2']) $agri += intval($city['agri'] * $ratio);  //내정도 증감
+            if($ratio < 0 || $city['comm'] < $city['comm2']) $comm += intval($city['comm'] * $ratio);
+            if($ratio < 0 || $city['secu'] < $city['secu2']) $secu += intval($city['secu'] * $ratio);
+            if($ratio < 0 || $city['def']  < $city['def2'] ) $def  += intval($city['def']  * $ratio);
+            if($ratio < 0 || $city['wall'] < $city['wall2']) $wall += intval($city['wall'] * $ratio);
            $ratio = (30 - $rate[$city['nation']])/200;  // 20일때 5% 5일때 12.5% 50일때 -10%
            if($ratio >= 0) {
                // 국가보정
@@ -178,7 +183,10 @@ function popIncrease() {
                $ratio *= (1 - $city['secu']/$city['secu2']/10);    //치안에 따라 최대 10% 경감
            }

-            $pop = $city['pop'] + (int)($city['pop'] * $ratio) + 5000;  // 기본 5000명은 증가
+            if($ratio < 0 || $city['pop'] < $city['pop2']){
+                $pop = $city['pop'] + (int)($city['pop'] * $ratio) + 5000;  // 기본 5000명은 증가
+            }
+            

            $ratio = round($ratio*100, 2);
            $cityrate = $city['rate'];
@@ -186,13 +194,7 @@ function popIncrease() {
            if($cityrate > 100) { $cityrate = 100; }
            if($cityrate < 0) { $cityrate = 0; }
        }
-        if($pop > $city['pop2']) { $pop = $city['pop2']; }
        if($pop < 0) { $pop = 0; }
-        if($agri > $city['agri2']) { $agri = $city['agri2']; }
-        if($comm > $city['comm2']) { $comm = $city['comm2']; }
-        if($secu > $city['secu2']) { $secu = $city['secu2']; }
-        if($def > $city['def2']) { $def= $city['def2']; }
-        if($wall > $city['wall2']) { $wall = $city['wall2']; }

        //시세
        $query = "update city set pop='$pop',rate='$cityrate',agri='$agri',comm='$comm',secu='$secu',def='$def',wall='$wall' where city='{$city['city']}'";
@@ -721,13 +723,7 @@ function disaster() {
                $city['comm'] *= $ratio;  $city['secu'] *= $ratio;  $city['def'] *= $ratio;
                $city['wall'] *= $ratio;
        
-                if($city['pop'] > $city['pop2']) { $city['pop'] = $city['pop2']; }
                if($city['rate'] > 100) { $city['rate'] = 100; }
-                if($city['agri'] > $city['agri2']) { $city['agri'] = $city['agri2']; }
-                if($city['comm'] > $city['comm2']) { $city['comm'] = $city['comm2']; }
-                if($city['secu'] > $city['secu2']) { $city['secu'] = $city['secu2']; }
-                if($city['def'] > $city['def2']) { $city['def'] = $city['def2']; }
-                if($city['wall'] > $city['wall2']) { $city['wall'] = $city['wall2']; }
        
                $query = "update city set state='$state',pop='{$city['pop']}',rate='{$city['rate']}',agri='{$city['agri']}',comm='{$city['comm']}',secu='{$city['secu']}',def='{$city['def']}',wall='{$city['wall']}' where city='$disastercity[$i]'";
                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -111,9 +111,9 @@ $generalCheck = [
    'between'=>[
        ['train', [40, GameConst::$maxTrainByWar]],
        ['atmos', [40, GameConst::$maxAtmosByWar]],
-        ['book', [0, 26]],
-        ['weap', [0, 26]],
-        ['horse', [0, 26]],
+        ['book', [0, 6]],
+        ['weap', [0, 6]],
+        ['horse', [0, 40]],
        ['item', [0, 26]],
        ['explevel', [0, 300]],
        ['injury', [0, 80]],
@@ -157,17 +157,13 @@ $admin = $gameStor->getValues(['scenario', 'turnterm', 'show_img_level', 'starty
 $relYear = Util::valueFit($admin['year'] - $admin['startyear'], 0);

 $age = 20 + ($pleader + $ppower + $pintel) * 2 - (mt_rand(0, 1));
-// 아직 남았고 천재등록상태이면 특기 부여
-if ($genius) {
-    $specage2 = $age;
-    $special2 = getSpecial2($leader, $power, $intel);
-} else {
-    $specage2 = Util::valueFit(Util::round((GameConst::$retirementYear - $age)/4 - $relYear / 2), 3) + $age;
-    $special2 = 0;
-}
+// 특기 부여
+$specage2 = $age;
+$special2 = 70;
+
 //내특
-$specage = Util::valueFit(Util::round((GameConst::$retirementYear - $age)/12 - $relYear / 2), 3) + $age;
-$special = 0;
+$specage = $age;
+$special = 20;

 if ($admin['scenario'] >= 1000) {
    $specage2 = $age + 3;
@@ -256,14 +252,8 @@ $log = [];
 $mylog = [];

 $josaRa = JosaUtil::pick($name, '라');
-if ($genius) {
-    $log[0] = "<C>●</>{$gameStor->month}월:<G><b>{$cityname}</b></>에서 <Y>{$name}</>{$josaRa}는 기재가 천하에 이름을 알립니다.";
-    $log[1] = "<C>●</>{$gameStor->month}월:<C>".getGenSpecial($special2)."</> 특기를 가진 <C>천재</>의 등장으로 온 천하가 떠들썩합니다.";
+$log[0] = "<C>●</>{$gameStor->month}월:<G><b>{$cityname}</b></>에서 <Y>{$name}</>{$josaRa}는 호걸이 천하에 이름을 알립니다.";

-    pushWorldHistory(["<C>●</>{$gameStor->year}년 {$gameStor->month}월:<L><b>【천재】</b></><G><b>{$cityname}</b></>에 천재가 등장했습니다."], $gameStor->year, $gameStor->month);
-} else {
-    $log[0] = "<C>●</>{$gameStor->month}월:<G><b>{$cityname}</b></>에서 <Y>{$name}</>{$josaRa}는 호걸이 천하에 이름을 알립니다.";
-}
 pushGeneralHistory($me, "<C>●</>{$gameStor->year}년 {$gameStor->month}월:<Y>{$name}</>, <G>{$cityname}</>에서 큰 뜻을 품다.");
 $mylog[] = "<C>●</>삼국지 모의전투 PHP의 세계에 오신 것을 환영합니다 ^o^";
 $mylog[] = "<C>●</>처음 하시는 경우에는 <D>도움말</>을 참고하시고,";
@@ -271,10 +261,7 @@ $mylog[] = "<C>●</>문의사항이 있으시면 게시판에 글을 남겨주
 $mylog[] = "<C>●</>부디 즐거운 삼모전 되시길 바랍니다 ^^";
 $mylog[] = "<C>●</>통솔 <C>$pleader</> 무력 <C>$ppower</> 지력 <C>$pintel</> 의 보너스를 받으셨습니다.";
 $mylog[] = "<C>●</>연령은 <C>$age</>세로 시작합니다.";
-if ($genius) {
-    $mylog[] = "<C>●</>축하합니다! 천재로 태어나 처음부터 <C>".getGenSpecial($special2)."</> 특기를 가지게 됩니다!";
-    pushGeneralHistory($me, "<C>●</>{$gameStor->year}년 {$gameStor->month}월:<C>".getGenSpecial($special2)."</> 특기를 가진 천재로 탄생.");
-}
+
 pushGenLog($me, $mylog);
 pushGeneralPublicRecord($log, $gameStor->year, $gameStor->month);

@@ -725,9 +725,9 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) {
        'supply'=>1,
        'term'=>0,
        'conflict'=>'{}',
-        'agri'=>$db->sqleval('agri*0.7'),
-        'comm'=>$db->sqleval('comm*0.7'),
-        'secu'=>$db->sqleval('secu*0.7'),
+        'agri'=>$db->sqleval('GREATEST(agri*0.7, agri2*0.25)'),
+        'comm'=>$db->sqleval('GREATEST(comm*0.7, comm2*0.25)'),
+        'secu'=>$db->sqleval('GREATEST(secu*0.7, secu2*0.25)'),
        'nation'=>$conquerNation,
        'gen1'=>0,
        'gen2'=>0,
@@ -736,13 +736,8 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) {
        'gen2set'=>0,
        'gen3set'=>0
    ];
-    if($city['level'] > 3) {
-        $query['def'] = 1000;
-        $query['wall'] = 1000;
-    } else {
-        $query['def'] = $db->sqleval('def2/2');
-        $query['wall'] = $db->sqleval('wall2/2');
-    }
+    $query['def'] = $db->sqleval('def2/2');
+    $query['wall'] = $db->sqleval('wall2/2');
    
    $db->update('city', $query, 'city=%i', (int)$city['city']);
    //전방설정
@@ -1367,7 +1367,7 @@ function command_48($turn, $command) {

    $color = [];

-    for($i=1; $i <= 6; $i++) {
+    for($i=1; $i <= 10; $i++) {
        if($city['secu'] >= $i*1000) {
            $color[$i] = "white";
        } else {
@@ -1402,6 +1402,10 @@ function command_48($turn, $command) {
    <option value=204 style=color:$color[4]>".getHorseName(4)."&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;가격: ".getItemCost(4)."</option>
    <option value=205 style=color:$color[5]>".getHorseName(5)."&nbsp;&nbsp;&nbsp;&nbsp;가격: ".getItemCost(5)."</option>
    <option value=206 style=color:$color[6]>".getHorseName(6)."&nbsp;&nbsp;&nbsp;&nbsp;가격: ".getItemCost(6)."</option>
+    <option value=207 style=color:$color[7]>".getHorseName(7)."&nbsp;&nbsp;&nbsp;&nbsp;가격: ".getItemCost(7)."</option>
+    <option value=208 style=color:$color[8]>".getHorseName(8)."&nbsp;&nbsp;&nbsp;&nbsp;가격: ".getItemCost(8)."</option>
+    <option value=209 style=color:$color[9]>".getHorseName(9)."&nbsp;&nbsp;&nbsp;&nbsp;가격: ".getItemCost(9)."</option>
+    <option value=210 style=color:$color[10]>".getHorseName(10)."&nbsp;&nbsp;&nbsp;&nbsp;가격: ".getItemCost(10)."</option>
    <option value=300 style=color:skyblue>_____도구매각(반값)____</option>
    <option value=301 style=color:$color[1]>".getItemName(1)."&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;가격: ".getItemCost2(1)."</option>
    <option value=302 style=color:$color[2]>".getItemName(2)."&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;가격: ".getItemCost2(2)."</option>
@@ -349,6 +349,12 @@ class CityConstBase{
            ] + $initValue + static::$buildInitCommon;
        }, array_values(static::$constID));

-        DB::db()->insert('city', $queries);
+        $db = DB::db();
+        $db->insert('city', $queries);
+        $db->update('city', [
+            'agri'=>$db->sqleval('agri2 * 0.25'),
+            'comm'=>$db->sqleval('comm2 * 0.25'),
+            'secu'=>$db->sqleval('secu2 * 0.25'),
+        ], true);
    }
 }
@@ -72,7 +72,7 @@ class GameConstBase
    /** @var int 최대 계급 */
    public static $maxDedLevel = 30;
    /** @var int 최대 기술 레벨 */
-    public static $maxTechLevel = 12;
+    public static $maxTechLevel = 15;

    /** @var int 초기 제한시 장수 제한 */
    public static $initialNationGenLimitForRandInit = 3;
@@ -10,29 +10,5 @@
    },
    "history": [
        "<C>●</>180년 1월:<L><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":[
-
    ]
 }
@@ -0,0 +1,507 @@
+{
+    "title":"【공백지】 충차전(디버그)",
+    "startYear":180,
+    "map":{
+        "mapName":"che",
+        "unitSet":"siegetank"
+    },
+    "stat":{
+        "chiefMin":9
+    },
+    "history": [
+        "<C>●</>180년 1월:<L><b>【이벤트】</b></>병기로 싸운다! 최고의 충차 지휘관을 가린다"
+    ],
+    "general":[
+        [1,"소제1",1001,0,null,20,10,48,0,160,300,"유지","저격"],
+        [1,"헌제",1002,0,null,17,10,61,0,160,300,"안전","저격"],
+        [999,"사마휘",1003,0,null,71,10,65,0,160,300,"은둔","저격","좋지, 좋아~"],
+        [999,"우길",1004,0,null,17,10,65,0,160,300,"은둔","저격"],
+        [999,"화타",1005,0,null,53,10,65,0,160,300,"은둔","저격","아픈 사람들은 모두 내게 오시오. 껄껄껄."],
+        [999,"길평",1006,0,null,27,10,65,0,160,300,"은둔","저격"],
+        [29,"가규",1007,0,null,55,10,65,0,160,300,"재간","저격"],
+        [136,"가범",1008,0,null,58,10,65,0,160,300,"유지","저격"],
+        [49,"가비능",1009,0,null,58,65,10,0,160,300,"정복","저격"],
+        [31,"가충",1010,0,null,50,10,65,0,160,300,"출세","저격"],
+        [20,"가후",1011,0,null,69,10,65,0,160,300,"할거","저격"],
+        [73,"간옹",1012,0,null,31,10,65,0,160,300,"안전","저격"],
+        [129,"감녕",1013,0,null,75,10,65,0,160,300,"출세","저격"],
+        [127,"감택",1014,0,null,62,10,65,0,160,300,"유지","저격"],
+        [60,"강단",1015,0,null,41,65,10,0,160,300,"재간","저격"],
+        [73,"강유",1016,0,null,75,10,65,0,160,300,"왕좌","저격","갈고 닦은 무예와 승상께 배운 책략을 발휘해 보이겠다!"],
+        [102,"고간",1017,0,null,60,57,10,0,160,300,"유지","저격"],
+        [27,"고람",1018,0,null,72,65,10,0,160,300,"출세","저격"],
+        [69,"고상",1019,0,null,41,40,10,0,160,300,"재간","저격"],
+        [144,"고순",1020,0,null,75,10,65,0,160,300,"의협","저격"],
+        [7,"고승",1021,0,null,42,65,10,0,160,300,"출세","저격"],
+        [120,"고옹",1022,0,null,57,10,65,0,160,300,"출세","저격"],
+        [63,"고정",1023,0,null,67,65,10,0,160,300,"정복","저격"],
+        [53,"고패",1024,0,null,53,56,10,0,160,300,"유지","저격"],
+        [74,"공도",1025,0,null,26,65,10,0,160,300,"재간","저격"],
+        [142,"공손강",1026,0,null,64,65,10,0,160,300,"정복","저격"],
+        [142,"공손공",1027,0,null,68,10,65,0,160,300,"정복","저격"],
+        [142,"공손도",1028,0,null,62,65,10,0,160,300,"정복","저격"],
+        [65,"공손범",1029,0,null,61,65,10,0,160,300,"출세","저격"],
+        [65,"공손속",1030,0,null,60,65,10,0,160,300,"정복","저격"],
+        [10,"공손연",1031,0,null,74,65,10,0,160,300,"패권","저격"],
+        [65,"공손월",1032,0,null,47,63,10,0,160,300,"정복","저격"],
+        [65,"공손찬",1033,0,null,61,10,65,0,160,300,"패권","저격"],
+        [43,"공융",1034,0,null,63,10,65,0,160,300,"왕좌","저격"],
+        [35,"공주",1035,0,null,64,10,65,0,160,300,"재간","저격"],
+        [83,"공지",1036,0,null,57,10,64,0,160,300,"대의","저격"],
+        [26,"곽가",1037,0,null,47,10,65,0,160,300,"패권","저격"],
+        [111,"곽도",1038,0,null,63,10,65,0,160,300,"재간","저격"],
+        [2,"곽사",1039,0,null,58,65,10,0,160,300,"패권","저격"],
+        [80,"곽유지",1040,0,null,37,10,65,0,160,300,"재간","저격"],
+        [67,"곽익",1041,0,null,67,10,65,0,160,300,"재간","저격"],
+        [67,"곽준",1042,0,null,75,10,65,0,160,300,"출세","저격"],
+        [27,"곽혁",1043,0,null,40,10,65,0,160,300,"안전","저격"],
+        [20,"곽회",1044,0,null,75,10,65,0,160,300,"정복","저격"],
+        [39,"관구검",1045,0,null,72,10,65,0,160,300,"대의","저격"],
+        [76,"관색",1046,0,null,69,10,65,0,160,300,"의협","저격"],
+        [76,"관우",1047,0,null,75,10,65,0,160,300,"의협","저격","나의 청룡 언월도를 과연 막아낼 수 있겠소?"],
+        [76,"관이",1048,0,null,48,60,10,0,160,300,"안전","저격"],
+        [76,"관통",1049,0,null,49,63,10,0,160,300,"대의","저격"],
+        [76,"관평",1050,0,null,75,10,65,0,160,300,"의협","저격"],
+        [7,"관해",1051,0,null,66,65,10,0,160,300,"출세","저격"],
+        [76,"관흥",1052,0,null,69,10,65,0,160,300,"의협","저격"],
+        [40,"괴량",1053,0,null,41,10,65,0,160,300,"안전","저격"],
+        [40,"괴월",1054,0,null,26,10,65,0,160,300,"유지","저격"],
+        [98,"교모",1055,0,null,59,10,61,0,160,300,"안전","저격"],
+        [98,"교현",1056,0,null,50,10,60,0,160,300,"재간","저격"],
+        [6,"구역거",1057,0,null,51,65,10,0,160,300,"안전","저격"],
+        [80,"극정",1058,0,null,38,10,65,0,160,300,"유지","저격"],
+        [46,"금선",1059,0,null,55,49,10,0,160,300,"할거","저격"],
+        [62,"금환삼결",1060,0,null,46,65,10,0,160,300,"출세","저격"],
+        [141,"기령",1061,0,null,75,65,10,0,160,300,"대의","저격"],
+        [122,"낙통",1062,0,null,57,10,65,0,160,300,"유지","저격"],
+        [124,"노숙1",1063,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [75,"노식",1064,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [59,"뇌동",1065,0,null,70,65,10,0,160,300,"출세","저격"],
+        [142,"뇌박",1066,0,null,54,54,10,0,160,300,"유지","저격"],
+        [127,"능조",1067,0,null,67,65,10,0,160,300,"재간","저격"],
+        [127,"능통",1068,0,null,71,65,10,0,160,300,"의협","저격"],
+        [64,"단경",1069,0,null,68,10,65,0,160,300,"정복","저격"],
+        [132,"담웅",1070,0,null,52,65,10,0,160,300,"출세","저격"],
+        [99,"답둔",1071,0,null,59,65,10,0,160,300,"유지","저격"],
+        [132,"당자",1072,0,null,59,56,10,0,160,300,"안전","저격"],
+        [60,"대래동주",1073,0,null,40,65,10,0,160,300,"안전","저격"],
+        [82,"도겸",1074,0,null,51,10,61,0,160,300,"할거","저격"],
+        [120,"도준",1075,0,null,64,57,10,0,160,300,"안전","저격"],
+        [73,"동궐",1076,0,null,66,10,65,0,160,300,"대의","저격"],
+        [62,"동다나",1077,0,null,51,65,10,0,160,300,"유지","저격"],
+        [2,"동민",1078,0,null,52,65,10,0,160,300,"안전","저격"],
+        [21,"동소",1079,0,null,46,10,62,0,160,300,"패권","저격"],
+        [127,"동습",1080,0,null,53,64,10,0,160,300,"출세","저격"],
+        [89,"동승",1081,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [78,"동윤",1082,0,null,64,10,65,0,160,300,"왕좌","저격"],
+        [2,"동탁",1083,0,null,75,65,10,0,160,300,"패권","저격"],
+        [66,"동화",1084,0,null,48,64,10,0,160,300,"대의","저격"],
+        [32,"두예",1085,0,null,75,10,65,0,160,300,"정복","저격"],
+        [7,"등무",1086,0,null,43,65,10,0,160,300,"정복","저격"],
+        [41,"등애",1087,0,null,75,10,65,0,160,300,"패권","저격"],
+        [116,"등윤",1088,0,null,34,10,65,0,160,300,"안전","저격"],
+        [73,"등지",1089,0,null,74,10,65,0,160,300,"할거","저격"],
+        [41,"등충",1090,0,null,60,65,10,0,160,300,"출세","저격"],
+        [54,"등현",1091,0,null,65,10,61,0,160,300,"출세","저격"],
+        [29,"마균",1092,0,null,33,10,65,0,160,300,"안전","저격"],
+        [71,"마대",1093,0,null,75,65,10,0,160,300,"대의","저격"],
+        [70,"마등",1094,0,null,75,65,10,0,160,300,"왕좌","저격"],
+        [80,"마속",1095,0,null,73,10,65,0,160,300,"패권","저격"],
+        [77,"마량",1096,0,null,57,10,65,0,160,300,"왕좌","저격"],
+        [48,"마완",1097,0,null,49,64,10,0,160,300,"안전","저격"],
+        [19,"마준",1098,0,null,45,63,10,0,160,300,"안전","저격"],
+        [71,"마철",1099,0,null,71,60,10,0,160,300,"대의","저격"],
+        [70,"마초",1100,0,null,75,65,10,0,160,300,"대의","저격","금마초 나가신닷!"],
+        [131,"마충1",1101,0,null,67,62,10,0,160,300,"재간","저격"],
+        [69,"마충2",1102,0,null,61,65,10,0,160,300,"출세","저격"],
+        [71,"마휴",1103,0,null,71,60,10,0,160,300,"대의","저격"],
+        [116,"만총",1104,0,null,75,10,65,0,160,300,"할거","저격"],
+        [51,"망아장",1105,0,null,29,64,10,0,160,300,"출세","저격"],
+        [44,"맹달",1106,0,null,70,10,65,0,160,300,"할거","저격"],
+        [60,"맹우",1107,0,null,63,65,10,0,160,300,"정복","저격"],
+        [60,"맹획",1108,0,null,75,65,10,0,160,300,"왕좌","저격"],
+        [29,"모개",1109,0,null,46,10,56,0,160,300,"대의","저격"],
+        [51,"목록대왕",1110,0,null,58,10,65,0,160,300,"재간","저격"],
+        [96,"목순",1111,0,null,17,10,65,0,160,300,"왕좌","저격"],
+        [43,"무안국",1112,0,null,51,65,10,0,160,300,"재간","저격"],
+        [28,"문빙",1113,0,null,70,65,10,0,160,300,"유지","저격"],
+        [38,"문앙",1114,0,null,71,65,10,0,160,300,"대의","저격"],
+        [102,"문추",1115,0,null,72,65,10,0,160,300,"출세","저격"],
+        [38,"문흠",1116,0,null,75,65,10,0,160,300,"대의","저격"],
+        [49,"미당대왕",1117,0,null,64,65,10,0,160,300,"유지","저격"],
+        [108,"미방",1118,0,null,58,65,10,0,160,300,"패권","저격"],
+        [77,"미축",1119,0,null,26,10,65,0,160,300,"왕좌","저격"],
+        [94,"반봉",1120,0,null,61,65,10,0,160,300,"출세","저격"],
+        [44,"반준",1121,0,null,41,10,65,0,160,300,"안전","저격"],
+        [65,"방덕",1122,0,null,75,10,65,0,160,300,"의협","저격"],
+        [73,"방통",1123,0,null,75,10,65,0,160,300,"패권","저격"],
+        [65,"방회",1124,0,null,25,10,59,0,160,300,"안전","저격"],
+        [68,"배원소",1125,0,null,45,65,10,0,160,300,"재간","저격"],
+        [78,"번건",1126,0,null,28,10,65,0,160,300,"대의","저격"],
+        [149,"번주",1127,0,null,67,65,10,0,160,300,"할거","저격"],
+        [72,"법정",1128,0,null,75,10,65,0,160,300,"패권","저격"],
+        [8,"변희",1129,0,null,65,65,10,0,160,300,"안전","저격"],
+        [121,"보질",1130,0,null,58,10,65,0,160,300,"유지","저격"],
+        [113,"복양흥",1131,0,null,58,10,65,0,160,300,"유지","저격"],
+        [110,"봉기",1132,0,null,68,10,65,0,160,300,"패권","저격"],
+        [74,"부동",1133,0,null,58,10,65,0,160,300,"대의","저격"],
+        [108,"부사인",1134,0,null,54,59,10,0,160,300,"출세","저격"],
+        [38,"부손",1135,0,null,24,10,65,0,160,300,"안전","저격"],
+        [74,"부첨",1136,0,null,61,65,10,0,160,300,"대의","저격"],
+        [66,"비시",1137,0,null,18,10,61,0,160,300,"재간","저격"],
+        [141,"비연",1138,0,null,66,65,10,0,160,300,"출세","저격"],
+        [77,"비위",1139,0,null,72,10,65,0,160,300,"대의","저격"],
+        [144,"사광",1140,0,null,57,10,65,0,160,300,"안전","저격"],
+        [71,"사마가",1141,0,null,61,65,10,0,160,300,"정복","저격"],
+        [20,"사마랑",1142,0,null,25,10,63,0,160,300,"대의","저격"],
+        [24,"사마망",1143,0,null,71,10,65,0,160,300,"정복","저격"],
+        [24,"사마부",1144,0,null,55,10,65,0,160,300,"대의","저격"],
+        [31,"사마사",1145,0,null,75,10,65,0,160,300,"정복","저격"],
+        [31,"사마소",1146,0,null,75,10,65,0,160,300,"정복","저격"],
+        [31,"사마염",1147,0,null,75,10,65,0,160,300,"패권","저격"],
+        [30,"사마유",1148,0,null,62,10,65,0,160,300,"왕좌","저격"],
+        [31,"사마의",1149,0,null,75,10,65,0,160,300,"패권","저격"],
+        [139,"사섭",1150,0,null,63,10,65,0,160,300,"안전","저격"],
+        [139,"사일",1151,0,null,59,10,65,0,160,300,"유지","저격"],
+        [132,"사정",1152,0,null,67,65,10,0,160,300,"안전","저격"],
+        [146,"사지",1153,0,null,61,10,65,0,160,300,"안전","저격"],
+        [144,"사휘",1154,0,null,67,65,10,0,160,300,"유지","저격"],
+        [35,"서막",1155,0,null,56,10,65,0,160,300,"유지","저격"],
+        [76,"서서",1156,0,null,75,10,65,0,160,300,"의협","저격"],
+        [124,"서성",1157,0,null,75,10,65,0,160,300,"대의","저격"],
+        [142,"서영",1158,0,null,47,63,10,0,160,300,"안전","저격"],
+        [23,"서질",1159,0,null,55,65,10,0,160,300,"재간","저격"],
+        [23,"서황",1160,0,null,75,10,65,0,160,300,"의협","저격"],
+        [32,"석포",1161,0,null,71,63,10,0,160,300,"정복","저격"],
+        [131,"설영",1162,0,null,46,10,64,0,160,300,"유지","저격"],
+        [128,"설종",1163,0,null,27,10,65,0,160,300,"유지","저격"],
+        [69,"성의",1164,0,null,45,64,10,0,160,300,"재간","저격"],
+        [129,"소비",1165,0,null,67,63,10,0,160,300,"대의","저격"],
+        [76,"손건",1166,0,null,42,10,65,0,160,300,"대의","저격"],
+        [125,"손견",1167,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [126,"손광",1168,0,null,63,10,58,0,160,300,"유지","저격"],
+        [125,"손권",1169,0,null,75,10,65,0,160,300,"할거","저격"],
+        [126,"손랑",1170,0,null,27,54,10,0,160,300,"안전","저격"],
+        [126,"손등",1171,0,null,52,10,65,0,160,300,"할거","저격"],
+        [125,"손량",1172,0,null,24,10,65,0,160,300,"할거","저격"],
+        [20,"손례",1173,0,null,64,10,65,0,160,300,"안전","저격"],
+        [124,"손소",1174,0,null,75,10,65,0,160,300,"정복","저격"],
+        [130,"손수",1175,0,null,67,10,59,0,160,300,"안전","저격"],
+        [126,"손유",1176,0,null,75,10,65,0,160,300,"정복","저격"],
+        [122,"손이",1177,0,null,57,62,10,0,160,300,"안전","저격"],
+        [126,"손정",1178,0,null,59,10,62,0,160,300,"유지","저격"],
+        [115,"손준",1179,0,null,59,65,10,0,160,300,"정복","저격"],
+        [7,"손중",1180,0,null,53,63,10,0,160,300,"안전","저격"],
+        [125,"손책",1181,0,null,75,10,65,0,160,300,"패권","저격","소패왕 손책이 나가신다! 길을 비켜라!"],
+        [115,"손침",1182,0,null,49,65,10,0,160,300,"패권","저격"],
+        [114,"손호",1183,0,null,20,10,65,0,160,300,"패권","저격"],
+        [126,"손화",1184,0,null,35,10,65,0,160,300,"왕좌","저격"],
+        [127,"손환",1185,0,null,75,10,65,0,160,300,"정복","저격"],
+        [126,"손휴",1186,0,null,63,10,64,0,160,300,"정복","저격"],
+        [117,"손흠",1187,0,null,66,63,10,0,160,300,"정복","저격"],
+        [147,"송헌",1188,0,null,42,63,10,0,160,300,"안전","저격"],
+        [95,"순우경",1189,0,null,72,65,10,0,160,300,"할거","저격"],
+        [22,"순욱1",1190,0,null,54,10,65,0,160,300,"왕좌","저격"],
+        [22,"순유",1191,0,null,73,10,65,0,160,300,"대의","저격"],
+        [29,"신비",1192,0,null,47,10,65,0,160,300,"재간","저격"],
+        [37,"신의",1193,0,null,55,61,10,0,160,300,"출세","저격"],
+        [37,"신탐",1194,0,null,56,58,10,0,160,300,"출세","저격"],
+        [85,"신평",1195,0,null,68,10,65,0,160,300,"왕좌","저격"],
+        [102,"심배",1196,0,null,75,10,65,0,160,300,"패권","저격"],
+        [126,"심영",1197,0,null,53,65,10,0,160,300,"재간","저격"],
+        [47,"아하소과",1198,0,null,53,65,10,0,160,300,"안전","저격"],
+        [62,"아회남",1199,0,null,50,65,10,0,160,300,"출세","저격"],
+        [23,"악진",1200,0,null,73,65,10,0,160,300,"대의","저격"],
+        [23,"악침",1201,0,null,45,52,10,0,160,300,"대의","저격"],
+        [63,"악환",1202,0,null,54,65,10,0,160,300,"재간","저격"],
+        [102,"안량",1203,0,null,73,65,10,0,160,300,"출세","저격"],
+        [14,"양백",1204,0,null,55,54,10,0,160,300,"안전","저격"],
+        [92,"양봉1",1205,0,null,57,64,10,0,160,300,"유지","저격"],
+        [91,"양봉2",1206,0,null,62,65,10,0,160,300,"정복","저격"],
+        [13,"양송",1207,0,null,15,35,10,0,160,300,"안전","저격"],
+        [43,"양수",1208,0,null,18,10,65,0,160,300,"재간","저격"],
+        [61,"양의",1209,0,null,67,10,65,0,160,300,"유지","저격"],
+        [141,"양조1",1210,0,null,68,10,60,0,160,300,"출세","저격"],
+        [9,"양추1",1211,0,null,51,65,10,0,160,300,"정복","저격"],
+        [31,"양호",1212,0,null,75,10,65,0,160,300,"패권","저격"],
+        [53,"양회",1213,0,null,60,65,10,0,160,300,"출세","저격"],
+        [141,"양흥",1214,0,null,52,65,10,0,160,300,"안전","저격"],
+        [6,"어부라",1215,0,null,75,65,10,0,160,300,"정복","저격"],
+        [64,"엄강",1216,0,null,57,65,10,0,160,300,"재간","저격"],
+        [10,"엄백호",1217,0,null,48,65,10,0,160,300,"할거","저격"],
+        [10,"엄여",1218,0,null,35,65,10,0,160,300,"할거","저격"],
+        [69,"엄안",1219,0,null,72,10,65,0,160,300,"왕좌","저격"],
+        [7,"엄정",1220,0,null,31,65,10,0,160,300,"출세","저격"],
+        [121,"엄준",1221,0,null,44,10,65,0,160,300,"재간","저격"],
+        [71,"여개",1222,0,null,51,10,65,0,160,300,"유지","저격"],
+        [29,"여건",1223,0,null,44,65,10,0,160,300,"출세","저격"],
+        [107,"여광",1224,0,null,60,65,10,0,160,300,"유지","저격"],
+        [124,"여몽",1225,0,null,75,10,65,0,160,300,"패권","저격"],
+        [123,"여범",1226,0,null,43,10,65,0,160,300,"할거","저격"],
+        [107,"여상",1227,0,null,62,65,10,0,160,300,"유지","저격"],
+        [105,"여위황",1228,0,null,42,62,10,0,160,300,"정복","저격"],
+        [145,"여포",1229,0,null,75,65,10,0,160,300,"패권","저격","다 죽여버리겠다! 으하하."],
+        [50,"염우",1230,0,null,58,51,10,0,160,300,"출세","저격"],
+        [40,"염유",1231,0,null,59,65,10,0,160,300,"출세","저격"],
+        [18,"염포",1232,0,null,33,10,65,0,160,300,"유지","저격"],
+        [40,"예형",1233,0,null,75,10,65,0,160,300,"은둔","저격"],
+        [133,"오강",1234,0,null,47,10,61,0,160,300,"안전","저격"],
+        [59,"오란",1235,0,null,67,65,10,0,160,300,"재간","저격"],
+        [72,"오반",1236,0,null,70,65,10,0,160,300,"재간","저격"],
+        [128,"오언",1237,0,null,71,60,10,0,160,300,"재간","저격"],
+        [126,"오연",1238,0,null,36,65,10,0,160,300,"정복","저격"],
+        [69,"오의",1239,0,null,75,10,65,0,160,300,"유지","저격"],
+        [19,"오질",1240,0,null,43,10,65,0,160,300,"출세","저격"],
+        [51,"올돌골",1241,0,null,75,65,10,0,160,300,"출세","저격"],
+        [52,"옹개",1242,0,null,58,65,10,0,160,300,"안전","저격"],
+        [20,"왕경",1243,0,null,55,10,65,0,160,300,"재간","저격"],
+        [97,"왕광",1244,0,null,72,65,10,0,160,300,"유지","저격"],
+        [30,"왕기1",1245,0,null,75,10,65,0,160,300,"유지","저격"],
+        [34,"왕랑",1246,0,null,49,10,51,0,160,300,"할거","저격"],
+        [57,"왕루",1247,0,null,40,10,65,0,160,300,"유지","저격"],
+        [76,"왕보",1248,0,null,47,10,65,0,160,300,"대의","저격"],
+        [86,"왕수",1249,0,null,34,10,65,0,160,300,"재간","저격"],
+        [26,"왕쌍",1250,0,null,58,65,10,0,160,300,"정복","저격"],
+        [46,"왕위",1251,0,null,59,10,65,0,160,300,"안전","저격"],
+        [92,"왕윤",1252,0,null,16,10,65,0,160,300,"왕좌","저격"],
+        [40,"왕융",1253,0,null,62,10,65,0,160,300,"재간","저격"],
+        [32,"왕준",1254,0,null,75,10,65,0,160,300,"대의","저격"],
+        [30,"왕찬",1255,0,null,28,10,65,0,160,300,"안전","저격"],
+        [33,"왕창",1256,0,null,74,57,10,0,160,300,"정복","저격"],
+        [69,"왕평",1257,0,null,75,10,65,0,160,300,"재간","저격"],
+        [71,"왕항",1258,0,null,51,10,60,0,160,300,"대의","저격"],
+        [33,"왕혼",1259,0,null,69,10,59,0,160,300,"정복","저격"],
+        [71,"요립",1260,0,null,65,10,65,0,160,300,"출세","저격"],
+        [74,"요화",1261,0,null,67,10,60,0,160,300,"의협","저격"],
+        [22,"우금1",1262,0,null,75,10,65,0,160,300,"정복","저격"],
+        [27,"우금2",1263,0,null,63,65,10,0,160,300,"대의","저격"],
+        [122,"우번",1264,0,null,23,10,65,0,160,300,"유지","저격"],
+        [126,"우전",1265,0,null,63,55,10,0,160,300,"안전","저격"],
+        [86,"원담",1266,0,null,67,59,10,0,160,300,"왕좌","저격"],
+        [101,"원상",1267,0,null,54,10,65,0,160,300,"패권","저격"],
+        [101,"원소",1268,0,null,75,10,65,0,160,300,"패권","저격"],
+        [140,"원술",1269,0,null,75,10,65,0,160,300,"패권","저격"],
+        [140,"원윤",1270,0,null,41,10,60,0,160,300,"패권","저격"],
+        [101,"원희",1271,0,null,69,10,65,0,160,300,"할거","저격"],
+        [131,"위소",1272,0,null,39,10,65,0,160,300,"재간","저격"],
+        [147,"위속",1273,0,null,57,59,10,0,160,300,"안전","저격"],
+        [81,"위연",1274,0,null,75,65,10,0,160,300,"패권","저격"],
+        [96,"위유",1275,0,null,53,10,65,0,160,300,"재간","저격"],
+        [76,"유기",1276,0,null,57,10,65,0,160,300,"왕좌","저격"],
+        [36,"유대",1277,0,null,61,10,62,0,160,300,"재간","저격"],
+        [134,"유도",1278,0,null,35,10,65,0,160,300,"재간","저격"],
+        [46,"유벽",1279,0,null,63,65,10,0,160,300,"출세","저격"],
+        [75,"유봉",1280,0,null,60,65,10,0,160,300,"출세","저격"],
+        [75,"유비",1281,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [75,"유선1",1282,0,null,24,10,21,0,160,300,"대의","저격"],
+        [55,"유순",1283,0,null,67,61,10,0,160,300,"출세","저격"],
+        [75,"유심",1284,0,null,63,10,65,0,160,300,"왕좌","저격"],
+        [129,"유약",1285,0,null,67,63,10,0,160,300,"유지","저격"],
+        [55,"유언",1286,0,null,60,10,65,0,160,300,"할거","저격"],
+        [27,"유엽",1287,0,null,40,10,65,0,160,300,"유지","저격"],
+        [11,"유요",1288,0,null,23,10,48,0,160,300,"안전","저격"],
+        [96,"유우",1289,0,null,68,10,65,0,160,300,"왕좌","저격"],
+        [55,"유장",1290,0,null,38,10,63,0,160,300,"할거","저격"],
+        [45,"유종",1291,0,null,22,10,61,0,160,300,"할거","저격"],
+        [56,"유파",1292,0,null,47,10,65,0,160,300,"대의","저격"],
+        [45,"유표1",1293,0,null,71,10,65,0,160,300,"할거","저격"],
+        [27,"유표2",1294,0,null,75,10,65,0,160,300,"안전","저격"],
+        [134,"유현",1295,0,null,32,56,10,0,160,300,"안전","저격"],
+        [122,"육개",1296,0,null,66,10,65,0,160,300,"재간","저격"],
+        [122,"육손",1297,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [121,"육적",1298,0,null,44,10,65,0,160,300,"안전","저격"],
+        [122,"육항",1299,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [38,"윤대목",1300,0,null,62,10,65,0,160,300,"재간","저격"],
+        [80,"윤묵",1301,0,null,19,10,65,0,160,300,"대의","저격"],
+        [72,"윤상",1302,0,null,30,10,42,0,160,300,"대의","저격"],
+        [136,"윤직",1303,0,null,44,10,63,0,160,300,"재간","저격"],
+        [2,"이각",1304,0,null,56,65,10,0,160,300,"패권","저격"],
+        [146,"이숙",1305,0,null,27,10,65,0,160,300,"재간","저격"],
+        [71,"이엄",1306,0,null,75,10,65,0,160,300,"패권","저격"],
+        [2,"이유",1307,0,null,64,10,65,0,160,300,"패권","저격"],
+        [132,"이이",1308,0,null,55,65,10,0,160,300,"정복","저격"],
+        [77,"이적",1309,0,null,55,10,65,0,160,300,"할거","저격"],
+        [22,"이전",1310,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [71,"이풍1",1311,0,null,59,10,62,0,160,300,"재간","저격"],
+        [66,"이회",1312,0,null,67,10,65,0,160,300,"유지","저격"],
+        [114,"잠혼",1313,0,null,15,10,44,0,160,300,"할거","저격"],
+        [7,"장각",1314,0,null,75,10,65,0,160,300,"패권","저격"],
+        [34,"장간",1315,0,null,19,10,65,0,160,300,"재간","저격"],
+        [7,"장개",1316,0,null,48,65,10,0,160,300,"안전","저격"],
+        [122,"장굉",1317,0,null,25,10,65,0,160,300,"왕좌","저격"],
+        [7,"장량",1318,0,null,68,10,65,0,160,300,"정복","저격"],
+        [15,"장로",1319,0,null,75,10,65,0,160,300,"유지","저격"],
+        [23,"장료",1320,0,null,75,10,65,0,160,300,"의협","저격"],
+        [7,"장보",1321,0,null,75,10,65,0,160,300,"패권","저격"],
+        [76,"장비",1322,0,null,75,65,10,0,160,300,"의협","저격","어쭈. 해보자 이거냐?"],
+        [62,"장서",1323,0,null,44,48,10,0,160,300,"출세","저격"],
+        [120,"장소1",1324,0,null,42,10,65,0,160,300,"안전","저격"],
+        [78,"장소2",1325,0,null,51,10,65,0,160,300,"재간","저격"],
+        [72,"장송",1326,0,null,49,10,65,0,160,300,"할거","저격"],
+        [148,"장수",1327,0,null,71,10,65,0,160,300,"할거","저격"],
+        [145,"장양1",1328,0,null,62,10,65,0,160,300,"출세","저격"],
+        [8,"장연",1329,0,null,75,65,10,0,160,300,"안전","저격"],
+        [11,"장영",1330,0,null,55,65,10,0,160,300,"재간","저격"],
+        [118,"장온",1331,0,null,21,10,65,0,160,300,"할거","저격"],
+        [78,"장완",1332,0,null,70,10,65,0,160,300,"할거","저격"],
+        [15,"장위",1333,0,null,65,65,10,0,160,300,"대의","저격"],
+        [36,"장윤",1334,0,null,67,10,60,0,160,300,"정복","저격"],
+        [104,"장의거",1335,0,null,68,59,10,0,160,300,"대의","저격"],
+        [68,"장익",1336,0,null,75,65,10,0,160,300,"유지","저격"],
+        [56,"장임",1337,0,null,75,10,65,0,160,300,"대의","저격"],
+        [148,"장제1",1338,0,null,70,65,10,0,160,300,"할거","저격"],
+        [32,"장제2",1339,0,null,30,10,65,0,160,300,"유지","저격"],
+        [126,"장제3",1340,0,null,74,10,61,0,160,300,"할거","저격"],
+        [17,"장패",1341,0,null,44,65,10,0,160,300,"할거","저격"],
+        [76,"장포1",1342,0,null,69,65,10,0,160,300,"재간","저격"],
+        [113,"장포2",1343,0,null,63,65,10,0,160,300,"유지","저격"],
+        [27,"장합",1344,0,null,75,65,10,0,160,300,"출세","저격"],
+        [23,"장호",1345,0,null,56,62,10,0,160,300,"정복","저격"],
+        [31,"장화",1346,0,null,49,10,65,0,160,300,"유지","저격"],
+        [48,"장횡",1347,0,null,53,65,10,0,160,300,"재간","저격"],
+        [141,"장훈",1348,0,null,67,61,10,0,160,300,"안전","저격"],
+        [120,"장휴",1349,0,null,42,10,65,0,160,300,"재간","저격"],
+        [126,"장흠",1350,0,null,64,10,65,0,160,300,"대의","저격"],
+        [96,"저수",1351,0,null,75,10,65,0,160,300,"할거","저격"],
+        [130,"전단",1352,0,null,64,65,10,0,160,300,"출세","저격"],
+        [42,"전속",1353,0,null,66,57,10,0,160,300,"안전","저격"],
+        [26,"전위1",1354,0,null,61,65,10,0,160,300,"의협","저격"],
+        [130,"전위2",1355,0,null,74,65,10,0,160,300,"출세","저격"],
+        [128,"전종",1356,0,null,75,10,65,0,160,300,"패권","저격"],
+        [42,"전주",1357,0,null,69,65,10,0,160,300,"의협","저격"],
+        [96,"전풍",1358,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [24,"정무",1359,0,null,54,10,65,0,160,300,"출세","저격"],
+        [119,"정병",1360,0,null,22,10,65,0,160,300,"유지","저격"],
+        [126,"정보",1361,0,null,75,10,65,0,160,300,"패권","저격"],
+        [123,"정봉1",1362,0,null,70,65,10,0,160,300,"패권","저격"],
+        [24,"정욱",1363,0,null,75,10,65,0,160,300,"패권","저격"],
+        [88,"정원",1364,0,null,64,65,10,0,160,300,"왕좌","저격"],
+        [7,"정원지",1365,0,null,41,65,10,0,160,300,"출세","저격"],
+        [69,"정은",1366,0,null,53,62,10,0,160,300,"재간","저격"],
+        [121,"제갈각",1367,0,null,61,10,65,0,160,300,"왕좌","저격"],
+        [76,"제갈균",1368,0,null,59,10,65,0,160,300,"안전","저격"],
+        [121,"제갈근",1369,0,null,60,10,65,0,160,300,"왕좌","저격"],
+        [76,"제갈량",1370,0,null,75,10,65,0,160,300,"왕좌","저격","슬슬 나의 지모를 발휘해 보겠습니다..."],
+        [76,"제갈상",1371,0,null,52,10,65,0,160,300,"대의","저격"],
+        [135,"제갈정",1372,0,null,56,57,10,0,160,300,"안전","저격"],
+        [76,"제갈첨",1373,0,null,73,10,65,0,160,300,"대의","저격"],
+        [135,"제갈탄",1374,0,null,75,10,65,0,160,300,"패권","저격"],
+        [76,"조광",1375,0,null,65,65,10,0,160,300,"재간","저격"],
+        [74,"조루",1376,0,null,49,10,60,0,160,300,"대의","저격"],
+        [24,"조모",1377,0,null,53,32,10,0,160,300,"할거","저격"],
+        [127,"조무",1378,0,null,71,10,65,0,160,300,"의협","저격"],
+        [26,"조방",1379,0,null,50,10,31,0,160,300,"정복","저격"],
+        [83,"조범",1380,0,null,58,10,63,0,160,300,"유지","저격"],
+        [26,"조비",1381,0,null,72,10,65,0,160,300,"패권","저격"],
+        [19,"조상",1382,0,null,68,62,10,0,160,300,"패권","저격"],
+        [147,"조성",1383,0,null,44,65,10,0,160,300,"안전","저격"],
+        [26,"조순",1384,0,null,66,10,65,0,160,300,"정복","저격"],
+        [25,"조식",1385,0,null,19,10,65,0,160,300,"왕좌","저격"],
+        [25,"조앙",1386,0,null,44,65,10,0,160,300,"왕좌","저격"],
+        [25,"조예",1387,0,null,57,10,65,0,160,300,"정복","저격"],
+        [26,"조우",1388,0,null,67,10,65,0,160,300,"대의","저격"],
+        [76,"조운",1389,0,null,75,10,65,0,160,300,"왕좌","저격","창술의 달인 상산 조자룡 여기 있소!"],
+        [25,"조웅",1390,0,null,59,10,44,0,160,300,"안전","저격"],
+        [26,"조인",1391,0,null,74,65,10,0,160,300,"패권","저격"],
+        [25,"조조",1392,0,null,75,10,65,0,160,300,"패권","저격"],
+        [26,"조진",1393,0,null,75,10,65,0,160,300,"정복","저격"],
+        [25,"조창",1394,0,null,75,65,10,0,160,300,"정복","저격"],
+        [76,"조통",1395,0,null,65,64,10,0,160,300,"재간","저격"],
+        [84,"조표",1396,0,null,34,65,10,0,160,300,"안전","저격"],
+        [7,"조홍1",1397,0,null,52,65,10,0,160,300,"유지","저격"],
+        [24,"조홍2",1398,0,null,72,65,10,0,160,300,"패권","저격"],
+        [26,"조환",1399,0,null,34,10,42,0,160,300,"정복","저격"],
+        [19,"조훈",1400,0,null,67,63,10,0,160,300,"출세","저격"],
+        [26,"조휴",1401,0,null,75,10,65,0,160,300,"패권","저격"],
+        [19,"조희",1402,0,null,64,10,65,0,160,300,"대의","저격"],
+        [22,"종요",1403,0,null,16,10,65,0,160,300,"유지","저격"],
+        [20,"종회",1404,0,null,75,10,65,0,160,300,"패권","저격"],
+        [128,"주거",1405,0,null,73,10,65,0,160,300,"유지","저격"],
+        [118,"주방",1406,0,null,56,10,65,0,160,300,"할거","저격"],
+        [126,"주연",1407,0,null,73,65,10,0,160,300,"할거","저격"],
+        [126,"주유",1408,0,null,75,10,65,0,160,300,"패권","저격"],
+        [128,"주이",1409,0,null,61,10,61,0,160,300,"안전","저격"],
+        [88,"주준",1410,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [32,"주지",1411,0,null,52,65,10,0,160,300,"안전","저격"],
+        [76,"주창",1412,0,null,42,65,10,0,160,300,"의협","저격"],
+        [126,"주치",1413,0,null,58,10,56,0,160,300,"안전","저격"],
+        [41,"주태1",1414,0,null,62,10,61,0,160,300,"안전","저격"],
+        [126,"주태2",1415,0,null,74,65,10,0,160,300,"정복","저격"],
+        [128,"주환",1416,0,null,75,10,65,0,160,300,"정복","저격"],
+        [29,"진건",1417,0,null,62,65,10,0,160,300,"정복","저격"],
+        [29,"진교",1418,0,null,21,10,65,0,160,300,"유지","저격"],
+        [28,"진군",1419,0,null,60,10,65,0,160,300,"대의","저격"],
+        [143,"진궁",1420,0,null,75,10,65,0,160,300,"할거","저격"],
+        [79,"진규",1421,0,null,22,10,65,0,160,300,"할거","저격"],
+        [72,"진도",1422,0,null,71,10,65,0,160,300,"대의","저격"],
+        [79,"진등",1423,0,null,64,10,65,0,160,300,"할거","저격"],
+        [37,"진림",1424,0,null,50,10,65,0,160,300,"재간","저격"],
+        [124,"진무",1425,0,null,62,65,10,0,160,300,"재간","저격"],
+        [66,"진복",1426,0,null,36,10,65,0,160,300,"재간","저격"],
+        [50,"진수",1427,0,null,25,10,65,0,160,300,"대의","저격"],
+        [81,"진식",1428,0,null,47,65,10,0,160,300,"출세","저격"],
+        [79,"진진",1429,0,null,58,10,64,0,160,300,"재간","저격"],
+        [28,"진태",1430,0,null,75,10,65,0,160,300,"대의","저격"],
+        [11,"진횡",1431,0,null,38,58,10,0,160,300,"출세","저격"],
+        [21,"차주",1432,0,null,55,65,10,0,160,300,"안전","저격"],
+        [11,"착융",1433,0,null,62,59,10,0,160,300,"출세","저격"],
+        [36,"채모",1434,0,null,75,10,65,0,160,300,"정복","저격"],
+        [36,"채중",1435,0,null,58,10,55,0,160,300,"출세","저격"],
+        [36,"채화",1436,0,null,56,10,49,0,160,300,"안전","저격"],
+        [66,"초주",1437,0,null,22,10,65,0,160,300,"대의","저격"],
+        [20,"최염",1438,0,null,43,10,65,0,160,300,"대의","저격"],
+        [60,"축융",1439,0,null,59,65,10,0,160,300,"정복","저격"],
+        [60,"타사대왕",1440,0,null,61,10,65,0,160,300,"출세","저격"],
+        [124,"태사자",1441,0,null,71,10,65,0,160,300,"대의","저격"],
+        [124,"태사향",1442,0,null,51,65,10,0,160,300,"재간","저격"],
+        [12,"포륭",1443,0,null,53,65,10,0,160,300,"안전","저격"],
+        [74,"풍습",1444,0,null,36,64,10,0,160,300,"재간","저격"],
+        [7,"하의",1445,0,null,49,65,10,0,160,300,"출세","저격"],
+        [121,"하제",1446,0,null,74,65,10,0,160,300,"재간","저격"],
+        [90,"하진",1447,0,null,49,65,10,0,160,300,"왕좌","저격"],
+        [24,"하후덕",1448,0,null,67,64,10,0,160,300,"출세","저격"],
+        [26,"하후돈",1449,0,null,75,10,65,0,160,300,"의협","저격","다 나오거라! 상대해 주마!"],
+        [19,"하후무",1450,0,null,38,10,37,0,160,300,"안전","저격"],
+        [24,"하후상",1451,0,null,67,10,65,0,160,300,"출세","저격"],
+        [26,"하후연",1452,0,null,75,65,10,0,160,300,"패권","저격","궁술로 날 당해낼 자가 있을까? 후후."],
+        [26,"하후위",1453,0,null,73,10,65,0,160,300,"정복","저격"],
+        [26,"하후은",1454,0,null,49,51,10,0,160,300,"안전","저격"],
+        [23,"하후패",1455,0,null,75,10,65,0,160,300,"대의","저격"],
+        [20,"하후현",1456,0,null,57,10,65,0,160,300,"유지","저격"],
+        [26,"하후혜",1457,0,null,75,10,65,0,160,300,"정복","저격"],
+        [26,"하후화",1458,0,null,75,10,65,0,160,300,"정복","저격"],
+        [22,"학소",1459,0,null,75,10,65,0,160,300,"대의","저격"],
+        [126,"한당",1460,0,null,68,65,10,0,160,300,"할거","저격"],
+        [93,"한복",1461,0,null,66,59,10,0,160,300,"안전","저격"],
+        [8,"한섬",1462,0,null,39,62,10,0,160,300,"출세","저격"],
+        [48,"한수",1463,0,null,66,10,65,0,160,300,"대의","저격"],
+        [40,"한숭",1464,0,null,21,10,65,0,160,300,"재간","저격"],
+        [7,"한충",1465,0,null,41,65,10,0,160,300,"안전","저격"],
+        [9,"한현",1466,0,null,43,61,10,0,160,300,"유지","저격"],
+        [27,"한호",1467,0,null,60,65,10,0,160,300,"유지","저격"],
+        [79,"향랑",1468,0,null,51,10,65,0,160,300,"대의","저격"],
+        [79,"향총",1469,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [139,"허공",1470,0,null,65,63,10,0,160,300,"유지","저격"],
+        [21,"허유",1471,0,null,47,10,57,0,160,300,"재간","저격"],
+        [23,"허의",1472,0,null,31,65,10,0,160,300,"출세","저격"],
+        [26,"허저",1473,0,null,57,65,10,0,160,300,"정복","저격"],
+        [87,"허정",1474,0,null,18,10,65,0,160,300,"재간","저격"],
+        [12,"형도영",1475,0,null,49,65,10,0,160,300,"출세","저격"],
+        [148,"호거아",1476,0,null,35,65,10,0,160,300,"안전","저격"],
+        [76,"호반",1477,0,null,61,58,10,0,160,300,"재간","저격"],
+        [20,"호분",1478,0,null,71,10,61,0,160,300,"할거","저격"],
+        [27,"호주천",1479,0,null,75,10,65,0,160,300,"정복","저격"],
+        [20,"호준",1480,0,null,67,60,10,0,160,300,"재간","저격"],
+        [2,"화웅",1481,0,null,68,65,10,0,160,300,"출세","저격"],
+        [131,"화핵",1482,0,null,37,10,65,0,160,300,"안전","저격"],
+        [10,"화흠",1483,0,null,18,10,65,0,160,300,"출세","저격"],
+        [21,"환범",1484,0,null,20,10,65,0,160,300,"유지","저격"],
+        [127,"황개",1485,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [56,"황권",1486,0,null,75,10,65,0,160,300,"대의","저격"],
+        [41,"황란",1487,0,null,29,65,10,0,160,300,"재간","저격"],
+        [88,"황보숭",1488,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [72,"황충",1489,0,null,75,10,65,0,160,300,"왕좌","저격"],
+        [50,"황호",1490,0,null,15,10,48,0,160,300,"안전","저격"],
+        [147,"후성",1491,0,null,56,62,10,0,160,300,"정복","저격"]
+    ]
+}
@@ -60,7 +60,7 @@ class GameUnitConst extends GameUnitConstBase

        [
            40, self::T_SIEGE, '정란',     
-            100, 100, 6,  0, 0,  7,  3,    
+            100, 100, 6,  0, 0,  7,  5,    
            0, null,     null,     0, 
            [self::T_CASTLE=>1.8],
            [],
@@ -68,7 +68,7 @@ class GameUnitConst extends GameUnitConstBase
        ],
        [
            41, self::T_SIEGE, '충차',     
-            150, 100, 6,  0, 0,  10,  3, 
+            150, 100, 6,  0, 0,  10,  5, 
            1000, null,     null,     3, 
            [self::T_CASTLE=>2.4],
            [],
@@ -76,16 +76,16 @@ class GameUnitConst extends GameUnitConstBase
        ],
        [
            42, self::T_SIEGE, '벽력거',   
-            200, 100, 6,  0, 0,  20,  4, 
-            3000, ['업'],   null,     0, 
+            200, 100, 6,  0, 0,  20,  5, 
+            3000, null,   null,     0, 
            [self::T_CASTLE=>1.8],
            [],
            ['상대에게 돌덩이를 날립니다.']
        ],
        [
            43, self::T_SIEGE, '목우',      
-            50, 200, 5,  0, 0,  15,  3, 
-            3000, ['성도'], null,     0, 
+            100, 250, 6,  0, 0,  15,  5, 
+            3000, null, null,     0, 
            [],
            [],
            ['상대를 저지하는 특수병기입니다.']
Author	SHA1	Message	Date
Hide_D	e1aa5c875e	Merge branch 'devel' into siegetank	2019-05-05 15:59:10 +09:00
Hide_D	1242d54260	conflict	2019-05-04 17:10:08 +09:00
Hide_D	658a3d4484	서버 루트 js include 순서 변경	2019-05-04 17:08:58 +09:00
Hide_D	2e3cb131c2	서버가 열린 경우 서버가 열린 기간을 표기하도록 수정	2019-05-04 17:02:48 +09:00
Hide_D	58f22ddf08	Merge branch 'devel' into siegetank	2019-05-04 16:39:06 +09:00
Hide_D	010d12ad1f	최대 기술 레벨을 15까지	2019-05-04 14:01:09 +09:00
Hide_D	9ac3d0373b	쿼리 수정	2019-05-04 00:47:25 +09:00
Hide_D	78b3ffacd2	공백지 내정이 오르지 않도록 변경	2019-05-04 00:44:47 +09:00
Hide_D	88dd2ea7ac	목우 강화	2019-05-04 00:34:25 +09:00
Hide_D	ab7a1b1cc2	부대장 수를 많이 늘림	2019-05-04 00:17:25 +09:00
Hide_D	34bdcc1456	세율에 따라 내정이 끝없이 오르는 버그 수정	2019-05-04 00:09:50 +09:00
Hide_D	c1751d3d31	도시 내정이 고정치로 상승	2019-05-03 21:47:49 +09:00
Hide_D	d664f809fb	시나리오 모드 변경	2019-05-03 21:42:36 +09:00
Hide_D	41923d539c	디버그 코드 일부 수정	2019-05-03 18:56:39 +09:00
Hide_D	3100004501	테스트 충차전 시나리오	2019-05-03 14:31:09 +09:00
Hide_D	0bb1abc1da	차병종을 금만 저렴하게	2019-05-03 03:36:13 +09:00
Hide_D	0c4f04cc1f	자동 기연 버그 수정	2019-05-03 03:28:05 +09:00
Hide_D	9afeb488db	목우 살짝 약화	2019-05-03 02:50:10 +09:00
Hide_D	5cbc55cbde	벽력거, 목우를 아무데서나 쓸 수 있음. 목우 방어력 향상	2019-05-03 02:44:52 +09:00
Hide_D	772b520b13	유니크 무기, 유니크 서적 삭제. 명마와 아이템만 남음. 10말까지 구입 가능.	2019-05-03 02:40:54 +09:00
Hide_D	ac1f6e1441	기술 보정량 수정	2019-05-03 02:13:48 +09:00
Hide_D	a53089139c	오르는 기술 수치를 20으로 변경	2019-05-03 02:12:16 +09:00
Hide_D	5b5e71851b	추가 코드 수정	2019-05-03 01:35:32 +09:00
Hide_D	d5e7e85955	내정 상승 코드 마저 수정	2019-05-03 01:29:24 +09:00
Hide_D	b512d57a7f	코드 버그 수정	2019-05-03 01:06:24 +09:00
Hide_D	ea935b36ff	NPC는 항상 정란 징병, 무장, 지장은 '정착장려'를 우선시함. 그리고 기술 연구 중시	2019-05-03 01:02:26 +09:00
Hide_D	118e119c46	점령 후 초기 내정 변경, 시나리오 시작시 초기 내정 변경	2019-05-02 03:18:04 +09:00
Hide_D	ea16eceefa	도시 접경 내정 패널티 삭제	2019-05-02 03:12:47 +09:00
Hide_D	ccca74b930	고립된 도시에서도 사령부 동작, 고립된 도시로 발령 가능	2019-05-02 03:11:17 +09:00
Hide_D	8efa3c70ab	수비 끔 패널티 삭제, 내정 100% 초과 가능	2019-05-02 03:09:01 +09:00
Hide_D	9ee0da73ef	sql 버그 수정	2019-05-02 03:02:42 +09:00
Hide_D	66d1813ca1	매월 마다 1%p 자동 내정, 초과치는 1%씩 감소	2019-05-02 03:00:49 +09:00
Hide_D	ef3d2258f5	장수 인덕/저격, 부대장 의술 고정	2019-05-02 02:15:54 +09:00