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

Constraint 수정

Browse Source
This commit is contained in:
Hide_D
2018-11-16 23:35:43 +09:00
parent 068d384e7a
commit 6ef9667f72
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Constraint/ContraintHelper.php
+24 -8
View File
@@ -4,6 +4,10 @@ namespace sammo\Constraint;
class ConstraintHelper{ class ConstraintHelper{
static function AdhocCallback(callable $callback):array{
return [__FUNCTION__, $callback];
}
static function AllowJoinAction():array{ static function AllowJoinAction():array{
return [__FUNCTION__]; return [__FUNCTION__];
} }
@@ -80,10 +84,6 @@ class ConstraintHelper{
return [__FUNCTION__]; return [__FUNCTION__];
} }
static function NearCity(int $distance):array{
return [__FUNCTION__, $distance];
}
static function MustBeNPC():array{ static function MustBeNPC():array{
return [__FUNCTION__]; return [__FUNCTION__];
} }
@@ -91,6 +91,10 @@ class ConstraintHelper{
static function MustBeTroopLeader():array{ static function MustBeTroopLeader():array{
return [__FUNCTION__]; return [__FUNCTION__];
} }
static function NearCity(int $distance):array{
return [__FUNCTION__, $distance];
}
static function NotBeNeutral():array{ static function NotBeNeutral():array{
return [__FUNCTION__]; return [__FUNCTION__];
@@ -100,6 +104,14 @@ class ConstraintHelper{
return [__FUNCTION__, $ignoreOfficer]; return [__FUNCTION__, $ignoreOfficer];
} }
static function NotChief():array{
return [__FUNCTION__];
}
static function NotLord():array{
return [__FUNCTION__];
}
static function NotOccupiedCity():array{ static function NotOccupiedCity():array{
return [__FUNCTION__]; return [__FUNCTION__];
} }
@@ -112,10 +124,6 @@ class ConstraintHelper{
return [__FUNCTION__]; return [__FUNCTION__];
} }
static function NotLord():array{
return [__FUNCTION__];
}
static function NotWanderingNation():array{ static function NotWanderingNation():array{
return [__FUNCTION__]; return [__FUNCTION__];
} }
@@ -128,6 +136,10 @@ class ConstraintHelper{
return [__FUNCTION__, $key, $actionName]; return [__FUNCTION__, $key, $actionName];
} }
static function RemainCityTrust(string $actionName):array{
return [__FUNCTION__, $actionName];
}
static function ReqCityCapacity($key, string $keyNick, $reqVal):array{ static function ReqCityCapacity($key, string $keyNick, $reqVal):array{
return [__FUNCTION__, $key, $keyNick, $reqVal]; return [__FUNCTION__, $key, $keyNick, $reqVal];
} }
@@ -172,6 +184,10 @@ class ConstraintHelper{
return [__FUNCTION__, $key, $keyNick, $comp, $reqVal]; return [__FUNCTION__, $key, $keyNick, $comp, $reqVal];
} }
static function ReqNationValue($key, string $keyNick, string $comp, $reqVal):array{
return [__FUNCTION__, $key, $keyNick, $comp, $reqVal];
}
static function ReqTroopMembers():array{ static function ReqTroopMembers():array{
return [__FUNCTION__]; return [__FUNCTION__];
} }
hwe/sammo/Constraint/ReqNationValue.php
+1 -1
View File
@@ -23,7 +23,7 @@ class ReqNationValue extends Constraint{
} }
if(count($this->arg) == 4){ if(count($this->arg) == 4){
[$this->key, $this->keyNick, $this->reqVal, $comp] = $this->arg; [$this->key, $this->keyNick, $comp, $this->reqVal] = $this->arg;
if(!in_array($comp, ['>', '>=', '==', '<=', '<', '!=', '===', '!=='])){ if(!in_array($comp, ['>', '>=', '==', '<=', '<', '!=', '===', '!=='])){
if(!$throwExeception){return false; } if(!$throwExeception){return false; }