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

불가침 외교 커맨드 부활. 버그 수정

Browse Source
This commit is contained in:
Hide_D
2020-03-12 15:58:14 +09:00
parent 59f7448aa7
commit d1bc434ced
13 changed files with 440 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Constraint/Constraint.php
+7 -2
View File
@@ -195,7 +195,8 @@ abstract class Constraint{
continue;
}
$method = __NAMESPACE__.'\\'.$constraintArgs[0].'::build';
$constraintName = $constraintArgs[0];
$method = __NAMESPACE__.'\\'.$constraintName.'::build';
/** @var \sammo\Constraint\Constraint $contraint */
$constraint = call_user_func($method,$input);
@@ -209,7 +210,11 @@ abstract class Constraint{
if(!$constraint->test()){
return [\sammo\Util::getClassNameFromObj($constraint), $constraint->reason()];
if($constraint->reason() === null){
throw new \RuntimeException('Reason is not set:'.$constraintName);
}
return [$constraintName, $constraint->reason()];
}
}
hwe/sammo/Constraint/DisallowDiplomacyBetweenStatus.php
+2 -1
View File
@@ -40,6 +40,7 @@ class DisallowDiplomacyBetweenStatus extends Constraint{
$db = DB::db();
$state = $db->queryFirstField(
'SELECT state FROM diplomacy WHERE me = %i AND you = %i AND `state` IN %li LIMIT 1',
$this->nationID,
@@ -49,7 +50,7 @@ class DisallowDiplomacyBetweenStatus extends Constraint{
if($state === null){
return true;
}
$this->msg = $this->disallowStatus[$state];
$this->reason = $this->disallowStatus[$state];
return false;
}
}
hwe/sammo/Constraint/NearNation.php
+2 -17
View File
@@ -10,16 +10,6 @@ class NearNation extends Constraint{
return false;
}
if(!key_exists('capital', $this->nation)){
if(!$throwExeception){return false; }
throw new \InvalidArgumentException("require capital in nation");
}
if(!key_exists('capital', $this->destNation)){
if(!$throwExeception){return false; }
throw new \InvalidArgumentException("require capital in destNation");
}
return true;
}
@@ -27,19 +17,14 @@ class NearNation extends Constraint{
$this->checkInputValues();
$this->tested = true;
$srcCityID = $this->nation['capital'];
$srcNationID = $this->nation['nation'];
$destCityID = $this->destNation['capital'];
$destNationID = $this->destNation['nation'];
$dist = \sammo\searchDistanceListToDest($srcCityID, $destCityID, [$srcNationID, $destNationID]);
if(!$dist){
if(!\sammo\isNeighbor($srcNationID, $destNationID, false)){
$this->reason = "인접 국가가 아닙니다.";
return false;
}
return false;
return true;
}
}