diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index 56cfd98d8b..b4d904942b 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -610,10 +610,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 <input type="text" name="attr_ammodescription1" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}"></button>
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -765,10 +765,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 <input type="text" name="attr_ammodescription2" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{ammoacc2})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{ammoacc2})]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}"></button>
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{ammoacc2})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{ammoacc2})]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -920,10 +920,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 <input type="text" name="attr_ammodescription3" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{ammoacc3})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{ammoacc3})]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}"></button>
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{ammoacc3})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{ammoacc3})]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1075,10 +1075,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 <input type="text" name="attr_ammodescription4" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{ammoacc4})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{ammoacc4})]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}"></button>
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex4" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex4" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{ammoacc4})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{ammoacc4})]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1230,10 +1230,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 <input type="text" name="attr_ammodescription5" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{ammoacc5})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{ammoacc5})]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}"></button>
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{ammoacc5})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{ammoacc5})]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1385,10 +1385,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 <input type="text" name="attr_ammodescription6" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{description=@{ammodescription6}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{ammoacc6)}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{ammoacc6})]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{description=@{ammodescription6}}}"></button>
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{ammoacc6})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{ammoacc6})]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1540,10 +1540,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 <input type="text" name="attr_ammodescription7" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple7" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+@{ammoacc7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+@{ammoacc7}]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{description=@{ammodescription7}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple7" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{ammoacc7})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{ammoacc7})]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{description=@{ammodescription7}}}"></button>
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex7" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+@{ammoacc7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+@{ammoacc7}]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{ammodescription7}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex7" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{ammoacc7})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{ammoacc7})]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{ammodescription7}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1695,10 +1695,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 <input type="text" name="attr_ammodescription8" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple8" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+@{ammoacc8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+@{ammoacc8}]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{description=@{ammodescription8}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple8" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{ammoacc8})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{ammoacc8})]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{description=@{ammodescription8}}}"></button>
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex8" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+@{ammoacc8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+@{ammoacc8}]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{ammodescription8}}}"></button>
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex8" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{ammoacc8})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{ammoacc8})]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{ammodescription8}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -8196,10 +8196,10 @@ Only takes the first match even if multiple identical entries are found.">
                             <input type="text" name="attr_ammodescription1" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}"></button>
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8351,10 +8351,10 @@ Only takes the first match even if multiple identical entries are found.">
                             <input type="text" name="attr_ammodescription2" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{ammoacc2})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{ammoacc2})]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}"></button>
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{ammoacc2})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{ammoacc2})]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8506,10 +8506,10 @@ Only takes the first match even if multiple identical entries are found.">
                             <input type="text" name="attr_ammodescription3" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{ammoacc3})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{ammoacc3})]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}"></button>
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{ammoacc3})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{ammoacc3})]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8661,10 +8661,10 @@ Only takes the first match even if multiple identical entries are found.">
                             <input type="text" name="attr_ammodescription4" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{ammoacc4)}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{ammoacc4})]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}"></button>
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex4" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex4" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{ammoacc4})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{ammoacc4})]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4} Rounds}}{{after2=@{ammoname4} Rounds}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8816,10 +8816,10 @@ Only takes the first match even if multiple identical entries are found.">
                             <input type="text" name="attr_ammodescription5" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{ammoacc5})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{ammoacc5})]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}"></button>
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{ammoacc5})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{ammoacc5})]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5} Rounds}}{{after2=@{ammoname5} Rounds}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8971,10 +8971,10 @@ Only takes the first match even if multiple identical entries are found.">
                             <input type="text" name="attr_ammodescription6" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{description=@{ammodescription6}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{ammoacc6})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{ammoacc6})]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{description=@{ammodescription6}}}"></button>
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{ammoacc6})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{ammoacc6})]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6} Rounds}}{{after2=@{ammoname6} Rounds}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -9126,10 +9126,10 @@ Only takes the first match even if multiple identical entries are found.">
                             <input type="text" name="attr_ammodescription7" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple7" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+@{ammoacc7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+@{ammoacc7}]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{description=@{ammodescription7}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple7" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{ammoacc7})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{ammoacc7})]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{description=@{ammodescription7}}}"></button>
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex7" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+@{ammoacc7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+@{ammoacc7}]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{ammodescription7}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex7" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{ammoacc7})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{ammoacc7})]]]]}}{{after1=AP([[@{weaponap7}+(@{ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{ammodv7})]]}}{{after1dmg=@{ammodmgtype7}}}{{after2=@{ammoname7} Rounds}}{{after2=@{ammoname7} Rounds}}{{after2_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{ammodescription7}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -9281,10 +9281,10 @@ Only takes the first match even if multiple identical entries are found.">
                             <input type="text" name="attr_ammodescription8" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple8" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+@{ammoacc8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+@{ammoacc8}]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{description=@{ammodescription8}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple8" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{ammoacc8})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{ammoacc8})]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{description=@{ammodescription8}}}"></button>
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex8" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+@{ammoacc8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+@{ammoacc8}]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{ammodescription8}}}"></button>
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex8" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{ammoacc8})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{ammoacc8})]]]]}}{{after1=AP([[@{weaponap8}+(@{ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{ammodv8})]]}}{{after1dmg=@{ammodmgtype8}}}{{after2=@{ammoname8} Rounds}}{{after2=@{ammoname8} Rounds}}{{after2_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{ammodescription8}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -9924,10 +9924,6 @@ on("change:chummercheckbox", function(){
                     attributes["weaponrc"+i]="0";
                     attributes["weaponmode"+i]="11";
                     attributes["weaponnotes"+i]="";
