diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index dc2387f05c..cf212eece9 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -476,13 +476,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <div class="checkboxticker spellspecializedticked">X</div>
                     </div>
                     <div class="weaponbonuswrapper">
-                        <input type="text" name="attr_weaponbonus1" value="0" title="Any Bonuses to Weapon Skill"> 
+                        <input type="number" name="attr_weaponbonus1" value="0" title="Any Bonuses to Weapon Skill"> 
                     </div>
                     <div class="weaponaccuracywrapper">
-                        <input type="text" name="attr_weaponaccuracy1" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weaponaccuracy1" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondvwrapper">
-                        <input type="text" name="attr_weapondv1" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weapondv1" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondmgtypewrapper">
                         <select class="weapondmgtype" name="attr_weapondmgtype1" title="Select the Damage Type done by this Weapon">
@@ -631,13 +631,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <div class="checkboxticker spellspecializedticked">X</div>
                     </div>
                     <div class="weaponbonuswrapper">
-                        <input type="text" name="attr_weaponbonus2" value="0" title="Any Bonuses to Weapon Skill"> 
+                        <input type="number" name="attr_weaponbonus2" value="0" title="Any Bonuses to Weapon Skill"> 
                     </div>
                     <div class="weaponaccuracywrapper">
-                        <input type="text" name="attr_weaponaccuracy2" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weaponaccuracy2" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondvwrapper">
-                        <input type="text" name="attr_weapondv2" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weapondv2" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondmgtypewrapper">
                         <select class="weapondmgtype" name="attr_weapondmgtype2" title="Select the Damage Type done by this Weapon">
@@ -786,13 +786,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <div class="checkboxticker spellspecializedticked">X</div>
                     </div>
                     <div class="weaponbonuswrapper">
-                        <input type="text" name="attr_weaponbonus3" value="0" title="Any Bonuses to Weapon Skill"> 
+                        <input type="number" name="attr_weaponbonus3" value="0" title="Any Bonuses to Weapon Skill"> 
                     </div>
                     <div class="weaponaccuracywrapper">
-                        <input type="text" name="attr_weaponaccuracy3" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weaponaccuracy3" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondvwrapper">
-                        <input type="text" name="attr_weapondv3" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weapondv3" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondmgtypewrapper">
                         <select class="weapondmgtype" name="attr_weapondmgtype3" title="Select the Damage Type done by this Weapon">
@@ -941,13 +941,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <div class="checkboxticker spellspecializedticked">X</div>
                     </div>
                     <div class="weaponbonuswrapper">
-                        <input type="text" name="attr_weaponbonus4" value="0" title="Any Bonuses to Weapon Skill"> 
+                        <input type="number" name="attr_weaponbonus4" value="0" title="Any Bonuses to Weapon Skill"> 
                     </div>
                     <div class="weaponaccuracywrapper">
-                        <input type="text" name="attr_weaponaccuracy4" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weaponaccuracy4" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondvwrapper">
-                        <input type="text" name="attr_weapondv4" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weapondv4" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondmgtypewrapper">
                         <select class="weapondmgtype" name="attr_weapondmgtype4" title="Select the Damage Type done by this Weapon">
@@ -1096,13 +1096,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <div class="checkboxticker spellspecializedticked">X</div>
                     </div>
                     <div class="weaponbonuswrapper">
-                        <input type="text" name="attr_weaponbonus5" value="0" title="Any Bonuses to Weapon Skill"> 
+                        <input type="number" name="attr_weaponbonus5" value="0" title="Any Bonuses to Weapon Skill"> 
                     </div>
                     <div class="weaponaccuracywrapper">
-                        <input type="text" name="attr_weaponaccuracy5" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weaponaccuracy5" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondvwrapper">
-                        <input type="text" name="attr_weapondv5" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weapondv5" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondmgtypewrapper">
                         <select class="weapondmgtype" name="attr_weapondmgtype5" title="Select the Damage Type done by this Weapon">
@@ -1251,13 +1251,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <div class="checkboxticker spellspecializedticked">X</div>
                     </div>
                     <div class="weaponbonuswrapper">
-                        <input type="text" name="attr_weaponbonus6" value="0" title="Any Bonuses to Weapon Skill"> 
+                        <input type="number" name="attr_weaponbonus6" value="0" title="Any Bonuses to Weapon Skill"> 
                     </div>
                     <div class="weaponaccuracywrapper">
