devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

feat: 병종 검사에서 $nation['aux']를 정식 입력

Browse Source
This commit is contained in:
Hide_D
2025-01-22 16:54:27 +00:00
parent e60150705e
commit dc476e73a1
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Constraint/AvailableRecruitCrewType.php
+8 -2
View File
@@ -6,9 +6,10 @@ use \sammo\GameUnitConst;
use \sammo\DB;
use \sammo\KVStorage;
use \sammo\CityConst;
use sammo\Json;
class AvailableRecruitCrewType extends Constraint{
const REQ_VALUES = Constraint::REQ_NATION|Constraint::REQ_INT_ARG;
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_NATION|Constraint::REQ_INT_ARG;
public function checkInputValues(bool $throwExeception=true):bool{
if(!parent::checkInputValues($throwExeception) && !$throwExeception){
@@ -52,8 +53,13 @@ class AvailableRecruitCrewType extends Constraint{
$ownRegions[CityConst::byId($ownCity)->region] = 1;
}
$nationAux = $this->nation['aux'] ?? null;
if($nationAux === null){
$nationAux = Json::decode($db->queryFirstField('SELECT aux FROM nation WHERE id = %i', $nationID) ?? "{}");
}
$crewType = GameUnitConst::byID($this->arg);
if($crewType->isValid($ownCities, $ownRegions, $year - $startyear, $tech)){
if($crewType->isValid($this->generalObj, $ownCities, $ownRegions, $year - $startyear, $tech, $nationAux)){
return true;
}