버그 수정

hwe/sammo/Constraint/AllowJoinDestNation.php

@@ -45,7 +45,7 @@ class AllowJoinDestNation extends Constraint{
             return false;
         }
 
-        if($this->destNation['scout'] == 0){
+        if($this->destNation['scout'] == 1){
             $this->reason = "임관이 금지되어 있습니다.";
             return false;
         }

hwe/sammo/Constraint/AvailableRecruitCrewType.php

@@ -4,6 +4,8 @@ namespace sammo\Constraint;
 
 use \sammo\GameUnitConst;
 use \sammo\DB;
+use \sammo\KVStorage;
+use \sammo\CityConst;
 
 class AvailableRecruitCrewType extends Constraint{
     const REQ_VALUES = Constraint::REQ_NATION|Constraint::REQ_INT_ARG;

hwe/sammo/Constraint/BeLord.php

@@ -22,7 +22,7 @@ class BeLord extends Constraint{
         $this->checkInputValues();
         $this->tested = true;
 
-        if($this->general['level'] != 12){
+        if($this->general['level'] == 12){
             return true;
         }
 

hwe/sammo/Constraint/Constraint.php

@@ -193,9 +193,7 @@ abstract class Constraint{
             /** @var \sammo\Constraint\Constraint $contraint */
             $constraint = call_user_func($method,$input);
 
-            assert($constraint !== null);
             assert($constraint instanceof Constraint);
-            assert(count($constraintArgs) < 3);
             
             if(count($constraintArgs) == 2){
                 $arg = $constraintArgs[1];

hwe/sammo/Constraint/ReqCityTrust.php

@@ -4,7 +4,7 @@ namespace sammo\Constraint;
 
 use \sammo\JosaUtil;
 
-class RemainCityTrust extends Constraint{
+class ReqCityTrust extends Constraint{
     const REQ_VALUES = Constraint::REQ_CITY|Constraint::REQ_NUMERIC_ARG;
 
     protected $key;

hwe/sammo/Constraint/ReqGeneralGold.php

@@ -22,7 +22,7 @@ class ReqGeneralGold extends Constraint{
         $this->checkInputValues();
         $this->tested = true;
 
-        if($this->general['gold'] < $this->arg){
+        if($this->general['gold'] >= $this->arg){
             return true;
         }
 

hwe/sammo/Constraint/ReqGeneralRice.php

@@ -22,7 +22,7 @@ class ReqGeneralRice extends Constraint{
         $this->checkInputValues();
         $this->tested = true;
 
-        if($this->general['rice'] < $this->arg){
+        if($this->general['rice'] >= $this->arg){
             return true;
         }
 

hwe/sammo/Constraint/ReqNationalGold.php

@@ -22,7 +22,7 @@ class ReqNationGold extends Constraint{
         $this->checkInputValues();
         $this->tested = true;
 
-        if($this->nation['gold'] < $this->arg){
+        if($this->nation['gold'] >= $this->arg){
             return true;
         }
 

hwe/sammo/Constraint/ReqNationalRice.php

@@ -22,7 +22,7 @@ class ReqNationRice extends Constraint{
         $this->checkInputValues();
         $this->tested = true;
 
-        if($this->nation['rice'] < $this->arg){
+        if($this->nation['rice'] >= $this->arg){
             return true;
         }