-                        <input type="text" name="attr_weaponaccuracy6" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weaponaccuracy6" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondvwrapper">
-                        <input type="text" name="attr_weapondv6" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weapondv6" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondmgtypewrapper">
                         <select class="weapondmgtype" name="attr_weapondmgtype6" title="Select the Damage Type done by this Weapon">
@@ -1406,13 +1406,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <div class="checkboxticker spellspecializedticked">X</div>
                     </div>
                     <div class="weaponbonuswrapper">
-                        <input type="text" name="attr_weaponbonus7" value="0" title="Any Bonuses to Weapon Skill"> 
+                        <input type="number" name="attr_weaponbonus7" value="0" title="Any Bonuses to Weapon Skill"> 
                     </div>
                     <div class="weaponaccuracywrapper">
-                        <input type="text" name="attr_weaponaccuracy7" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weaponaccuracy7" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondvwrapper">
-                        <input type="text" name="attr_weapondv7" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weapondv7" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondmgtypewrapper">
                         <select class="weapondmgtype" name="attr_weapondmgtype7" title="Select the Damage Type done by this Weapon">
@@ -1561,13 +1561,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <div class="checkboxticker spellspecializedticked">X</div>
                     </div>
                     <div class="weaponbonuswrapper">
-                        <input type="text" name="attr_weaponbonus8" value="0" title="Any Bonuses to Weapon Skill"> 
+                        <input type="number" name="attr_weaponbonus8" value="0" title="Any Bonuses to Weapon Skill"> 
                     </div>
                     <div class="weaponaccuracywrapper">
-                        <input type="text" name="attr_weaponaccuracy8" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weaponaccuracy8" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondvwrapper">
-                        <input type="text" name="attr_weapondv8" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                        <input type="number" name="attr_weapondv8" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                     </div>
                     <div class="weapondmgtypewrapper">
                         <select class="weapondmgtype" name="attr_weapondmgtype8" title="Select the Damage Type done by this Weapon">
@@ -7802,7 +7802,7 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_armorname1" title="Name of the Armor">
                 </div>
                 <div class="armorratingwrapper">
-                    <input type="text" name="attr_armorrating1" value="0" title="Rating of the Armor">                
+                    <input type="number" name="attr_armorrating1" value="0" title="Rating of the Armor">                
                 </div>
                 <div class="armorcapacitywrapper">
                     <input type="text" name="attr_armorcapacity1" value="0" title="Capacity of the Armor">                 
@@ -7822,7 +7822,7 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_armorname2" title="Name of the Armor">
                 </div>
                 <div class="armorratingwrapper">
-                    <input type="text" name="attr_armorrating2" value="0" title="Rating of the Armor">                
+                    <input type="number" name="attr_armorrating2" value="0" title="Rating of the Armor">                
                 </div>
                 <div class="armorcapacitywrapper">
                     <input type="text" name="attr_armorcapacity2" value="0" title="Capacity of the Armor">                 
@@ -7842,7 +7842,7 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_armorname3" title="Name of the Armor">
                 </div>
                 <div class="armorratingwrapper">
-                    <input type="text" name="attr_armorrating3" value="0" title="Rating of the Armor">                
+                    <input type="number" name="attr_armorrating3" value="0" title="Rating of the Armor">                
                 </div>
                 <div class="armorcapacitywrapper">
                     <input type="text" name="attr_armorcapacity3" value="0" title="Capacity of the Armor">                 
@@ -7862,7 +7862,7 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_armorname4" title="Name of the Armor">
                 </div>
                 <div class="armorratingwrapper">
-                    <input type="text" name="attr_armorrating4" value="0" title="Rating of the Armor">                
+                    <input type="number" name="attr_armorrating4" value="0" title="Rating of the Armor">                
                 </div>
                 <div class="armorcapacitywrapper">
                     <input type="text" name="attr_armorcapacity4" value="0" title="Capacity of the Armor">                 
@@ -7882,7 +7882,7 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_armorname5" title="Name of the Armor">
                 </div>
                 <div class="armorratingwrapper">
-                    <input type="text" name="attr_armorrating5" value="0" title="Rating of the Armor">                
+                    <input type="number" name="attr_armorrating5" value="0" title="Rating of the Armor">                
                 </div>
                 <div class="armorcapacitywrapper">
                     <input type="text" name="attr_armorcapacity5" value="0" title="Capacity of the Armor">                 
