Added NPA message & evs left

Fixes #32
jake-white · Dec 13, 2017 · 1b63e57 · 1b63e57
1 parent d2000e3
commit 1b63e57
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/index.html b/index.html
@@ -59,6 +59,7 @@
     (adsbygoogle = window.adsbygoogle || []).push({});
     </script>
     </div>
+    <h3 style="color: #1DA1F2;">Tweet with the hashtag #draftsquirrelboyforNPA to support a good cause ;)</h3>
     <p>Ultra Sun & Ultra Moon VGC calculator by Jake White (<a href="https://twitter.com/squirrelboyVGC">@squirrelboyVGC</a>). Submit bug/feature reports/requests through <a href="https://github.com/jake-white/VGC-Damage-Calculator/issues">Github</a> or <a href="http://www.trainertower.com/forums/threads/damage-calculator-bug-reports.62/">this thread</a>, not through Twitter please :)</p>
 
     <!-- OLD NUGGETBRIDGE ADS -->
@@ -126,7 +127,7 @@
                         <tr class="sd gen-specific g2 g3 g4 g5 g6 g7"><td><label>Sp. Def</label></td><td><input class="base calc-trigger" value="100" /></td><td class="gen-specific g3 g4 g5 g6 g7"><input class="ivs calc-trigger" value="31" /></td><td class="gen-specific g3 g4 g5 g6 g7"><input class="evs calc-trigger" type="number" min="0" max="252" step="4" value="0" /></td><td class="gen-specific g1 g2 hide"><input class="dvs calc-trigger" value="15" disabled="disabled" /></td><td><span class="total">236</span></td><td><select class="boost calc-trigger"><option value="6">+6</option><option value="5">+5</option><option value="4">+4</option><option value="3">+3</option><option value="2">+2</option><option value="1">+1</option><option value="0" selected="selected">--</option><option value="-1">-1</option><option value="-2">-2</option><option value="-3">-3</option><option value="-4">-4</option><option value="-5">-5</option><option value="-6">-6</option></select></td></tr>
                         <tr class="sl gen-specific g1 hide"><td><label>Special</label></td><td><input class="base calc-trigger" value="100" /></td><td><input class="dvs calc-trigger" value="15" /></td><td><span class="total">236</span></td><td><select class="boost calc-trigger"><option value="6">+6</option><option value="5">+5</option><option value="4">+4</option><option value="3">+3</option><option value="2">+2</option><option value="1">+1</option><option value="0" selected="selected">--</option><option value="-1">-1</option><option value="-2">-2</option><option value="-3">-3</option><option value="-4">-4</option><option value="-5">-5</option><option value="-6">-6</option></select></td></tr>
                         <tr class="sp"><td><label>Speed</label></td><td><input class="base calc-trigger" value="100" /></td><td class="gen-specific g3 g4 g5 g6 g7"><input class="ivs calc-trigger" value="31" /></td><td class="gen-specific g3 g4 g5 g6 g7"><input class="evs calc-trigger" type="number" min="0" max="252" step="4" value="0" /></td><td class="gen-specific g1 g2 hide"><input class="dvs calc-trigger" value="15" /></td><td><span class="total">236</span></td><td><select class="boost calc-trigger"><option value="6">+6</option><option value="5">+5</option><option value="4">+4</option><option value="3">+3</option><option value="2">+2</option><option value="1">+1</option><option value="0" selected="selected">--</option><option value="-1">-1</option><option value="-2">-2</option><option value="-3">-3</option><option value="-4">-4</option><option value="-5">-5</option><option value="-6">-6</option></select></td></tr>
-                        <tr><td></td><td></td><td></td><td class='ev-total'>&nbsp;</td><td></td><td></td><td></td></tr>
+                        <tr><td></td><td></td><td></td><td class='ev-total'>&nbsp;</td><td class='ev-left'>&nbsp;</td><td></td><td></td><td></td></tr>
                     </table>
                 </div>
                 <div class="info-group info-selectors">
@@ -393,7 +394,7 @@ <h4 class="panel-title">Field
                         <tr class="sd gen-specific g2 g3 g4 g5 g6 g7"><td><label>Sp. Def</label></td><td><input class="base calc-trigger" value="100" /></td><td class="gen-specific g3 g4 g5 g6 g7"><input class="ivs calc-trigger" value="31" /></td><td class="gen-specific g3 g4 g5 g6 g7"><input class="evs calc-trigger" type="number" min="0" max="252" step="4" value="0" /></td><td class="gen-specific g1 g2 hide"><input class="dvs calc-trigger" value="15" disabled="disabled" /></td><td><span class="total">236</span></td><td><select class="boost calc-trigger"><option value="6">+6</option><option value="5">+5</option><option value="4">+4</option><option value="3">+3</option><option value="2">+2</option><option value="1">+1</option><option value="0" selected="selected">--</option><option value="-1">-1</option><option value="-2">-2</option><option value="-3">-3</option><option value="-4">-4</option><option value="-5">-5</option><option value="-6">-6</option></select></td></tr>
                         <tr class="sl gen-specific g1 hide"><td><label>Special</label></td><td><input class="base calc-trigger" value="100" /></td><td><input class="dvs calc-trigger" value="15" /></td><td><span class="total">236</span></td><td><select class="boost calc-trigger"><option value="6">+6</option><option value="5">+5</option><option value="4">+4</option><option value="3">+3</option><option value="2">+2</option><option value="1">+1</option><option value="0" selected="selected">--</option><option value="-1">-1</option><option value="-2">-2</option><option value="-3">-3</option><option value="-4">-4</option><option value="-5">-5</option><option value="-6">-6</option></select></td></tr>
                         <tr class="sp"><td><label>Speed</label></td><td><input class="base calc-trigger" value="100" /></td><td class="gen-specific g3 g4 g5 g6 g7"><input class="ivs calc-trigger" value="31" /></td><td class="gen-specific g3 g4 g5 g6 g7"><input class="evs calc-trigger" type="number" min="0" max="252" step="4" value="0" /></td><td class="gen-specific g1 g2 hide"><input class="dvs calc-trigger" value="15" /></td><td><span class="total">236</span></td><td><select class="boost calc-trigger"><option value="6">+6</option><option value="5">+5</option><option value="4">+4</option><option value="3">+3</option><option value="2">+2</option><option value="1">+1</option><option value="0" selected="selected">--</option><option value="-1">-1</option><option value="-2">-2</option><option value="-3">-3</option><option value="-4">-4</option><option value="-5">-5</option><option value="-6">-6</option></select></td></tr>
