From 86e58437aac2ec63cf3b33cd5587ff0048ca4fc9 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 8 Mar 2020 20:01:49 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BB=A4=EB=A7=A8=EB=93=9C=20brief=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95,=20=EB=82=B4=EB=AC=B4=EB=B6=80=20=EB=B2=84=EA=B7=B8?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_dipcenter.php                    | 4 ++--
 hwe/sammo/Command/General/che_건국.php | 4 ++--
 hwe/sammo/Command/General/che_등용.php | 8 ++++++++
 hwe/sammo/Command/General/che_선양.php | 7 +++++++
 hwe/sammo/Command/General/che_증여.php | 8 ++++++++
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/hwe/b_dipcenter.php b/hwe/b_dipcenter.php
index 4afda638..1241e34c 100644
--- a/hwe/b_dipcenter.php
+++ b/hwe/b_dipcenter.php
@@ -16,7 +16,7 @@ increaseRefresh("내무부", 1);
 $me = $db->queryFirstRow('SELECT no, nation, level, con, turntime, belong, permission, penalty FROM general WHERE owner=%i', $userID);
 
 $nationID = $me['nation'];
-$nation = $db->queryFirstRow('SELECT nation,name,color,type,gold,rice,bill,rate,scout,war,secretlimit,msg,scoutmsg FROM nation WHERE nation = %i', $nationID);
+$nation = $db->queryFirstRow('SELECT nation,level,name,color,type,gold,rice,bill,rate,scout,war,secretlimit,msg,scoutmsg,capital FROM nation WHERE nation = %i', $nationID);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -171,7 +171,7 @@ if ($budgetricediff > 0) {
 }
 
 ?>
-<table width=1000 class='tb_layout bg0 center'>
+<table width=1000 class='tb_layout bg0' style='margin:auto;'>
 <form name=form1 method=post action=c_dipcenter.php>
     <tr><td colspan=2 height=10></td></tr>
     <tr><td colspan=2 align=center bgcolor=orange>국 가 방 침 &amp; 임관 권유 메시지</td></tr>
diff --git a/hwe/sammo/Command/General/che_건국.php b/hwe/sammo/Command/General/che_건국.php
index 3a413305..f800a1fa 100644
--- a/hwe/sammo/Command/General/che_건국.php
+++ b/hwe/sammo/Command/General/che_건국.php
@@ -56,7 +56,7 @@ class che_건국 extends Command\GeneralCommand{
         try{
             $nationTypeClass = buildNationTypeClass($nationType);
         }
-        catch(InvalidArgumentException $e){
+        catch(\InvalidArgumentException $e){
             return false;
         }
         
@@ -140,7 +140,7 @@ class che_건국 extends Command\GeneralCommand{
         $nationTypeName = $nationTypeClass->getName();
 
 
-        $logger->pushGeneralActionLog("<D><b>{$nationName}</></>{$josaUl} 건국하였습니다. <1>$date</>");
+        $logger->pushGeneralActionLog("<D><b>{$nationName}</b></>{$josaUl} 건국하였습니다. <1>$date</>");
         $logger->pushGlobalActionLog("<Y>{$generalName}</>{$josaYi} <G><b>{$cityName}</b></>에 국가를 건설하였습니다.");
 
         $josaNationYi = JosaUtil::pick($nationName, '이');
diff --git a/hwe/sammo/Command/General/che_등용.php b/hwe/sammo/Command/General/che_등용.php
index 6d715fd0..3fb78016 100644
--- a/hwe/sammo/Command/General/che_등용.php
+++ b/hwe/sammo/Command/General/che_등용.php
@@ -104,6 +104,14 @@ class che_등용 extends Command\GeneralCommand{
         return 0;
     }
 
+    public function getBrief(): string
+    {
+        $destGeneralName = $this->destGeneralObj->getName();
+        $name = $this->getName();
+        $josaUl = JosaUtil::pick($name, '을');
+        return "【{$destGeneralName}】{$josaUl} {$name}";
+    }
+
     public function run():bool{
         if(!$this->isRunnable()){
             throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
diff --git a/hwe/sammo/Command/General/che_선양.php b/hwe/sammo/Command/General/che_선양.php
index fe423b71..2cce9abf 100644
--- a/hwe/sammo/Command/General/che_선양.php
+++ b/hwe/sammo/Command/General/che_선양.php
@@ -82,6 +82,13 @@ class che_선양 extends Command\GeneralCommand{
         return 0;
     }
 
+    public function getBrief(): string
+    {
+        $destGeneralName = $this->destGeneralObj->getName();
+        $name = $this->getName();
+        return "【{$destGeneralName}】에게 {$name}";
+    }
+
     public function run():bool{
         if(!$this->isRunnable()){
             throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');
diff --git a/hwe/sammo/Command/General/che_증여.php b/hwe/sammo/Command/General/che_증여.php
index bcd45ca8..dea86672 100644
--- a/hwe/sammo/Command/General/che_증여.php
+++ b/hwe/sammo/Command/General/che_증여.php
@@ -110,6 +110,14 @@ class che_증여 extends Command\GeneralCommand{
         return 0;
     }
 
+    public function getBrief(): string
+    {
+        $destGeneralName = $this->destGeneralObj->getName();
+        $resText = $this->arg['isGold']?'금':'쌀';
+        $name = $this->getName();
+        return "【{$destGeneralName}】에게 {$resText} {$this->arg['amount']}을 {$name}";
+    }
+
     public function run():bool{
         if(!$this->isRunnable()){
             throw new \RuntimeException('불가능한 커맨드를 강제로 실행 시도');