v0.7.3까지 반영 #114

Closed
Hide_D wants to merge 310 commits from devel into master
Showing only changes of commit ebf9b4b75d - Show all commits
+13 -5
View File
@@ -86,10 +86,6 @@ class NPC{
public function build($env=[]){
//scenario에 life==1인 경우 수명 제한이 없어지는 모양.
$nationID = $this->nationID;
if(!\sammo\getNationStaticInfo($nationID)){
$nationID = 0;
};
$isFictionMode = (Util::array_get($env['fiction'], 0)!=0);
@@ -105,9 +101,21 @@ class NPC{
return false; //예약.
}
$isNewGeneral = ($age == \sammo\GameConst::$adultAge);
$nationID = $this->nationID;
if($isFictionMode && $isNewGeneral){
$nationID = 0;
}
if(!\sammo\getNationStaticInfo($nationID)){
$nationID = 0;
};
$db = DB::db();
if($age == \sammo\GameConst::$adultAge){
if($isNewGeneral){
\sammo\pushWorldHistory(["<C>●</>{$month}월:<Y>{$name}</>(이)가 성인이 되어 <S>등장</>했습니다."], $year, $month);
}