커맨드 brief 수정, 내무부 버그 수정

This commit is contained in:
2020-03-08 20:01:49 +09:00
parent 89a6769385
commit 86e58437aa
5 changed files with 27 additions and 4 deletions
+2 -2
View File
@@ -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>
+2 -2
View File
@@ -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, '이');
+8
View File
@@ -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('불가능한 커맨드를 강제로 실행 시도');
+7
View File
@@ -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('불가능한 커맨드를 강제로 실행 시도');
+8
View File
@@ -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('불가능한 커맨드를 강제로 실행 시도');