From ba0439ece25d51b5b68d28029460e9702ec5cf2c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 20 Feb 2018 01:34:44 +0900
Subject: [PATCH] =?UTF-8?q?tm=EC=84=9C=EB=B2=84=EC=97=90=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9=EB=90=9C=20=ED=8C=A8=EC=B9=98=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=EC=9D=84=20=EA=B0=99=EC=9D=B4=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 twe/join.php        | 92 ++++++++++++++++++++++++++++++++++++---------
 twe/process_war.php |  2 +
 2 files changed, 77 insertions(+), 17 deletions(-)

diff --git a/twe/join.php b/twe/join.php
index 2e6a47e5..f1471aeb 100644
--- a/twe/join.php
+++ b/twe/join.php
@@ -32,42 +32,66 @@ $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 power = Math.random();
-    var intel = Math.random();
+    var leader = Math.random()*65 + 10;
+    var power = Math.random()*65 + 10;
+    var intel = Math.random()*65 + 10;
     var rate = leader + power + intel;
 
-    leader = Math.fllor(leader / rate * totalAbil);
-    power = Math.fllor(power / rate * totalAbil);
-    intel = Math.fllor(intel / rate * totalAbil);
+    leader = Math.floor(leader / rate * totalAbil);
+    power = Math.floor(power / 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);
-    power = Math.fllor(power / rate * totalAbil);
-    intel = Math.fllor(intel / rate * totalAbil);
-
+    leader = Math.floor(leader / rate * totalAbil);
+    power = Math.floor(power / 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);
@@ -80,14 +104,29 @@ function abilityLeadint(){
     var intel = Math.random() * 6;
     var rate = leader + power + intel;
 
-    leader = Math.fllor(leader / rate * totalAbil);
-    power = Math.fllor(power / rate * totalAbil);
-    intel = Math.fllor(intel / rate * totalAbil);
+    leader = Math.floor(leader / rate * totalAbil);
+    power = Math.floor(power / 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);
-    power = Math.fllor(power / rate * totalAbil);
-    intel = Math.fllor(intel / rate * totalAbil);
+    leader = Math.floor(leader / rate * totalAbil);
+    power = Math.floor(power / 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>
diff --git a/twe/process_war.php b/twe/process_war.php
index ef9726c6..89a9ae7d 100644
--- a/twe/process_war.php
+++ b/twe/process_war.php
@@ -1544,6 +1544,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;