From 9ad3dbba90b5d1e3cc3268bf1c6d3561a4740afd Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Wed, 21 Sep 2022 23:25:20 +0900
Subject: [PATCH] =?UTF-8?q?game:=20=EB=B0=B0=EC=8B=A0=20=EA=B4=80=EB=A0=A8?=
 =?UTF-8?q?=20=EC=B5=9C=EC=A2=85=20=EC=88=98=EC=A0=95,=2020%=EB=B6=80?=
 =?UTF-8?q?=ED=84=B0,=20+10%p=EC=94=A9=20-=20=EA=B3=B5=EC=A7=80=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Command/General/che_등용수락.php | 4 ++--
 hwe/sammo/Command/General/che_하야.php     | 4 ++--
 hwe/sammo/GameConstBase.php                | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/hwe/sammo/Command/General/che_등용수락.php b/hwe/sammo/Command/General/che_등용수락.php
index 41d408c7..86337059 100644
--- a/hwe/sammo/Command/General/che_등용수락.php
+++ b/hwe/sammo/Command/General/che_등용수락.php
@@ -144,9 +144,9 @@ class che_등용수락 extends Command\GeneralCommand{
             }
 
             // 재야가 아니면 명성N*10% 공헌N*10%감소
-            $general->setVar('experience', $general->getVar('experience') * (1 - 0.15 * $general->getVar('betray')));
+            $general->setVar('experience', $general->getVar('experience') * (1 - 0.1 * $general->getVar('betray')));
             $general->addExperience(0, false);
-            $general->setVar('dedication', $general->getVar('dedication') * (1 - 0.15 * $general->getVar('betray')));
+            $general->setVar('dedication', $general->getVar('dedication') * (1 - 0.1 * $general->getVar('betray')));
             $general->addDedication(0, false);
             $general->increaseVarWithLimit('betray', 1, null, GameConst::$maxBetrayCnt);
         }
diff --git a/hwe/sammo/Command/General/che_하야.php b/hwe/sammo/Command/General/che_하야.php
index a0e7a1e1..6fce7ba3 100644
--- a/hwe/sammo/Command/General/che_하야.php
+++ b/hwe/sammo/Command/General/che_하야.php
@@ -73,9 +73,9 @@ class che_하야 extends Command\GeneralCommand{
         $logger->pushGeneralActionLog("<D><b>{$nationName}</b></>에서 하야했습니다. <1>$date</>");
         $logger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>에서 하야");
         $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <D><b>{$nationName}</b></>에서 <R>하야</>했습니다.");
-        $general->setVar('experience', $general->getVar('experience') * (1 - 0.15 * $general->getVar('betray')));
+        $general->setVar('experience', $general->getVar('experience') * (1 - 0.1 * $general->getVar('betray')));
         $general->addExperience(0, false);
-        $general->setVar('dedication', $general->getVar('dedication') * (1 - 0.15 * $general->getVar('betray')));
+        $general->setVar('dedication', $general->getVar('dedication') * (1 - 0.1 * $general->getVar('betray')));
         $general->addDedication(0, false);
         $general->increaseVarWithLimit('betray', 1, null, GameConst::$maxBetrayCnt);
         $general->setVar('permission', 'normal');
diff --git a/hwe/sammo/GameConstBase.php b/hwe/sammo/GameConstBase.php
index 32008e68..78d11fca 100644
--- a/hwe/sammo/GameConstBase.php
+++ b/hwe/sammo/GameConstBase.php
@@ -79,7 +79,7 @@ class GameConstBase
     /** @var int 최대 기술 레벨 */
     public static $maxTechLevel = 12;
     /** @var int 최대 하야 패널티 수 */
-    public static $maxBetrayCnt = 6;
+    public static $maxBetrayCnt = 9;
 
     /** @var int 최소 인구 증가량 */
     public static $basePopIncreaseAmount = 5000;
@@ -434,6 +434,7 @@ class GameConstBase
         [
             "month", 2000,
             ["DateRelative", "==", 4, 1],
+            ["NoticeToHistoryLog", "<S>이제부터 하야, 망명시 패널티가 적용됩니다.</>", ActionLogger::EVENT_YEAR_MONTH],
             ["AddGlobalBetray", 1, 0],
             ["AddGlobalBetray", 1, 1],
             ["DeleteEvent"]