@@ -7902,7 +7902,7 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_armorname6" title="Name of the Armor">
                 </div>
                 <div class="armorratingwrapper">
-                    <input type="text" name="attr_armorrating6" value="0" title="Rating of the Armor">                
+                    <input type="number" name="attr_armorrating6" value="0" title="Rating of the Armor">                
                 </div>
                 <div class="armorcapacitywrapper">
                     <input type="text" name="attr_armorcapacity6" value="0" title="Capacity of the Armor">                 
@@ -7922,7 +7922,7 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_armorname7" title="Name of the Armor">
                 </div>
                 <div class="armorratingwrapper">
-                    <input type="text" name="attr_armorrating7" value="0" title="Rating of the Armor">                
+                    <input type="number" name="attr_armorrating7" value="0" title="Rating of the Armor">                
                 </div>
                 <div class="armorcapacitywrapper">
                     <input type="text" name="attr_armorcapacity7" value="0" title="Capacity of the Armor">                 
@@ -7942,7 +7942,7 @@ Click again to switch to Manual and Remote">
                     <input type="text" name="attr_armorname8" title="Name of the Armor">
                 </div>
                 <div class="armorratingwrapper">
-                    <input type="text" name="attr_armorrating8" value="0" title="Rating of the Armor">                
+                    <input type="number" name="attr_armorrating8" value="0" title="Rating of the Armor">                
                 </div>
                 <div class="armorcapacitywrapper">
                     <input type="text" name="attr_armorcapacity8" value="0" title="Capacity of the Armor">                 
@@ -7957,6 +7957,15 @@ Click again to switch to Manual and Remote">
         </div>
         <div class="weapon">
             <h2>Melee + Ranged Weapons</h2>
+            <div class="reloadwrapper">
+                <input class="reloadcheckbox" type="checkbox" name="attr_reloadcheckbox" title="Searches the equipment list for matching names.
+Will refill any ammunition below its maximum if enough rounds are in the inventory.
+The inventory name can have additional letters or words
+eg 'APDS-Rounds' when the ammunition is ony called 'APDS'
+Only takes the first match even if multiple identical entries are found.">
+                <div class="reloadlabel"><label>Reload</label></div>
+                <div class="tooltip">Hover for<br>Tooltip</div>
+            </div>
             <div class="weaponrow">
                 <div class="weaponmeleewrapper">
                     <label class="weaponlabel">Melee</label>
@@ -8036,13 +8045,13 @@ Click again to switch to Manual and Remote">
                     <div class="checkboxticker spellspecializedticked">X</div>
                 </div>
                 <div class="weaponbonuswrapper">
-                    <input type="text" name="attr_weaponbonus1" value="0" title="Any Bonuses to Weapon Skill"> 
+                    <input type="number" name="attr_weaponbonus1" value="0" title="Any Bonuses to Weapon Skill"> 
                 </div>
                 <div class="weaponaccuracywrapper">
-                    <input type="text" name="attr_weaponaccuracy1" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weaponaccuracy1" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondvwrapper">
-                    <input type="text" name="attr_weapondv1" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weapondv1" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondmgtypewrapper">
                     <select class="weapondmgtype" name="attr_weapondmgtype1" title="Select the Damage Type done by this Weapon">
@@ -8191,13 +8200,13 @@ Click again to switch to Manual and Remote">
                     <div class="checkboxticker spellspecializedticked">X</div>
                 </div>
                 <div class="weaponbonuswrapper">
-                    <input type="text" name="attr_weaponbonus2" value="0" title="Any Bonuses to Weapon Skill"> 
+                    <input type="number" name="attr_weaponbonus2" value="0" title="Any Bonuses to Weapon Skill"> 
                 </div>
                 <div class="weaponaccuracywrapper">
-                    <input type="text" name="attr_weaponaccuracy2" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weaponaccuracy2" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondvwrapper">
-                    <input type="text" name="attr_weapondv2" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weapondv2" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondmgtypewrapper">
                     <select class="weapondmgtype" name="attr_weapondmgtype2" title="Select the Damage Type done by this Weapon">
@@ -8346,13 +8355,13 @@ Click again to switch to Manual and Remote">
                     <div class="checkboxticker spellspecializedticked">X</div>
                 </div>
                 <div class="weaponbonuswrapper">
