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

버그 수정

Browse Source
This commit is contained in:
Hide_D
2019-04-21 11:43:23 +09:00
parent a21eef6e84
commit b4b6f5a1f7
56 changed files with 77 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Constraint/AdhocCallback.php
+1 -1
View File
@@ -8,7 +8,7 @@ class AdhocCallback extends Constraint{
const REQ_VALUES = Constraint::REQ_ARG; const REQ_VALUES = Constraint::REQ_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/AllowJoinAction.php
+1 -1
View File
@@ -7,7 +7,7 @@ class AllowJoinAction extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/AllowJoinDestNation.php
+2 -2
View File
@@ -10,7 +10,7 @@ class AllowJoinDestNation extends Constraint{
protected $relYear; protected $relYear;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
@@ -40,7 +40,7 @@ class AllowJoinDestNation extends Constraint{
$db = DB::db(); $db = DB::db();
if($relYear < GameConst::$openingPartYear && $this->destNation['gennum'] >= GameConst::$initialNationGenLimit){ if($this->relYear < GameConst::$openingPartYear && $this->destNation['gennum'] >= GameConst::$initialNationGenLimit){
$this->reason = "임관이 제한되고 있습니다."; $this->reason = "임관이 제한되고 있습니다.";
return false; return false;
} }
hwe/sammo/Constraint/AllowRebellion.php
+1 -1
View File
@@ -11,7 +11,7 @@ class AllowRebellion extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/AllowStrategicCommand.php
+1 -1
View File
@@ -6,7 +6,7 @@ class AllowWar extends Constraint{
const REQ_VALUES = Constraint::REQ_NATION; const REQ_VALUES = Constraint::REQ_NATION;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/AllowWar.php
+1 -1
View File
@@ -6,7 +6,7 @@ class AllowWar extends Constraint{
const REQ_VALUES = Constraint::REQ_NATION; const REQ_VALUES = Constraint::REQ_NATION;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/AlwaysFail.php
+1 -1
View File
@@ -8,7 +8,7 @@ class AlwaysFail extends Constraint{
const REQ_VALUES = Constraint::REQ_STRING_ARG; const REQ_VALUES = Constraint::REQ_STRING_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/AvailableRecruitCrewType.php
+1 -1
View File
@@ -9,7 +9,7 @@ class AvailableRecruitCrewType extends Constraint{
const REQ_VALUES = Constraint::REQ_NATION|Constraint::REQ_INT_ARG; const REQ_VALUES = Constraint::REQ_NATION|Constraint::REQ_INT_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/BattleGroundCity.php
+1 -1
View File
@@ -7,7 +7,7 @@ class BattleGroundCity extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_CITY|Constraint::REQ_BOOLEAN_ARG; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_CITY|Constraint::REQ_BOOLEAN_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/BeChief.php
+1 -1
View File
@@ -6,7 +6,7 @@ class BeChief extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/BeLord.php
+1 -1
View File
@@ -6,7 +6,7 @@ class BeLord extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/BeNeutral.php
+1 -1
View File
@@ -6,7 +6,7 @@ class BeNeutral extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/BeOpeningPart.php
+2 -2
View File
@@ -8,7 +8,7 @@ class BeOpeningPart extends Constraint{
protected $relYear; protected $relYear;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
@@ -21,7 +21,7 @@ class BeOpeningPart extends Constraint{
$this->checkInputValues(); $this->checkInputValues();
$this->tested = true; $this->tested = true;
if($relYear < GameConst::$openingPartYear){ if($this->relYear < GameConst::$openingPartYear){
return true; return true;
} }
hwe/sammo/Constraint/CheckNationNameDuplicate.php
+1 -1
View File
@@ -9,7 +9,7 @@ class CheckNationNameDuplicate extends Constraint{
protected $relYear; protected $relYear;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ConstructableCity.php
+2 -2
View File
@@ -8,7 +8,7 @@ class ConstructableCity extends Constraint{
protected $relYear; protected $relYear;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
@@ -29,7 +29,7 @@ class ConstructableCity extends Constraint{
$this->checkInputValues(); $this->checkInputValues();
$this->tested = true; $this->tested = true;
$city = $this->city(); $city = $this->city;
if($city['nation'] != 0){ if($city['nation'] != 0){
$this->reason = '공백지가 아닙니다.'; $this->reason = '공백지가 아닙니다.';
hwe/sammo/Constraint/DifferentNationDestGeneral.php
+1 -1
View File
@@ -6,7 +6,7 @@ class DifferentNationDestGeneral extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/DisallowDiplomacyBetweenStatus.php
+1 -1
View File
@@ -12,7 +12,7 @@ class DisallowDiplomacyBetweenStatus extends Constraint{
protected $disallowStatus = []; protected $disallowStatus = [];
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/DisallowDiplomacyStatus.php
+1 -1
View File
@@ -11,7 +11,7 @@ class DisallowDiplomacyStatus extends Constraint{
protected $disallowStatus = []; protected $disallowStatus = [];
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ExistsAllowJoinNation.php
+1 -1
View File
@@ -10,7 +10,7 @@ class AllowJoinDestNation extends Constraint{
protected $relYear; protected $relYear;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ExistsDestGeneral.php
+1 -1
View File
@@ -6,7 +6,7 @@ class ExistsDestGeneral extends Constraint{
const REQ_VALUES = Constraint::REQ_DEST_GENERAL; const REQ_VALUES = Constraint::REQ_DEST_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ExistsDestNation.php
+1 -1
View File
@@ -6,7 +6,7 @@ class ExistsDestNation extends Constraint{
const REQ_VALUES = Constraint::REQ_DEST_NATION; const REQ_VALUES = Constraint::REQ_DEST_NATION;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/FriendlyDestGeneral.php
+1 -1
View File
@@ -6,7 +6,7 @@ class FriendlyDestGeneral extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/MustBeNPC.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace sammo\Constraint;
class MustBeNPC extends Constraint{ class MustBeNPC extends Constraint{
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/MustBeTroopLeader.php
+1 -1
View File
@@ -8,7 +8,7 @@ class MustBeTroopLeader extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/NearCity.php
+1 -1
View File
@@ -6,7 +6,7 @@ class NearCity extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_CITY|Constraint::REQ_NUMERIC_ARG; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_CITY|Constraint::REQ_NUMERIC_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/NotBeNeutral.php
+1 -1
View File
@@ -6,7 +6,7 @@ class NotBeNeutral extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/NotCapital.php
+1 -1
View File
@@ -6,7 +6,7 @@ class NotCapital extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_NATION|Constraint::REQ_BOOLEAN_ARG; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_NATION|Constraint::REQ_BOOLEAN_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/NotChief.php
+1 -1
View File
@@ -6,7 +6,7 @@ class NotChief extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/NotLord.php
+1 -1
View File
@@ -6,7 +6,7 @@ class NotLord extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/NotNeutralDestCity.php
+1 -1
View File
@@ -6,7 +6,7 @@ class NotBeNeutral extends Constraint{
const REQ_VALUES = Constraint::REQ_DEST_CITY; const REQ_VALUES = Constraint::REQ_DEST_CITY;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/NotOccupiedDestCity.php
+1 -1
View File
@@ -6,7 +6,7 @@ class NotOccupiedDestCity extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_CITY; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_CITY;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/NotOpeningPart.php
+2 -2
View File
@@ -8,7 +8,7 @@ class NotOpeningPart extends Constraint{
protected $relYear; protected $relYear;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
@@ -21,7 +21,7 @@ class NotOpeningPart extends Constraint{
$this->checkInputValues(); $this->checkInputValues();
$this->tested = true; $this->tested = true;
if($relYear >= GameConst::$openingPartYear){ if($this->relYear >= GameConst::$openingPartYear){
return true; return true;
} }
hwe/sammo/Constraint/NotSameDestCity.php
+1 -1
View File
@@ -6,7 +6,7 @@ class NotSameDestCity extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_CITY; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_CITY;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/NotWanderingNation.php
+1 -1
View File
@@ -6,7 +6,7 @@ class NotWanderingNation extends Constraint{
const REQ_VALUES = Constraint::REQ_NATION; const REQ_VALUES = Constraint::REQ_NATION;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/OccupiedCity.php
+1 -1
View File
@@ -6,7 +6,7 @@ class OccupiedCity extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_CITY|Constraint::REQ_BOOLEAN_ARG; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_CITY|Constraint::REQ_BOOLEAN_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/OccupiedDestCity.php
+1 -1
View File
@@ -6,7 +6,7 @@ class OccupiedDestCity extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_CITY; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_DEST_CITY;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/RemainCityCapacity.php
+2 -1
View File
@@ -12,7 +12,7 @@ class RemainCityCapacity extends Constraint{
protected $keyNick; protected $keyNick;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
@@ -35,6 +35,7 @@ class RemainCityCapacity extends Constraint{
public function test():bool{ public function test():bool{
$this->checkInputValues(); $this->checkInputValues();
$this->tested = true; $this->tested = true;
$keyNick = $this->keyNick;
if($this->city[$this->key] < $this->city[$this->maxKey]){ if($this->city[$this->key] < $this->city[$this->maxKey]){
return true; return true;
hwe/sammo/Constraint/RemainCityTrust.php
+2 -1
View File
@@ -12,7 +12,7 @@ class RemainCityTrust extends Constraint{
protected $keyNick; protected $keyNick;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
@@ -31,6 +31,7 @@ class RemainCityTrust extends Constraint{
public function test():bool{ public function test():bool{
$this->checkInputValues(); $this->checkInputValues();
$this->tested = true; $this->tested = true;
$keyNick = $this->keyNick;
if($this->city[$this->key] < $this->maxVal){ if($this->city[$this->key] < $this->maxVal){
return true; return true;
hwe/sammo/Constraint/ReqCityCapacity.php
+3 -2
View File
@@ -14,7 +14,7 @@ class ReqCityCapacity extends Constraint{
protected $reqVal; protected $reqVal;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
@@ -50,6 +50,7 @@ class ReqCityCapacity extends Constraint{
public function test():bool{ public function test():bool{
$this->checkInputValues(); $this->checkInputValues();
$this->tested = true; $this->tested = true;
$keyNick = $this->keyNick;
if($this->isPercent){ if($this->isPercent){
if($this->city[$this->key] >= $this->city[$this->maxKey] * $this->reqVal){ if($this->city[$this->key] >= $this->city[$this->maxKey] * $this->reqVal){
@@ -64,7 +65,7 @@ class ReqCityCapacity extends Constraint{
} }
$josaYi = JosaUtil::pick($keyNick, '이'); $josaYi = JosaUtil::pick($keyNick, '이');
$this->reason = "{$keyNick}{$josaUn} 부족합니다."; $this->reason = "{$keyNick}{$josaYi} 부족합니다.";
return false; return false;
} }
} }
hwe/sammo/Constraint/ReqCityTrader.php
+1 -1
View File
@@ -6,7 +6,7 @@ class ReqCityTrader extends Constraint{
const REQ_VALUES = Constraint::REQ_CITY|Constraint::REQ_INT_ARG; const REQ_VALUES = Constraint::REQ_CITY|Constraint::REQ_INT_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ReqCityTrust.php
+1 -1
View File
@@ -12,7 +12,7 @@ class RemainCityTrust extends Constraint{
protected $keyNick; protected $keyNick;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ReqEnvValue.php
+3 -3
View File
@@ -18,7 +18,7 @@ class ReqEnvValue extends Constraint{
protected $msg; protected $msg;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
@@ -62,13 +62,13 @@ class ReqEnvValue extends Constraint{
'=='=>function($target, $src){ '=='=>function($target, $src){
return ($target == $src); return ($target == $src);
}, },
'!='=>function($targeta, $src){ '!='=>function($target, $src){
return ($target != $src); return ($target != $src);
}, },
'==='=>function($target, $src){ '==='=>function($target, $src){
return ($target === $src); return ($target === $src);
}, },
'!=='=>function($targeta, $src){ '!=='=>function($target, $src){
return ($target !== $src); return ($target !== $src);
}, },
'>='=>function($target, $src){ '>='=>function($target, $src){
hwe/sammo/Constraint/ReqGeneralAtmosMargin.php
+1 -1
View File
@@ -7,7 +7,7 @@ class ReqGeneralAtmosMargin extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_INT_ARG; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_INT_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ReqGeneralCrew.php
+1 -1
View File
@@ -6,7 +6,7 @@ class ReqGeneralCrew extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ReqGeneralCrewMargin.php
+6 -7
View File
@@ -6,10 +6,12 @@ use sammo\GameUnitConst;
use sammo\General; use sammo\General;
class ReqGeneralCrewMargin extends Constraint{ class ReqGeneralCrewMargin extends Constraint{
protected $crewType;
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_INT_ARG; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_INT_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
@@ -25,22 +27,19 @@ class ReqGeneralCrewMargin extends Constraint{
} }
} }
$this->crewType = $this->arg;
return true; return true;
} }
public function test():bool{ public function test():bool{
$this->checkInputValues(); $this->checkInputValues();
$this->tested = true; $this->tested = true;
$reqCrewType = GameUnitConst::byID($this->arg);
if($crewType != $this->general['crewtype']){
return true;
}
//XXX: 왜 General -> obj -> General 변환을 하고 있나? //XXX: 왜 General -> obj -> General 변환을 하고 있나?
$generalObj = new General($this->general, null, null, null, false); $generalObj = new General($this->general, null, null, null, false);
$reqCrewType = GameUnitConst::byID($this->arg);
if($reqCrewType->id != $generalObj->getCrewTypeObj()->id){ if($reqCrewType->id != $generalObj->getCrewTypeObj()->id){
return true; return true;
} }
hwe/sammo/Constraint/ReqGeneralGold.php
+1 -1
View File
@@ -6,7 +6,7 @@ class ReqGeneralGold extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_NUMERIC_ARG; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_NUMERIC_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ReqGeneralRice.php
+1 -1
View File
@@ -6,7 +6,7 @@ class ReqGeneralRice extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_NUMERIC_ARG; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_NUMERIC_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ReqGeneralTrainMargin.php
+1 -1
View File
@@ -7,7 +7,7 @@ class ReqGeneralTrainMargin extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_INT_ARG; const REQ_VALUES = Constraint::REQ_GENERAL|Constraint::REQ_INT_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ReqGeneralValue.php
+4 -3
View File
@@ -18,7 +18,7 @@ class ReqGeneralValue extends Constraint{
protected $comp; protected $comp;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
@@ -67,6 +67,7 @@ class ReqGeneralValue extends Constraint{
public function test():bool{ public function test():bool{
$this->checkInputValues(); $this->checkInputValues();
$this->tested = true; $this->tested = true;
$keyNick = $this->keyNick;
if ($this->isPercent) { if ($this->isPercent) {
$reqVal = $this->general[$this->maxKey] * $this->reqVal; $reqVal = $this->general[$this->maxKey] * $this->reqVal;
@@ -85,13 +86,13 @@ class ReqGeneralValue extends Constraint{
'=='=>function($target, $src)use($keyNick){ '=='=>function($target, $src)use($keyNick){
return ($target == $src)?true:"올바르지 않은 {$keyNick} 입니다."; return ($target == $src)?true:"올바르지 않은 {$keyNick} 입니다.";
}, },
'!='=>function($targeta, $src)use($keyNick){ '!='=>function($target, $src)use($keyNick){
return ($target != $src)?true:"올바르지 않은 {$keyNick} 입니다."; return ($target != $src)?true:"올바르지 않은 {$keyNick} 입니다.";
}, },
'==='=>function($target, $src)use($keyNick){ '==='=>function($target, $src)use($keyNick){
return ($target === $src)?true:"올바르지 않은 {$keyNick} 입니다."; return ($target === $src)?true:"올바르지 않은 {$keyNick} 입니다.";
}, },
'!=='=>function($targeta, $src)use($keyNick){ '!=='=>function($target, $src)use($keyNick){
return ($target !== $src)?true:"올바르지 않은 {$keyNick} 입니다."; return ($target !== $src)?true:"올바르지 않은 {$keyNick} 입니다.";
}, },
'>='=>function($target, $src){ '>='=>function($target, $src){
hwe/sammo/Constraint/ReqNationValue.php
+4 -3
View File
@@ -18,7 +18,7 @@ class ReqNationValue extends Constraint{
protected $comp; protected $comp;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
@@ -67,6 +67,7 @@ class ReqNationValue extends Constraint{
public function test():bool{ public function test():bool{
$this->checkInputValues(); $this->checkInputValues();
$this->tested = true; $this->tested = true;
$keyNick = $this->keyNick;
if ($this->isPercent) { if ($this->isPercent) {
$reqVal = $this->nation[$this->maxKey] * $this->reqVal; $reqVal = $this->nation[$this->maxKey] * $this->reqVal;
@@ -85,13 +86,13 @@ class ReqNationValue extends Constraint{
'=='=>function($target, $src)use($keyNick){ '=='=>function($target, $src)use($keyNick){
return ($target == $src)?true:"올바르지 않은 {$keyNick} 입니다."; return ($target == $src)?true:"올바르지 않은 {$keyNick} 입니다.";
}, },
'!='=>function($targeta, $src)use($keyNick){ '!='=>function($target, $src)use($keyNick){
return ($target != $src)?true:"올바르지 않은 {$keyNick} 입니다."; return ($target != $src)?true:"올바르지 않은 {$keyNick} 입니다.";
}, },
'==='=>function($target, $src)use($keyNick){ '==='=>function($target, $src)use($keyNick){
return ($target === $src)?true:"올바르지 않은 {$keyNick} 입니다."; return ($target === $src)?true:"올바르지 않은 {$keyNick} 입니다.";
}, },
'!=='=>function($targeta, $src)use($keyNick){ '!=='=>function($target, $src)use($keyNick){
return ($target !== $src)?true:"올바르지 않은 {$keyNick} 입니다."; return ($target !== $src)?true:"올바르지 않은 {$keyNick} 입니다.";
}, },
'>='=>function($target, $src){ '>='=>function($target, $src){
hwe/sammo/Constraint/ReqNationalGold.php
+1 -1
View File
@@ -6,7 +6,7 @@ class ReqNationGold extends Constraint{
const REQ_VALUES = Constraint::REQ_NATION|Constraint::REQ_NUMERIC_ARG; const REQ_VALUES = Constraint::REQ_NATION|Constraint::REQ_NUMERIC_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ReqNationalRice.php
+1 -1
View File
@@ -6,7 +6,7 @@ class ReqNationRice extends Constraint{
const REQ_VALUES = Constraint::REQ_NATION|Constraint::REQ_NUMERIC_ARG; const REQ_VALUES = Constraint::REQ_NATION|Constraint::REQ_NUMERIC_ARG;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/ReqTroopMembers.php
+1 -1
View File
@@ -7,7 +7,7 @@ class ReqTroopMembers extends Constraint{
const REQ_VALUES = Constraint::REQ_GENERAL; const REQ_VALUES = Constraint::REQ_GENERAL;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/SuppliedCity.php
+1 -1
View File
@@ -6,7 +6,7 @@ class SuppliedCity extends Constraint{
const REQ_VALUES = Constraint::REQ_CITY; const REQ_VALUES = Constraint::REQ_CITY;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/SuppliedDestCity.php
+1 -1
View File
@@ -6,7 +6,7 @@ class SuppliedDestCity extends Constraint{
const REQ_VALUES = Constraint::REQ_DEST_CITY; const REQ_VALUES = Constraint::REQ_DEST_CITY;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }
hwe/sammo/Constraint/WanderingNation.php
+1 -1
View File
@@ -6,7 +6,7 @@ class WanderingNation extends Constraint{
const REQ_VALUES = Constraint::REQ_NATION; const REQ_VALUES = Constraint::REQ_NATION;
public function checkInputValues(bool $throwExeception=true){ public function checkInputValues(bool $throwExeception=true){
if(!parent::checkInputValues($throwExeception) && !$throwException){ if(!parent::checkInputValues($throwExeception) && !$throwExeception){
return false; return false;
} }