diff --git a/hwe/sammo/Command/Nation/che_백성동원.php b/hwe/sammo/Command/Nation/che_백성동원.php index 628b6ae9..4e8daf08 100644 --- a/hwe/sammo/Command/Nation/che_백성동원.php +++ b/hwe/sammo/Command/Nation/che_백성동원.php @@ -72,8 +72,8 @@ class che_백성동원 extends Command\NationCommand{ $this->fullConditionConstraints=[ ConstraintHelper::OccupiedCity(), ConstraintHelper::BeChief(), - ConstraintHelper::AllowDiplomacyStatus($this->generalObj->getNationID(), [ - 0 + ConstraintHelper::DisallowDiplomacyStatus($this->generalObj->getNationID(), [ + 2, 7 ], '전쟁중이 아닙니다.'), ConstraintHelper::OccupiedDestCity(), ConstraintHelper::AvailableStrategicCommand() diff --git a/hwe/sammo/Constraint/AllowDiplomacyStatus.php b/hwe/sammo/Constraint/AllowDiplomacyStatus.php index c9bfba5a..485874f9 100644 --- a/hwe/sammo/Constraint/AllowDiplomacyStatus.php +++ b/hwe/sammo/Constraint/AllowDiplomacyStatus.php @@ -53,7 +53,7 @@ class AllowDiplomacyStatus extends Constraint{ $db = DB::db(); $state = $db->queryFirstField( - 'SELECT state FROM diplomacy WHERE me = %i AND `state` NOT IN %li LIMIT 1', + 'SELECT state FROM diplomacy WHERE me = %i AND `state` IN %li LIMIT 1', $this->nationID, $this->allowStatus );