-                    <input type="text" name="attr_weaponbonus3" value="0" title="Any Bonuses to Weapon Skill"> 
+                    <input type="number" name="attr_weaponbonus3" value="0" title="Any Bonuses to Weapon Skill"> 
                 </div>
                 <div class="weaponaccuracywrapper">
-                    <input type="text" name="attr_weaponaccuracy3" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weaponaccuracy3" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondvwrapper">
-                    <input type="text" name="attr_weapondv3" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weapondv3" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondmgtypewrapper">
                     <select class="weapondmgtype" name="attr_weapondmgtype3" title="Select the Damage Type done by this Weapon">
@@ -8501,13 +8510,13 @@ Click again to switch to Manual and Remote">
                     <div class="checkboxticker spellspecializedticked">X</div>
                 </div>
                 <div class="weaponbonuswrapper">
-                    <input type="text" name="attr_weaponbonus4" value="0" title="Any Bonuses to Weapon Skill"> 
+                    <input type="number" name="attr_weaponbonus4" value="0" title="Any Bonuses to Weapon Skill"> 
                 </div>
                 <div class="weaponaccuracywrapper">
-                    <input type="text" name="attr_weaponaccuracy4" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weaponaccuracy4" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondvwrapper">
-                    <input type="text" name="attr_weapondv4" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weapondv4" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondmgtypewrapper">
                     <select class="weapondmgtype" name="attr_weapondmgtype4" title="Select the Damage Type done by this Weapon">
@@ -8656,13 +8665,13 @@ Click again to switch to Manual and Remote">
                     <div class="checkboxticker spellspecializedticked">X</div>
                 </div>
                 <div class="weaponbonuswrapper">
-                    <input type="text" name="attr_weaponbonus5" value="0" title="Any Bonuses to Weapon Skill"> 
+                    <input type="number" name="attr_weaponbonus5" value="0" title="Any Bonuses to Weapon Skill"> 
                 </div>
                 <div class="weaponaccuracywrapper">
-                    <input type="text" name="attr_weaponaccuracy5" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weaponaccuracy5" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondvwrapper">
-                    <input type="text" name="attr_weapondv5" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weapondv5" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondmgtypewrapper">
                     <select class="weapondmgtype" name="attr_weapondmgtype5" title="Select the Damage Type done by this Weapon">
@@ -8811,13 +8820,13 @@ Click again to switch to Manual and Remote">
                     <div class="checkboxticker spellspecializedticked">X</div>
                 </div>
                 <div class="weaponbonuswrapper">
-                    <input type="text" name="attr_weaponbonus6" value="0" title="Any Bonuses to Weapon Skill"> 
+                    <input type="number" name="attr_weaponbonus6" value="0" title="Any Bonuses to Weapon Skill"> 
                 </div>
                 <div class="weaponaccuracywrapper">
-                    <input type="text" name="attr_weaponaccuracy6" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weaponaccuracy6" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondvwrapper">
-                    <input type="text" name="attr_weapondv6" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weapondv6" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondmgtypewrapper">
                     <select class="weapondmgtype" name="attr_weapondmgtype6" title="Select the Damage Type done by this Weapon">
@@ -8966,13 +8975,13 @@ Click again to switch to Manual and Remote">
                     <div class="checkboxticker spellspecializedticked">X</div>
                 </div>
                 <div class="weaponbonuswrapper">
-                    <input type="text" name="attr_weaponbonus7" value="0" title="Any Bonuses to Weapon Skill"> 
+                    <input type="number" name="attr_weaponbonus7" value="0" title="Any Bonuses to Weapon Skill"> 
                 </div>
                 <div class="weaponaccuracywrapper">
-                    <input type="text" name="attr_weaponaccuracy7" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weaponaccuracy7" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondvwrapper">
-                    <input type="text" name="attr_weapondv7" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weapondv7" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondmgtypewrapper">
                     <select class="weapondmgtype" name="attr_weapondmgtype7" title="Select the Damage Type done by this Weapon">
@@ -9121,13 +9130,13 @@ Click again to switch to Manual and Remote">
                     <div class="checkboxticker spellspecializedticked">X</div>
                 </div>
                 <div class="weaponbonuswrapper">
-                    <input type="text" name="attr_weaponbonus8" value="0" title="Any Bonuses to Weapon Skill"> 
+                    <input type="number" name="attr_weaponbonus8" value="0" title="Any Bonuses to Weapon Skill"> 
                 </div>
                 <div class="weaponaccuracywrapper">
