diff --git a/hwe/a_emperior.php b/hwe/a_emperior.php index 7d5ec491..3f15f846 100644 --- a/hwe/a_emperior.php +++ b/hwe/a_emperior.php @@ -79,7 +79,7 @@ foreach($emperiors as $emperior){ - colspan=8> + ;background-color:' colspan=8> (年 月) diff --git a/hwe/b_auction.php b/hwe/b_auction.php index 1be193b4..274fba85 100644 --- a/hwe/b_auction.php +++ b/hwe/b_auction.php @@ -62,7 +62,7 @@ if ($msg2 == "") { - +
거 래 장
거 래 장
거 래 장
diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php index 0a741dd6..59b38cc8 100644 --- a/hwe/b_currentCity.php +++ b/hwe/b_currentCity.php @@ -321,7 +321,7 @@ foreach($generals as $general){ ]; } -$generalsName = array_map(function($gen){return $gen['name'];}, $generalsFormat); +$generalsName = array_map(function($gen){return getColoredName($gen['name'], $gen['npc']);}, $generals); $enemyCrew = 0; $enemyCnt = 0; diff --git a/hwe/func.php b/hwe/func.php index c6941321..d80e03e7 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -273,7 +273,7 @@ function myNationInfo(General $generalObj) $nation['tech'] = "$techCall / {$nation['tech']}"; - if ($nationID===0 == 0) { + if ($nationID===0) { $nation['strategic_cmd_limit'] = "해당 없음"; $nation['surlimit'] = "해당 없음"; $nation['scout'] = "해당 없음"; diff --git a/hwe/func_gamerule.php b/hwe/func_gamerule.php index efc5849e..e8b65da1 100644 --- a/hwe/func_gamerule.php +++ b/hwe/func_gamerule.php @@ -420,7 +420,7 @@ function postUpdateMonthly() } //휴전국 로그 $stopWarList = []; - foreach($db->queryAllLists('SELECT me,you WHERE state=0 AND term <= 1 ORDER BY me desc, you desc') as [$me, $you]){ + foreach($db->queryAllLists('SELECT me,you FROM diplomacy WHERE state=0 AND term <= 1 ORDER BY me desc, you desc') as [$me, $you]){ if($me < $you){ $key = "{$me}_{$you}"; } @@ -456,11 +456,11 @@ function postUpdateMonthly() 'term'=>$db->sqleval('greatest(0, term-1)'), ], true); //불가침 끝나면 통상으로 - $db->update('diploacy', [ + $db->update('diplomacy', [ 'state'=>2, ], 'state = 7 AND term = 0'); //선포 끝나면 교전으로 - $db->update('diploacy', [ + $db->update('diplomacy', [ 'state'=>0, 'term'=>6, ], 'state = 1 AND term = 0'); diff --git a/hwe/sammo/Command/Nation/che_감축.php b/hwe/sammo/Command/Nation/che_감축.php index ece1392c..b11d07c0 100644 --- a/hwe/sammo/Command/Nation/che_감축.php +++ b/hwe/sammo/Command/Nation/che_감축.php @@ -51,8 +51,17 @@ class che_감축 extends Command\NationCommand{ return; } + $this->setCity(); $this->setNation(['gold', 'rice', 'capset', 'capital']); + + if(!$this->nation['capital']){ + $this->fullConditionConstraints=[ + ConstraintHelper::AlwaysFail('방랑상태에서는 불가능합니다.') + ]; + return; + } + $this->setDestCity($this->nation['capital']); [$reqGold, $reqRice] = $this->getCost(); diff --git a/hwe/sammo/Command/Nation/che_증축.php b/hwe/sammo/Command/Nation/che_증축.php index 7d75e4e9..2fc5ec7f 100644 --- a/hwe/sammo/Command/Nation/che_증축.php +++ b/hwe/sammo/Command/Nation/che_증축.php @@ -52,6 +52,14 @@ class che_증축 extends Command\NationCommand{ $this->setCity(); $this->setNation(['gold', 'rice', 'capset', 'capital']); + + if(!$this->nation['capital']){ + $this->fullConditionConstraints=[ + ConstraintHelper::AlwaysFail('방랑상태에서는 불가능합니다.') + ]; + return; + } + $this->setDestCity($this->nation['capital']); [$reqGold, $reqRice] = $this->getCost();