From 5a4d9ffcfc0fd9b7fe28376c561bf5d3edfc0209 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 17 May 2020 20:00:06 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95=20=EB=93=B1=EC=9A=A9=EC=9E=A5=20?=
 =?UTF-8?q?=EC=B4=88=EB=B0=98=EC=97=90=EB=8F=84=20=EB=B3=B4=EB=82=BC=20?=
 =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D,=20=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=EC=97=90=EC=84=9C=20optgroup=20=EC=9E=91=EC=84=B1=20?=
 =?UTF-8?q?=EC=8B=A4=EC=88=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Command/General/che_등용.php     | 7 +++----
 hwe/sammo/Command/General/che_등용수락.php | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/hwe/sammo/Command/General/che_등용.php b/hwe/sammo/Command/General/che_등용.php
index 8798b79f..464740cd 100644
--- a/hwe/sammo/Command/General/che_등용.php
+++ b/hwe/sammo/Command/General/che_등용.php
@@ -18,7 +18,8 @@ use function \sammo\{
     CriticalScoreEx,
     tryUniqueItemLottery,
     getAllNationStaticInfo,
-    getNationStaticInfo
+    getNationStaticInfo,
+    newColor
 };
 
 use \sammo\Constraint\Constraint;
@@ -70,7 +71,6 @@ class che_등용 extends Command\GeneralCommand{
         $this->minConditionConstraints=[
             ConstraintHelper::ReqEnvValue('join_mode', '!=', 'onlyRandom', '랜덤 임관만 가능합니다'),
             ConstraintHelper::NotBeNeutral(), 
-            ConstraintHelper::NotOpeningPart($relYear),
             ConstraintHelper::OccupiedCity(),
             ConstraintHelper::SuppliedCity(),
         ];
@@ -87,7 +87,6 @@ class che_등용 extends Command\GeneralCommand{
         $this->fullConditionConstraints=[
             ConstraintHelper::ReqEnvValue('join_mode', '!=', 'onlyRandom', '랜덤 임관만 가능합니다'),
             ConstraintHelper::NotBeNeutral(), 
-            ConstraintHelper::NotOpeningPart($relYear),
             ConstraintHelper::OccupiedCity(),
             ConstraintHelper::SuppliedCity(),
             ConstraintHelper::ExistsDestGeneral(),
@@ -199,7 +198,7 @@ class che_등용 extends Command\GeneralCommand{
 등용할 장수를 목록에서 선택하세요.<br>
 <select class='formInput' name="destGeneralID" id="destGeneralID" size='1' style='color:white;background-color:black;'>
 <?php foreach($nationList as $destNation): ?>
-    <optgroup style='color:<?=$destNation['color']?>'>【<?=$destNation['name']?>】
+    <optgroup style='background-color:<?=$destNation['color']?>;color:<?=newColor($destNation['color'])?>;' label="【<?=$destNation['name']?>】" >
 <?php   foreach($destGenerals[$destNation['nation']]??[] as $destGeneral):
             $nameColor = \sammo\getNameColor($destGeneral['npc']);
             if($nameColor){
diff --git a/hwe/sammo/Command/General/che_등용수락.php b/hwe/sammo/Command/General/che_등용수락.php
index 0aa4bfd7..e63c662b 100644
--- a/hwe/sammo/Command/General/che_등용수락.php
+++ b/hwe/sammo/Command/General/che_등용수락.php
@@ -91,7 +91,6 @@ class che_등용수락 extends Command\GeneralCommand{
 
         $this->fullConditionConstraints=[
             ConstraintHelper::ReqEnvValue('join_mode', '!=', 'onlyRandom', '랜덤 임관만 가능합니다'),
-            ConstraintHelper::NotOpeningPart($relYear),
             ConstraintHelper::ExistsDestNation(),
             ConstraintHelper::AllowJoinDestNation($relYear),
             ConstraintHelper::ReqDestNationValue('level', '국가규모', '>', 0, '방랑군에는 임관할 수 없습니다.'),