From 84f4a022edc402f8722d474f78c6016ce1f1de83 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 15 Nov 2018 03:42:55 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=B0=98=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Command/General/che_모반.php | 39 +++++++++++++-------------
 hwe/sammo/Command/General/che_선양.php |  3 --
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/hwe/sammo/Command/General/che_모반.php b/hwe/sammo/Command/General/che_모반.php
index c3482448..f6e9f793 100644
--- a/hwe/sammo/Command/General/che_모반.php
+++ b/hwe/sammo/Command/General/che_모반.php
@@ -70,47 +70,48 @@ class che_모반 extends Command\GeneralCommand{
         $general = $this->generalObj;
         $date = substr($general->getVar('turntime'),11,5);
 
-        $destGeneral = $this->destGeneralObj;
+        $nationID = $general->getNationID();
+
+        $lordID = $db->queryFirstField('SELECT no FROM general WHERE nation = %i AND level = 12', $nationID);
+
+        $lordGeneral = General::createGeneralObjFromDB($lordID);
 
         $generalName = $general->getName();
-        $destGeneralName = $destGeneral->getName();
+        $lordName = $lordGeneral->getName();
 
         $nationName = $this->nation['name'];
         
         $logger = $general->getLogger();
-        $destLogger = $destGeneral->getLogger();
+        $lordLogger = $destGeneral->getLogger();
 
-        $destGeneral->setVar('level', 12);
-        $general->setVar('level', 1);
-        $general->multiplyVar('experience', 0.7);
+        $general->setVar('level', 12);
+        $lordGeneral->setVar('level', 1);
+        $lordGeneral->multiplyVar('experience', 0.7);
 
         $db->update('city', [
             'gen1'=>0
-        ], 'gen1=%i', $destGeneral->getID());
+        ], 'gen1=%i', $general->getID());
         $db->update('city', [
             'gen2'=>0
-        ], 'gen2=%i', $destGeneral->getID());
+        ], 'gen2=%i', $general->getID());
         $db->update('city', [
             'gen3'=>0
-        ], 'gen3=%i', $destGeneral->getID());
-
-        $destGeneral->increaseVarWithLimit($resKey, $amount);
-        $general->increaseVarWithLimit($resKey, -$amount, 0);
+        ], 'gen3=%i', $general->getID());
 
         $josaYi = JosaUtil::pick($generalName, '이');
-        $logger->pushGlobalHistoryLog("<Y><b>【선양】</b></><Y>{$generalName}</>{$josaYi} <D><b>{$nationName}</b></>의 군주 자리를 <Y>{$destGeneralName}</>에게 선양했습니다.");
-        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <Y>{$destGeneralName}</>에게 선양");
+        $logger->pushGlobalHistoryLog("<Y><b>【모반】</b></><Y>{$generalName}</>{$josaYi} <D><b>{$nationName}</b></>의 군주 자리를 찬탈했습니다.");
+        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <Y>{$lordName}</>에게서 군주자리를 찬탈");
 
-        $logger->pushGeneralActionLog("<Y>{$destGeneralName}</>에게 군주의 자리를 물려줍니다. <1>$date</>");
-        $destLogger->pushGeneralActionLog("<Y>{$generalName}</>에게서 군주의 자리를 물려받습니다.");
+        $logger->pushGeneralActionLog("모반에 성공했습니다. <1>$date</>");
+        $lordLogger->pushGeneralActionLog("<Y>{$generalName}</>에게 군주의 자리를 뺏겼습니다.");
 
-        $logger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>의 군주자리를 <Y>{$destGeneralName}</>에게 선양");
-        $destLogger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>의 군주자리를 물려 받음");
+        $logger->pushGeneralHistoryLog("모반으로 <D><b>{$nationName}</b></>의 군주자리를 찬탈");
+        $lordLogger->pushGeneralHistoryLog("<D><b>{$generalName}</b></>의 모반으로 인해 <D><b>{$nationName}</b></>의 군주자리를 박탈당함");
 
         $general->setResultTurn(new LastTurn(static::getName(), $this->arg));
         $general->checkStatChange();
         $general->applyDB($db);
-        $destGeneral->applyDB($db);
+        $lordGeneral->applyDB($db);
 
         return true;
     }
diff --git a/hwe/sammo/Command/General/che_선양.php b/hwe/sammo/Command/General/che_선양.php
index 01d5fdd2..eafde5cc 100644
--- a/hwe/sammo/Command/General/che_선양.php
+++ b/hwe/sammo/Command/General/che_선양.php
@@ -109,9 +109,6 @@ class che_선양 extends Command\GeneralCommand{
             'gen3'=>0
         ], 'gen3=%i', $destGeneral->getID());
 
-        $destGeneral->increaseVarWithLimit($resKey, $amount);
-        $general->increaseVarWithLimit($resKey, -$amount, 0);
-
         $josaYi = JosaUtil::pick($generalName, '이');
         $logger->pushGlobalHistoryLog("<Y><b>【선양】</b></><Y>{$generalName}</>{$josaYi} <D><b>{$nationName}</b></>의 군주 자리를 <Y>{$destGeneralName}</>에게 선양했습니다.");
         $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <Y>{$destGeneralName}</>에게 선양");