-                    <input type="text" name="attr_weaponaccuracy8" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weaponaccuracy8" value="0" title="Weapon Accuracy with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondvwrapper">
-                    <input type="text" name="attr_weapondv8" value="0" title="Weapon Damage with all Modifications but Ammo"> 
+                    <input type="number" name="attr_weapondv8" value="0" title="Weapon Damage with all Modifications but Ammo"> 
                 </div>
                 <div class="weapondmgtypewrapper">
                     <select class="weapondmgtype" name="attr_weapondmgtype8" title="Select the Damage Type done by this Weapon">
@@ -9683,6 +9692,75 @@ on("sheet:opened", function() {
 });
 
 
+on("change:reloadcheckbox", function(){
+    getSectionIDs("repeating_equipment", function(equipmentids){
+        for(var i=1;i<9;i++){
+            (function(i){
+                getSectionIDs("repeating_equipment"+i, function(ammoids){
+                    var attrs=[];
+                    var eqname=[];
+                    var eqqty=[];
+                    var ammoname=[];
+                    var ammoqty=[];
+                    var ammomax=[];
+                    for(var j=0;j<equipmentids.length;j++){
+                        attrs.push("repeating_equipment_"+equipmentids[j]+"_equipmentname");
+                        eqname.push(attrs.length-1);
+                    }
+                    for(var j=0;j<equipmentids.length;j++){
+                        attrs.push("repeating_equipment_"+equipmentids[j]+"_equipmentnumber");
+                        eqqty.push(attrs.length-1);
+                    }
+                    for(var j=0;j<ammoids.length;j++){
+                        attrs.push("repeating_equipment"+i+"_"+ammoids[j]+"_ammoname"+i);
+                        ammoname.push(attrs.length-1);
+                    }
+                    for(var j=0;j<ammoids.length;j++){
+                        attrs.push("repeating_equipment"+i+"_"+ammoids[j]+"_ammonumber"+i);
+                        ammoqty.push(attrs.length-1);
+                    }
+                    for(var j=0;j<ammoids.length;j++){
+                        attrs.push("repeating_equipment"+i+"_"+ammoids[j]+"_ammomaxnumber"+i);
+                        ammomax.push(attrs.length-1);
+                    }
+                    getAttrs(attrs, function(values){
+                        var change=false
+                        if(eqname.length>0&&ammoname.length>0){
+                            for(var j=0;j<eqname.length;j++){
+                                for(var k=0;k<ammoname.length;k++){
+                                    if(values[attrs[eqname[j]]]&&values[attrs[ammoname[k]]]){
+                                        console.log(values[attrs[eqname[j]]]+' - '+values[attrs[ammoname[k]]])
+                                        if(values[attrs[eqname[j]]].length>1&&values[attrs[ammoname[k]]].length>1&&parseInt(values[attrs[ammomax[k]]])>0&&parseInt(values[attrs[ammoqty[k]]])>0&&parseInt(values[attrs[eqqty[k]]])>0){
+                                            if(values[attrs[eqname[j]]].match(values[attrs[ammoname[k]]])){
+                                                console.log(values[attrs[eqname[j]]]+' + '+values[attrs[ammoname[k]]]+'!!!')
+                                                if(parseInt(values[attrs[ammoqty[k]]])<parseInt(values[attrs[ammomax[k]]])){
+                                                    change=true
+                                                    if((parseInt(values[attrs[ammomax[k]]])-parseInt(values[attrs[ammoqty[k]]]))<=parseInt(values[attrs[eqqty[j]]])){
+                                                        values[attrs[eqqty[j]]]=parseInt(values[attrs[eqqty[j]]])+parseInt(values[attrs[ammoqty[k]]])-parseInt(values[attrs[ammomax[k]]])
+                                                        values[attrs[ammoqty[k]]]=parseInt(values[attrs[ammomax[k]]])
+                                                    }else{
+                                                        values[attrs[ammoqty[k]]]=parseInt(values[attrs[ammoqty[k]]])+parseInt(values[attrs[eqqty[j]]])
+                                                        values[attrs[eqqty[j]]]=0
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        if(change){
+                            setAttrs(values)
+                        }
+                    });
+                });
+            })(i);
+        }
+        
+    });
+});
+
+
 on("change:chummercheckbox", function(){
     getAttrs(["chummertext","chummercheckbox"], function(text) {
         if(text.chummercheckbox=="on"){