From be882000ad53996598b2348761297b9469e8757c Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Fri, 8 Jul 2022 15:53:37 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20183=EB=85=84=20=EC=9D=B4=EC=A0=84=20?=
 =?UTF-8?q?=EC=84=A0=ED=8F=AC=EB=90=9C=20=EA=B2=BD=EC=9A=B0=20=EA=B3=B5?=
 =?UTF-8?q?=EB=B0=B1=EC=A7=80=20=EC=B6=9C=EB=B3=91=EC=9D=84=20=EC=8B=9C?=
 =?UTF-8?q?=EB=8F=84=ED=95=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/GeneralAI.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/hwe/sammo/GeneralAI.php b/hwe/sammo/GeneralAI.php
index 1fb802a5..28900599 100644
--- a/hwe/sammo/GeneralAI.php
+++ b/hwe/sammo/GeneralAI.php
@@ -205,9 +205,15 @@ class GeneralAI
             $nationID
         );
 
-        if (!$warTarget && $yearMonth <= Util::joinYearMonth($env['startyear'] + 2, 5)) {
-            $this->dipState = self::d평화;
-            $this->attackable = false;
+        if ($yearMonth <= Util::joinYearMonth($env['startyear'] + 2, 5)) {
+            if(!$warTarget){
+                $this->dipState = self::d평화;
+                $this->attackable = false;
+            }
+            else{
+                $this->dipState = self::d선포;
+                $this->attackable = false;
+            }
             return;
         }
 
@@ -237,8 +243,6 @@ class GeneralAI
 
         $this->warTargetNation = $warTargetNation;
 
-
-
         $nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
         $minWarTerm = $db->queryFirstField('SELECT min(term) FROM diplomacy WHERE me = %i AND state=1', $nationID);
         if ($minWarTerm === null) {