등용 수락 변경, Aux 처리 추가

nations->aux.joinedNations
dummyGeneral에 exp,ded 추가
scheme에서 nations 제거
This commit is contained in:
2020-03-13 01:44:18 +09:00
parent 553e0fdbe3
commit 9e7b8bb6b2
20 changed files with 560 additions and 247 deletions
+6 -1
View File
@@ -62,6 +62,11 @@ class ReqNationValue extends Constraint{
$this->isPercent = true;
}
if($this->errMsg!==null && !is_string($this->errMsg)){
if(!$throwExeception){return false; }
throw new \InvalidArgumentException("{$this->errMsg} must be string or null");
}
return true;
}
@@ -121,11 +126,11 @@ class ReqNationValue extends Constraint{
return true;
}
$josaYi = JosaUtil::pick($keyNick, '이');
if($this->errMsg){
$this->reason = $this->errMsg;
}
else{
$josaYi = JosaUtil::pick($keyNick, '이');
$this->reason = "{$keyNick}{$josaYi} {$result}";
}