From 57c8c3f6a4801b5f247f24a2ee7fd387fe5bd589 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Mon, 22 May 2023 02:15:45 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20MessageType=20=EA=B0=84=EC=9D=B4=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1=20=ED=95=A8=EC=88=98=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?-=20General=20=EA=B0=9D=EC=B2=B4=EC=97=90=EC=84=9C=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1=20-=20=EC=99=9C=20=EC=97=AC=ED=83=9C=EA=B9=8C?=
 =?UTF-8?q?=EC=A7=80=20=EC=9D=B4=20=ED=95=A8=EC=88=98=EA=B0=80=20=EC=97=86?=
 =?UTF-8?q?=EC=97=88=EC=9D=84=EA=B9=8C=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/MessageTarget.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hwe/sammo/MessageTarget.php b/hwe/sammo/MessageTarget.php
index f2f28008..a74af178 100644
--- a/hwe/sammo/MessageTarget.php
+++ b/hwe/sammo/MessageTarget.php
@@ -79,6 +79,18 @@ class MessageTarget extends Target {
         return new MessageTarget($generalID, $generalName, $nationID, $nation['name'], $nation['color'], $icon);
     }
 
+    public static function buildFromGeneralObj(General $general): MessageTarget{
+        $nation = getNationStaticInfo($general->getNationID());
+        return new MessageTarget(
+            $general->getID(),
+            $general->getName(),
+            $general->getNationID(),
+            $nation['name'],
+            $nation['color'],
+            GetImageURL($general->getVar('imgsvr'), $general->getVar('picture')),
+        );
+    }
+
     public static function buildSystemTarget(): MessageTarget{
         return new MessageTarget(0, '', 0, 'System', '#000000');
     }