-                    getSectionIDs("repeating_equipment"+i, function(idarray) {
-                        for(var i=0; i < idarray.length; i++) {
-                        removeRepeatingRow("repeating_equipment"+i+idarray[i]);
-                    }});
                     attributes["armorworn"+i]="0";
                     attributes["armorname"+i]="";
                     attributes["armorcapacity"+i]="0";
@@ -10275,17 +10271,17 @@ on("change:chummercheckbox", function(){
                                         attributes["weaponismelee"+i]=0;
                                         attributes["weaponrc"+i]=chummerfile.characters.character.weapons.weapon[i-1].rc-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
                                         attributes["weapondv"+i]=chummerfile.characters.character.weapons.weapon[i-1].rawdamage.match(/\d*/);
-                                        attributes["weapondmgtype"+i]=chummerfile.characters.character.weapons.weapon[i-1].rawdamage.match(/\D*/);
+                                        attributes["weapondmgtype"+i]=chummerfile.characters.character.weapons.weapon[i-1].rawdamage.match(/\D+/);
                                     }else{
                                         attributes["weaponismelee"+i]="on";
                                         attributes["weaponreach"+i]=chummerfile.characters.character.weapons.weapon[i-1].reach;
                                         attributes["weapondv"+i]=chummerfile.characters.character.weapons.weapon[i-1].damage_english.match(/\d*/);
-                                        attributes["weapondmgtype"+i]=chummerfile.characters.character.weapons.weapon[i-1].damage_english.match(/\D*/);
+                                        attributes["weapondmgtype"+i]=chummerfile.characters.character.weapons.weapon[i-1].damage_english.match(/\D+/);
                                     }
 
                                     attributes["weaponname"+i]=chummerfile.characters.character.weapons.weapon[i-1].name;
                                     attributes["weaponaccuracy"+i]=chummerfile.characters.character.weapons.weapon[i-1].accuracy;
-                                    if(isNan(chummerfile.characters.character.weapons.weapon[i-1].ap)){
+                                    if(isNaN(chummerfile.characters.character.weapons.weapon[i-1].ap)){
                                         attributes["weaponap"+i]=0;
                                     }else{
                                         attributes["weaponap"+i]=chummerfile.characters.character.weapons.weapon[i-1].ap;
@@ -10309,20 +10305,56 @@ on("change:chummercheckbox", function(){
                                                 //find ammo to get stats
                                                 ammo = ammunition.find(clip => clip.guid === chummerfile.characters.character.weapons.weapon[i-1].clips.clip[j].id);
                                                 attributes["repeating_equipment"+i+"_"+newrowid+"_ammoname"+i]=ammo.name;
-                                                attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.match(/\d*/);
-                                                attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.match(/\D*/);
-                                                attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
-                                                attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]="";
+                                                if(ammo.weaponbonusdamage_english != null) {
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
+                                                    if(ammo.name_english = "Ammo: Stick-n-Shock") {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
+                                                    }
+                                                    else {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
+                                                    }
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=ammo.weaponbonusacc;
+                                                }
+                                                else {
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=0;
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
+                                                    if(ammo.name_english = "Ammo: Stick-n-Shock") {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
+                                                    }
+                                                    else {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
+                                                    }
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=0;
+                                                }
                                             }
                                         }else{
                                             var newrowid=generateRowID();
                                             //find ammo to get stats
                                             ammo = ammunition.find(clip => clip.guid === chummerfile.characters.character.weapons.weapon[i-1].clips.clip.id);
                                             attributes["repeating_equipment"+i+"_"+newrowid+"_ammoname"+i]=ammo.name;
-                                            attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.match(/\d*/);
-                                            attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.match(/\D*/);
-                                            attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
-                                            attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]="";
+                                            if(ammo.weaponbonusdamage_english != null) {
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
+                                                    if(ammo.name_english = "Ammo: Stick-n-Shock") {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
+                                                    }
+                                                    else {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
+                                                    }
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=ammo.weaponbonusacc;
+                                            }
+                                            else {
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=0;
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
+                                                    if(ammo.name_english = "Ammo: Stick-n-Shock") {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
+                                                    }
+                                                    else {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
+                                                    }
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=0;
+                                            }
                                         }
                                     }
                                 }
