Merge branch 'ng_turn' of ssh://storage.hided.net:2525/devsam/core into ng_turn

2020-04-14 01:49:46 +09:00
parent 85389c4a60 913289e0ef
commit 95ac7454ae
6 changed files with 554 additions and 1111 deletions
@@ -48,10 +48,14 @@ class che_NPC능동 extends Command\GeneralCommand{
        $this->setNation();
        

-        $this->runnableConstraints=[
+        $this->reservableConstraints=[
            ConstraintHelper::MustBeNPC()
        ];

+        $this->runnableConstraints=[
+
+        ];
+
    }

    public function getCost():array{
@@ -104,7 +104,7 @@ class che_징병 extends Command\GeneralCommand{
        $this->runnableConstraints=[
            ConstraintHelper::NotBeNeutral(), 
            ConstraintHelper::OccupiedCity(),
-            ConstraintHelper::ReqCityCapacity('pop', '주민', 30000 + $reqCrew),
+            ConstraintHelper::ReqCityCapacity('pop', '주민', GameConst::$minAvailableRecruitPop + $reqCrew),
            ConstraintHelper::ReqCityTrust(20),
            ConstraintHelper::ReqGeneralGold($reqGold),
            ConstraintHelper::ReqGeneralRice($reqRice),