-                        <tr><td></td><td></td><td></td><td class='ev-total'>&nbsp;</td><td></td><td></td><td></td></tr>
+                        <tr><td></td><td></td><td></td><td class='ev-total'>&nbsp;</td><td class='ev-left'>&nbsp;</td><td></td><td></td><td></td></tr>
                     </table>
                 </div>
                 <div class="info-group info-selectors">

diff --git a/script_res/ap_calc.css b/script_res/ap_calc.css
@@ -18,7 +18,7 @@ th, td {
 th {
     font-size: 0.8em;
 }
-.title-text {    
+.title-text {
     font-weight: bold;
     font-size: 1.5em;
     height: 50px;
@@ -207,7 +207,7 @@ select.toxic-counter {
     padding: 3px 3px;
     margin-left: 0.3em;
 }
-.poke-info .ev-total {
+.poke-info .ev-total, .poke-info .ev-left {
     font-size: 0.8em;
 }
 
@@ -289,11 +289,11 @@ select.toxic-counter {
     position: absolute; top: 0; bottom: 0;
     right: 46px;
     border: 2px solid #999999; border-radius: 8px;
-    transition: all 0.3s ease-in 0s; 
+    transition: all 0.3s ease-in 0s;
 }
 .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner {
     margin-left: 0;
 }
 .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch {
-    right: 0px; 
-}
+    right: 0px;
+}
diff --git a/script_res/ap_calc.js b/script_res/ap_calc.js
@@ -106,8 +106,15 @@ function calcEvTotal(poke) {
 
     var newClass = total > 510 ? 'overLimit' : 'underLimit';
 
+    var left = 510-total;
+
+    var newClassLeft = left < 0 ? 'overLimit' : 'underLimit';
+
     var evTotal = poke.find('.ev-total');
     evTotal.removeClass('underLimit overLimit').text(total).addClass(newClass);
+
+    var evLeft = poke.find('.ev-left');
+    evLeft.removeClass('underLimit overLimit').text(left).addClass(newClassLeft);
 }
 
 function calcCurrentHP(poke, max, percent) {
@@ -154,15 +161,15 @@ function autoSetAura()
     var ability2 = $("#p2 .ability").val()
     if(ability1 == "Fairy Aura" || ability2 == "Fairy Aura" )
         $("input:checkbox[id='fairy-aura']").prop("checked", true)
-    else        
+    else
         $("input:checkbox[id='fairy-aura']").prop("checked", lastAura[0])
     if(ability1 == "Dark Aura" || ability2 == "Dark Aura")
         $("input:checkbox[id='dark-aura']").prop("checked", true)
-    else        
+    else
         $("input:checkbox[id='dark-aura']").prop("checked", lastAura[1])
     if(ability1 == "Aura Break" || ability2 == "Aura Break" )
         $("input:checkbox[id='aura-break']").prop("checked", true)
-    else        
+    else
         $("input:checkbox[id='aura-break']").prop("checked", lastAura[2])
 }
 function autoSetTerrain()
@@ -534,7 +541,7 @@ function calculate() {
             highestMaxPercent = maxPercent;
             bestResult = $(resultLocations[0][i].move);
         }
-        
+
         result = damageResults[1][i];
         minDamage = result.damage[0] * p2.moves[i].hits;
         maxDamage = result.damage[result.damage.length-1] * p2.moves[i].hits;
@@ -570,7 +577,7 @@ $(".result-move").change(function() {
         if (result) {
             $("#mainResult").html(result.description + ": " + result.damageText + " -- " + result.koChanceText);
             if (result.parentDamage) {
-                $("#damageValues").text("(First hit: " + result.parentDamage.join(", ") + 
+                $("#damageValues").text("(First hit: " + result.parentDamage.join(", ") +
                     "; Second hit: " + result.childDamage.join(", ") + ")");
             } else {
                 $("#damageValues").text("(" + result.damage.join(", ") + ")");
@@ -828,7 +835,7 @@ $(".gen").change(function () {
     $("select.ability").find("option").remove().end().append("<option value=\"\">(other)</option>" + abilityOptions);
     var itemOptions = getSelectOptions(items, true);
     $("select.item").find("option").remove().end().append("<option value=\"\">(none)</option>" + itemOptions);
-    
+
     $(".set-selector").val(getSetOptions()[gen > 3 ? 1 : gen === 1 ? 5 : 3].id);
     $(".set-selector").change();
 });