@@ -10332,19 +10364,13 @@ on("change:chummercheckbox", function(){
                                 if(chummerfile.characters.character.weapons.weapon.type=="Ranged"){
                                     attributes["weaponismelee1"]=0;
                                     attributes["weaponrc1"]=chummerfile.characters.character.weapons.weapon.rc-Math.ceil(chummerfile.characters.character.attributes[1].attribute[3].total/3)- 1;
-                                    if(chummerfile.characters.character.weapons.weapon.rawdamage != "undefined") {
-                                            attributes["weapondv1"]=chummerfile.characters.character.weapons.weapon.rawdamage.match(/\d*/);
-                                            attributes["weapondmgtype1"]=chummerfile.characters.character.weapons.weapon.rawdamage.match(/\D*/);
-                                        }
-                                        else {
-                                            attributes["weapondv1"]=chummerfile.characters.character.weapons.weapon.damage_english.match(/\d*/);
-                                            attributes["weapondmgtype1"]=chummerfile.characters.character.weapons.weapon.damage_english.match(/\D*/);
-                                        }
+                                    attributes["weapondv1"]=chummerfile.characters.character.weapons.weapon.rawdamage.match(/\d*/);
+                                    attributes["weapondmgtype1"]=chummerfile.characters.character.weapons.weapon.rawdamage.match(/\D+/);
                                 }else{
                                     attributes["weaponismelee1"]="on";
                                     attributes["weaponreach1"]=chummerfile.characters.character.weapons.weapon.reach;
                                     attributes["weapondv1"]=chummerfile.characters.character.weapons.weapon.damage_english.match(/\d*/);
-                                    attributes["weapondmgtype1"]=chummerfile.characters.character.weapons.weapon.damage_english.match(/\D*/);
+                                    attributes["weapondmgtype1"]=chummerfile.characters.character.weapons.weapon.damage_english.match(/\D+/);
                                 }
                                 attributes["weaponname1"]=chummerfile.characters.character.weapons.weapon.name;
                                 attributes["weaponaccuracy1"]=chummerfile.characters.character.weapons.weapon.accuracy;
@@ -10369,21 +10395,45 @@ on("change:chummercheckbox", function(){
                                                 var newrowid=generateRowID();
                                                 //find ammo to get stats
                                                 ammo = ammunition.find(clip => clip.guid === chummerfile.characters.character.weapons.weapon.clips.clip[j].id);
-                                                attributes["repeating_equipment1_"+newrowid+"_ammoname1"]=ammo.name;
-                                                attributes["repeating_equipment1_"+newrowid+"_ammodv1"]=ammo.weaponbonusdamage_english.match(/\d*/);
-                                                attributes["repeating_equipment1_"+newrowid+"_ammodmgtype1"]=ammo.weaponbonusdamage_english.match(/\D*/);
-                                                attributes["repeating_equipment1_"+newrowid+"_ammoap1"]=ammo.weaponbonusap;
-                                                attributes["repeating_equipment1_"+newrowid+"_ammoacc1"]="";
+                                                if(ammo.weaponbonusdamage_english != null) {
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
+                                                    if(ammo.name_english = "Ammo: Stick-n-Shock") {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap1"]
+                                                    }
+                                                    else {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
+                                                    }
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=ammo.weaponbonusacc;
+                                                }
+                                                else {
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=0;
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
+                                                    if(ammo.name_english = "Ammo: Stick-n-Shock") {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap1"]
+                                                    }
+                                                    else {
+                                                        attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
+                                                    }
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=0;
+                                                }
                                             }
                                         }else{
                                             var newrowid=generateRowID();
                                             //find ammo to get stats
                                             ammo = ammunition.find(clip => clip.guid === chummerfile.characters.character.weapons.weapon.clips.clip.id);
-                                            attributes["repeating_equipment1_"+newrowid+"_ammoname1"]=ammo.name;
-                                            attributes["repeating_equipment1_"+newrowid+"_ammodv1"]=ammo.weaponbonusdamage_english.match(/\d*/);
-                                            attributes["repeating_equipment1_"+newrowid+"_ammodmgtype1"]=ammo.weaponbonusdamage_english.match(/\D*/);
-                                            attributes["repeating_equipment1_"+newrowid+"_ammoap1"]=ammo.weaponbonusap;
-                                            attributes["repeating_equipment1_"+newrowid+"_ammoacc1"]="";
+                                            if(ammo.weaponbonusdamage_english != null) {
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=ammo.weaponbonusacc;
+                                            }
+                                            else {
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodv"+i]=0;
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammoap"+i]=0;
+                                                    attributes["repeating_equipment"+i+"_"+newrowid+"_ammoacc"+i]=0;
+                                            }
                                         }
                                     }
                             }