국가 정보 반환시 0인 경우에 한해 재야도 반환.

- 재야의 색을 #000000 으로 설정
This commit is contained in:
2018-04-15 23:41:36 +09:00
parent 5a6cd7fb46
commit 6a100ed2c1
7 changed files with 35 additions and 28 deletions
+1 -1
View File
@@ -35,7 +35,7 @@ class Scenario{
$data = $this->data;
$this->nations = [];
$this->nations[0] = new Scenario\Nation(0, '재야', '#ffffff', 0, 0);
$this->nations[0] = new Scenario\Nation(0, '재야', '#000000', 0, 0);
foreach (Util::array_get($data['nation'],[]) as $idx=>$rawNation) {
list($name, $color, $gold, $rice, $infoText, $tech, $type, $nationLevel, $cities) = $rawNation;
$nationID = $idx+1;
+1 -1
View File
@@ -84,7 +84,7 @@ class NPC{
$db = DB::db();
if($age == \sammo\GameConst::$adultAge && $month == 1){//FIXME: 14가 어디서 튀어나왔나?
if($age == \sammo\GameConst::$adultAge && $month == 1){
\sammo\pushWorldHistory(["<C>●</>1월:<Y>$name</>(이)가 성인이 되어 <S>등장</>했습니다."], $year, $month);
}
+1 -1
View File
@@ -22,7 +22,7 @@ class Nation{
public function __construct(
int $id = null,
string $name = '국가',
string $color = '#ffffff',
string $color = '#000000',
int $gold = 0,
int $rice = 2000,
string $infoText = '국가 설명',