Merge branch 'devel' into sars

requireUserLevel()에서 $reqLevel 반영이 되다 만 것 수정

che_close/install3_ok.php

@@ -3,7 +3,6 @@ include "lib.php";
 include "func.php";
 
 $connect=dbConn();
-requireUserLevel($connect, 5);
 
 LogHistory($connect, 1);
 

che_close/join_post.php

@@ -141,14 +141,23 @@ if($id_num) {
     }
     $city = $city[city];
 
-    $total  = 3 + rand() % 3;
-    $pleader = rand() % 100;
-    $ppower  = rand() % 100;
-    $pintel  = rand() % 100;
-    $rate = $pleader + $ppower + $pintel;
-    $pleader = floor($pleader / $rate * $total + 0.5);
-    $ppower  = floor($ppower  / $rate * $total + 0.5);
-    $pintel  = floor($pintel  / $rate * $total + 0.5);
+
+    $pleader = 0;
+    $ppower = 0;
+    $pintel = 0;
+    for($statBonusCnt = 3 + rand() % 3; $statBonusCnt > 0; $statBonusCnt--){
+        switch(ChooseRandomItem(array($leader, $power, $intel))){
+        case 0:
+            $pleader++;
+            break;
+        case 1:
+            $ppower++;
+            break;
+        case 2:
+            $pintel++;
+            break;
+        }
+    }
 
     $leader = $leader + $pleader;
     $power = $power + $ppower;

che_close/lib.php

@@ -173,7 +173,7 @@ function requireUserLevel($connect, $reqLevel=5){
     $p_id = isset($_SESSION['p_id'])?$_SESSION['p_id']:null;
     if(!$p_id){
 
-        $query = "select count(*) as cnt from general where userlevel < 4 limit 1";
+        $query = "select count(*) as cnt from general where userlevel < $reqLevel limit 1";
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $cnt = MYDB_fetch_array($result);
 

che_close/process_war.php

@@ -301,11 +301,11 @@ function processWar($connect, $general, $city) {
                         }
                     }
                 } elseif($general[crewtype] == 40) { // 정란
-                    $cityCrew = $cityCrew * 1.5;
+                    $cityCrew = $cityCrew * 1.8;
                 } elseif($general[crewtype] == 41) { // 충차
-                    $cityCrew = $cityCrew * 2.0;
+                    $cityCrew = $cityCrew * 2.4;
                 } elseif($general[crewtype] == 42) { // 벽력거
-                    $cityCrew = $cityCrew * 1.5;
+                    $cityCrew = $cityCrew * 1.8;
                 }
                 //군주 공격 보정 10%
                 if($general[level] == 12) {