랜임 모드 버그 수정

This commit is contained in:
2018-10-24 00:54:18 +09:00
parent 40e0adfefe
commit 8e8eda1012
7 changed files with 24 additions and 8 deletions
+4 -1
View File
@@ -134,7 +134,7 @@ function process_25(&$general) {
$allGen = array_sum($generals);
$genLimit = GameConst::$defaultMaxGeneral;
if($admin['join_mode'] == 'onlyRandom' && $admin['init_year'] == $admin['year'] && $admin['init_month'] + 1 <= $admin['month']){
if($admin['join_mode'] == 'onlyRandom' && $admin['init_year'] == $admin['year'] && in_array($admin['month'], [$admin['init_month'], ($admin['init_month'] + 1) %12])){
$genLimit = GameConst::$initialNationGenLimitForRandInit;
}
else if($admin['year'] < $admin['startyear'] + 3){
@@ -167,6 +167,9 @@ function process_25(&$general) {
if($randVals){
$nation = $nations[Util::choiceRandomUsingWeight($randVals)];
}
else{
$nation = null;
}
} else {
$nation = $db->queryFirstRow('SELECT `name`,nation,scout,`level` FROM nation WHERE nation=%i', $where);