From b1d661192380da52afab807b490b4857c58f88dc Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 11 Nov 2018 20:46:12 +0900
Subject: [PATCH] =?UTF-8?q?=ED=95=B4=EC=82=B0=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func.php                           |  6 +++
 hwe/sammo/Command/General/che_해산.php | 55 ++------------------------
 2 files changed, 10 insertions(+), 51 deletions(-)

diff --git a/hwe/func.php b/hwe/func.php
index fc84ddf5..0c43e86e 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -2137,6 +2137,12 @@ function deleteNation(General $general) {
     $oldNation['generals'] = $oldNationGenerals;
     $oldNation['aux'] = Json::decode($oldNation['aux']);
 
+    $general->setVar('belong', 0);
+    $general->setVar('troop', 0);
+    $general->setVar('level', 0);
+    $general->setVar('nation', 0);
+    $general->setVar('makelimit', 12);
+
     // 전 장수 재야로    // 전 장수 소속 무소속으로
     $db->update('general', [
         'belong'=>0,
diff --git a/hwe/sammo/Command/General/che_해산.php b/hwe/sammo/Command/General/che_해산.php
index 30e24ecc..ca13dd9a 100644
--- a/hwe/sammo/Command/General/che_해산.php
+++ b/hwe/sammo/Command/General/che_해산.php
@@ -80,6 +80,7 @@ class che_해산 extends Command\GeneralCommand{
         $nation = $this->nation;
         $nationID = $nation['nation'];
         $nationName = $nation['name'];
+        $josaUl = JosaUtil::pick($nationName, '을');
 
         if($nation['gennum'] > 1){
             $db->update('general', [
@@ -93,62 +94,14 @@ class che_해산 extends Command\GeneralCommand{
         DeleteConflict($nationID);
         deleteNation($general);
 
-        $diplomacyInit = [];
-        foreach(getAllNationStaticInfo() as $destNation){
-            $destNationID = $destNation['nation'];
-            $diplomacyInit[] = [
-                'me'=>$destNationID,
-                'you'=>$nationID,
-                'state'=>2,
-                'term'=>0,
-            ];
-
-            $diplomacyInit[] = [
-                'me'=>$nationID,
-                'you'=>$destNationID,
-                'state'=>2,
-                'term'=>0,
-            ];
-        }
-        $db->insert('diplomacy', $diplomacyInit);
-
-        DB::db()->insert('nation', [
-            'name'=>$nationName,
-            'color'=>'#330000', 
-            'gold'=>0, 
-            'rice'=>GameConst::$baserice, 
-            'rate'=>20, 
-            'bill'=>100, 
-            'sabotagelimit'=>12, 
-            'surlimit'=>72, 
-            'type'=>0, 
-            'gennum'=>1
-        ]);
-        $nationID = DB::db()->insertId();
-
         refreshNationStaticInfo();
 
-        $logger->pushGeneralActionLog("거병에 성공하였습니다. <1>$date</>");
-        $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <G><b>{$cityName}</b></>에 거병하였습니다.");
+        $logger->pushGeneralActionLog("세력을 해산했습니다. <1>$date</>");
+        $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} 세력을 해산했습니다.");
 
-        $logger->pushGlobalHistoryLog("<Y><b>【거병】</b></><D><b>{$generalName}</b></>{$josaYi} 세력을 결성하였습니다.");
-        $logger->pushGeneralHistoryLog("<G><b>{$cityName}</b></>에서 거병");
-        $logger->pushNationalHistoryLog("<Y>{$generalName}</>{$josaYi} <G><b>{$cityName}</b></>에서 거병");
-
-        $exp = 100;
-        $ded = 100;
-        
-        $exp = $general->onPreGeneralStatUpdate($general, 'experience', $exp);
-        $ded = $general->onPreGeneralStatUpdate($general, 'dedication', $ded);
-
-        $general->increaseVar('experience', $exp);
-        $general->increaseVar('dedication', $ded);
-        $general->setVar('belong', 1);
-        $general->setVar('level', 12);
-        $general->setVar('nation', $nationID);
+        $logger->pushGeneralHistoryLog("<D><b>{$nationName}</b></>{$josaUl} 해산");
 
         $general->setResultTurn(new LastTurn(static::getName(), $this->arg));
-        $general->checkStatChange();
         $general->applyDB($db);
 
         return true;