From 4327f9529aa72cd95e1a712c8b8f5872120cfcc2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 1 Jan 2021 19:54:28 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20-=20?=
 =?UTF-8?q?=EC=9D=98=EB=B3=91=20=EB=AA=A8=EC=A7=91=20-=20=EC=9E=A5?=
 =?UTF-8?q?=EC=88=98=20=EB=B3=80=EA=B2=BD=20=EC=8B=9C=20=EC=83=9D=EC=84=B1?=
 =?UTF-8?q?=20=ED=8F=BC=20=EB=82=A8=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/js/select_general_from_pool.js        | 4 ++++
 hwe/sammo/Command/Nation/che_의병모집.php | 1 +
 hwe/select_general_from_pool.php          | 5 +++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/hwe/js/select_general_from_pool.js b/hwe/js/select_general_from_pool.js
index 6d6662d0..478acbfb 100644
--- a/hwe/js/select_general_from_pool.js
+++ b/hwe/js/select_general_from_pool.js
@@ -192,6 +192,10 @@ $(function($) {
         printGenerals(value);
     });
 
+    if (hasGeneralID) {
+        $('#create_plate').hide();
+    }
+
     $('#build_general').on('click', buildGeneral);
 
     $.each(validCustomOption, function(idx, value) {
diff --git a/hwe/sammo/Command/Nation/che_의병모집.php b/hwe/sammo/Command/Nation/che_의병모집.php
index 6699f721..d3fec4b3 100644
--- a/hwe/sammo/Command/Nation/che_의병모집.php
+++ b/hwe/sammo/Command/Nation/che_의병모집.php
@@ -159,6 +159,7 @@ class che_의병모집 extends Command\NationCommand
             $newNPC->setCityID($general->getCityID());
 
             $newNPC->setSpecial('None', 'None');
+            $newNPC->setLifeSpan($env['year']-20, $env['year']+10);
             $newNPC->setKillturn(Util::randRangeInt(64, 70));
             $newNPC->setNPCType(4);
             $newNPC->setMoney(1000, 1000);
diff --git a/hwe/select_general_from_pool.php b/hwe/select_general_from_pool.php
index a558b19a..9f9fe4a2 100644
--- a/hwe/select_general_from_pool.php
+++ b/hwe/select_general_from_pool.php
@@ -106,7 +106,7 @@ history.go(-1);
 </div>
 </div>
 
-<div class="bg0">
+<div class="bg0" id="create_plate">
 <div class="bg1 with_border legacy_layout font1" style="text-align:center;font-weight:bold;margin-top:10px;">장수 생성</div>
 <div class="with_border legacy_layout" style="display:flex">
 <div style='flex:1;' id='left_pad'>
@@ -184,7 +184,8 @@ if ($admin['show_img_level'] >= 1 && $member['grade'] >= 1 && $member['picture']
 </div>
 </table>
 </div>
-
+</div>
+<div class="bg0">
 <div class="with_border legacy_layout"><?=backButton()?></div>
 <div class="with_border legacy_layout"><?=banner()?></div>
 </div>