dev에서 쉽게 확인가능한 코드 이전

hwe/sammo/GameConstBase.php

@@ -78,6 +78,19 @@ class GameConstBase
     /** @var int 최대 기술 레벨 */
     public static $maxTechLevel = 12;
 
+    /** @var int 최소 인구 증가량 */
+    public static $basePopIncreaseAmount = 5000;
+    /** @var int 증축시 인구 증가량 */
+    public static $expandCityPopIncreaseAmount = 100000;
+    /** @var int 증축시 내정 증가량 */
+    public static $expandCityDevelIncreaseAmount = 2000;
+    /** @var int 증축시 성벽 증가량 */
+    public static $expandCityWallIncreaseAmount = 2000;
+    /** @var int 증축시 최소 비용 */
+    public static $expandCityDefaultCost = 60000;
+    /** @var int 증축시 비용 계수 */
+    public static $expandCityCostCoef = 500;
+
     /** @var int 초기 제한시 장수 제한 */
     public static $initialNationGenLimitForRandInit = 3;
 

hwe/sammo/ResetHelper.php

@@ -145,7 +145,8 @@ class ResetHelper{
         int $show_img_level,
         int $tournament_trig,
         string $join_mode,
-        string $turntime
+        string $turntime,
+        ?array $autorun_user
     ):array{
         //FIXME: 분리할 것
         if(120 % $turnterm != 0){
@@ -239,7 +240,7 @@ class ResetHelper{
             'msg'=>'공지사항',//TODO:공지사항
             'maxgeneral'=>GameConst::$defaultMaxGeneral,
             'maxnation'=>GameConst::$defaultMaxNation,
-            'conlimit'=>300,
+            'conlimit'=>30000,
             'gold_rate'=>100,
             'rice_rate'=>100,
             'develcost'=>$develcost,
@@ -256,8 +257,7 @@ class ResetHelper{
             'fiction'=>$fiction,
             'tnmt_trig'=>$tournament_trig,
             'prev_winner'=>$prevWinner,
-            'tournament'=>0,
-            'server_cnt'=>$db->queryFirstField('SELECT count(*) FROM ng_games')
+            'autorun_user'=>$autorun_user
         ];
 
         foreach(RootDB::db()->query('SELECT `no`, `name`, `picture`, `imgsvr` FROM member WHERE grade >= 5') as $admin){

hwe/sammo/Scenario.php

@@ -354,7 +354,7 @@ class Scenario{
             'npc_cnt'=>count($this->getNPC()),
             'npcEx_cnt'=>count($this->getNPCex()),
             'npcNeutral_cnt'=>count($this->getNPCneutral()),
-            'nation'=>array_map(function($nation) use ($nationGeneralCnt, $nationGeneralExCnt){
+            'nation'=>array_map(function($nation) use ($nationGeneralCnt, $nationGeneralExCnt, $nationGeneralNeutralCnt){
                 $brief = $nation->getBrief();
                 $brief['generals'] = Util::array_get($nationGeneralCnt[$nation->getID()], 0);
                 $brief['generalsEx'] = Util::array_get($nationGeneralExCnt[$nation->getID()], 0);