From 83833a369320a35cea1fb15f57aa71e91d377bfc Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 26 Jun 2018 00:45:31 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EB=B0=8F=20?=
 =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=9D=BC=EA=B4=84=20=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=20TODO=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/_admin4_submit.php     | 15 ++++++++++++++-
 hwe/func_command.php       |  2 +-
 hwe/process_war.php        | 12 ++++--------
 hwe/sammo/ScoutMessage.php |  2 +-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/hwe/_admin4_submit.php b/hwe/_admin4_submit.php
index 41dd5aca..b6686296 100644
--- a/hwe/_admin4_submit.php
+++ b/hwe/_admin4_submit.php
@@ -13,11 +13,11 @@ if($session->userGrade < 5) {
 
 $btn = Util::getReq('btn');
 $genlist = Util::getReq('genlist', 'array_int');
+$msg = Util::getReq('msg','string', '메시지');
 
 extractMissingPostToGlobals();
 
 $db = DB::db();
-$connect=$db->get();
 
 //NOTE: 왜 기능이 admin2와 admin4가 같이 있는가? 
 //NOTE: 왜 블럭 시 admin4에선 금쌀을 없애지 않는가?
@@ -57,7 +57,20 @@ switch($btn) {
     case "메세지 전달":
     //TODO:새 갠메 시스템으로 변경
         $date = date('Y-m-d H:i:s');
+        $src = MessageTarget::buildQuick($session->generalID);
         for($i=0; $i < count($genlist); $i++) {
+            $msgObj = new Message(
+                Message::MSGTYPE_PRIVATE,
+                $src,
+                MessageTarget::buildQuick($genlist[$i]),
+                $msg,
+                new DateTime(),
+                new \DateTime('9999-12-31'),
+                []
+            );
+            if($msgObj){
+                $msgObj->send(true);
+            }
         }
         break;
 }
diff --git a/hwe/func_command.php b/hwe/func_command.php
index cd8293d9..1e4df148 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -583,7 +583,7 @@ function processCommand($no) {
             case 17: process_17($general); break; //소집해제
 
             case 21: process_21($general); break; //이동
-            case 22: process_22($general); break; //등용 //TODO:등용장 재 디자인
+            case 22: process_22($general); break; //등용
             case 25: process_25($general); break; //임관
             case 26: process_26($general); break; //집합
             case 28: process_28($general); break; //귀환
diff --git a/hwe/process_war.php b/hwe/process_war.php
index b2e10e49..cabdb1b1 100644
--- a/hwe/process_war.php
+++ b/hwe/process_war.php
@@ -1833,14 +1833,10 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) {
                 || $nation['name'] == "왜족") {
                 //등용장 미발부
             } elseif(Util::randBool(0.5)) {
-                //TODO:등용장 보낼것
-                /*sendScoutMsg([
-                    'id' => $ruler['no'],
-                    'nation_id' => $ruler['nation']
-                ],[
-                    'id' => $gen['no'],
-                    'nation_id' => $gen['nation']
-                ],$general['turntime']);*/
+                $msg = ScoutMessage::buildScoutMessage($general['no'], $gen['no'], $reason);
+                if($msg){
+                    $msg->send(true);
+                }
             }
 
             //NPC인 경우 10% 확률로 임관(엔장, 인재, 의병)
diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php
index d84b9bd8..66f67871 100644
--- a/hwe/sammo/ScoutMessage.php
+++ b/hwe/sammo/ScoutMessage.php
@@ -170,7 +170,7 @@ class ScoutMessage extends Message{
         return self::DECLINED;
     }
 
-    public static function buildScoutMessage(int $srcGeneralID, int $destGeneralID, &$reason = null, \DateTime $date = null){
+    public static function buildScoutMessage(int $srcGeneralID, int $destGeneralID, &$reason = null, \DateTime $date = null):?self{
         if($srcGeneralID == $destGeneralID){
             if($reason !== null){
                 $reason = '같은 장수에게 등용장을 보낼 수 없습니다';