랜덤 임관 깃수용 코드 이식

hwe/process_war.php

@@ -30,7 +30,7 @@ function processWar(array $rawAttacker, array $rawDefenderCity){
     }
 
     $gameStor = KVStorage::getStorage($db, 'game_env');
-    [$startYear, $year, $month, $cityRate] = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'city_rate']);
+    [$startYear, $year, $month, $cityRate, $joinMode] = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'city_rate', 'join_mode']);
 
     $attacker = new WarUnitGeneral($rawAttacker, $rawAttackerCity, $rawAttackerNation, true, $year, $month);
 
@@ -147,7 +147,8 @@ function processWar(array $rawAttacker, array $rawDefenderCity){
         'startyear'=>$startYear,
         'year'=>$year,
         'month'=>$month,
-        'city_rate'=>$cityRate
+        'city_rate'=>$cityRate,
+        'join_mode'=>$joinMode,
     ], $attacker->getRaw(), $city->getRaw(), $rawAttackerNation, $rawDefenderNation);
 }
 
@@ -561,7 +562,7 @@ function ConquerCity($admin, $general, $city, $nation, $destnation) {
             }
 
             //NPC인 경우 10% 확률로 임관(엔장, 인재, 의병)
-            if($gen['npc'] >= 2 && $gen['npc'] <= 8 && $gen['npc'] != 5 && rand() % 100 < 10) {
+            if($admin['join_mode'] != 'onlyRandom' && $gen['npc'] >= 2 && $gen['npc'] <= 8 && $gen['npc'] != 5 && Util::randBool(0.1)) {
                 setGeneralCommand($gen['no'], [0], 'che_임관', ['destNationID'=>$nation['nation']]);
             }
         }