tm서버에 적용된 패치 수정을 같이 적용

twe/join.php

@@ -32,43 +32,67 @@ $connect = dbConn();
 <script type="text/javascript" src=<?="../e_lib/jquery-3.2.1.min.js";?>></script>
 <script type="text/javascript">
 
+jQuery(function($){
+
 var totalAbil = 150;
 var $leader = $('#leader');
 var $power = $('#power');
 var $intel = $('#intel');
+
 function abilityRand(){
-    var leader = Math.random();
+    var leader = Math.random()*65 + 10;
-    var power = Math.random();
+    var power = Math.random()*65 + 10;
-    var intel = Math.random();
+    var intel = Math.random()*65 + 10;
     var rate = leader + power + intel;
 
-    leader = Math.fllor(leader / rate * totalAbil);
+    leader = Math.floor(leader / rate * totalAbil);
-    power = Math.fllor(power / rate * totalAbil);
+    power = Math.floor(power / rate * totalAbil);
-    intel = Math.fllor(intel / rate * totalAbil);
+    intel = Math.floor(intel / rate * totalAbil);
+    
 
     while(leader+power+intel < totalAbil){
         leader+=1;
     }
     
+    if(leader > 75 || power > 75 || intel > 75 || leader < 10 || power < 10 || intel < 10){
+        return abilityRand();
+    }
+
     $leader.val(leader);
     $power.val(power);
     $intel.val(intel);
 }
 
+
 function abilityLeadpow(){
     var leader = Math.random() * 6;
     var power = Math.random() * 6;
     var intel = Math.random() * 1;
     var rate = leader + power + intel;
 
-    leader = Math.fllor(leader / rate * totalAbil);
+    leader = Math.floor(leader / rate * totalAbil);
-    power = Math.fllor(power / rate * totalAbil);
+    power = Math.floor(power / rate * totalAbil);
-    intel = Math.fllor(intel / rate * totalAbil);
+    intel = Math.floor(intel / rate * totalAbil);
     
     while(leader+power+intel < totalAbil){
         power+=1;
     }
     
+    if(intel < 10){
+        leader -= 10 - intel;
+        intel = 10;
+    }
+    
+    if(leader > 75){
+        power += leader - 75;
+        leader = 75;
+    }
+    
+    if(power > 75){
+        leader += power - 75;
+        power = 75;
+    }
+
     $leader.val(leader);
     $power.val(power);
     $intel.val(intel);
@@ -80,14 +104,29 @@ function abilityLeadint(){
     var intel = Math.random() * 6;
     var rate = leader + power + intel;
 
-    leader = Math.fllor(leader / rate * totalAbil);
+    leader = Math.floor(leader / rate * totalAbil);
-    power = Math.fllor(power / rate * totalAbil);
+    power = Math.floor(power / rate * totalAbil);
-    intel = Math.fllor(intel / rate * totalAbil);
+    intel = Math.floor(intel / rate * totalAbil);
 
     while(leader+power+intel < totalAbil){
         intel+=1;
     }
 
+    if(power < 10){
+        leader -= 10 - power;
+        power = 10;
+    }
+    
+    if(leader > 75){
+        intel += leader - 75;
+        leader = 75;
+    }
+    
+    if(intel > 75){
+        leader += intel - 75;
+        intel = 75;
+    }
+
     $leader.val(leader);
     $power.val(power);
     $intel.val(intel);
@@ -99,20 +138,39 @@ function abilityPowint(){
     var intel = Math.random() * 6;
     var rate = leader + power + intel;
 
-    leader = Math.fllor(leader / rate * totalAbil);
+    leader = Math.floor(leader / rate * totalAbil);
-    power = Math.fllor(power / rate * totalAbil);
+    power = Math.floor(power / rate * totalAbil);
-    intel = Math.fllor(intel / rate * totalAbil);
+    intel = Math.floor(intel / rate * totalAbil);
 
     while(leader+power+intel < totalAbil){
         intel+=1;
     }
 
+    if(leader < 10){
+        power -= 10 - leader;
+        leader = 10;
+    }
+    
+    if(power > 75){
+        intel += power - 75;
+        power = 75;
+    }
+    
+    if(intel > 75){
+        power += intel - 75;
+        intel = 75;
+    }
+
     $leader.val(leader);
     $power.val(power);
     $intel.val(intel);
 }
-}
 
+window.abilityRand = abilityRand;
+window.abilityLeadpow = abilityLeadpow;
+window.abilityLeadint = abilityLeadint;
+window.abilityPowint = abilityPowint;
+});
 </script>
 <?php require('analytics.php'); ?>
 </head>

twe/process_war.php

@@ -1545,6 +1545,8 @@ function getCrewtypeRice($game, $crewtype, $tech) {
 function getAtt($game, $general, $tech, $lbonus) {
     $att = getRate($game, $general['crewtype'], "att") + getTechAbil($tech);
     
+    $general['lbonus'] = $lbonus;
+
     if(floor($general['crewtype']/10) == 3) {   // 귀병 지100%
         $ratio = getGeneralIntel($general, true, true, true)*2 - 40;
     } elseif(floor($general['crewtype']/10) == 4) {   // 차병 통100%