diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index 33869d08e3..cb19868a78 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -510,10 +510,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice1" value="@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll1" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll1" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll1" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach1}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll1" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach1}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes1" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -588,10 +588,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <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 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}}}" /> 
                             </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 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}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -665,10 +665,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice2" value="@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll2" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll2" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll2" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach2}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll2" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach2}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes2" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -743,10 +743,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <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 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}}}" /> 
                             </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 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}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -820,10 +820,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice3" value="@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll3" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll3" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll3" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach3}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll3" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach3}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes3" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -898,10 +898,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <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 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}}}" /> 
                             </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 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}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -975,10 +975,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice4" value="@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll4" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll4" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll4" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach4}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll4" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach4}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes4" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -1053,10 +1053,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <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 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}}}" /> 
                             </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 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}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -1130,10 +1130,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice5" value="@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll5" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll5" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll5" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach5}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll5" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach5}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes5" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -1208,10 +1208,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <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 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}}}" /> 
                             </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 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}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -1285,10 +1285,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice6" value="@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll6" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll6" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll6" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll6" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes6" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -1363,10 +1363,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <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 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}}}" /> 
                             </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 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}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -1440,10 +1440,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice7" value="@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll7" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll7" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll7" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach7}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll7" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach7}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes7" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -1518,10 +1518,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <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 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}}}" /> 
                             </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 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}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -1595,10 +1595,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_weapondice8" value="@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}" disabled="true" title="Total Dicepool">
                     </div>
                     <div class="weaponrangerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll8" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll8" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
                     </div>
                     <div class="weaponmeleerollwrapper">
-                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll8" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach8}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
+                        <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll8" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach8}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
                     </div>
                     <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes8" title="Need more Space?">
                     <div class="checkboxticker weaponunticked"></div>
@@ -1673,10 +1673,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <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 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}}}" /> 
                             </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 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}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -6687,12 +6687,12 @@ make sure to enter what the spell is resisted with">
                         <div class="checkboxticker spellspecializedticked">X</div>
                     </div>
                     <div class="spellbuttonwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spellrollmageeasy" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname}}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{spellbonus}-@{mag_total}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[?{Force|6}]]]]}}{{drain=Drain}}{{drain_num=[[?{Force|6}@{spelldrain}]]}}{{after2=Drain Resist}}{{after2_num=[[(@{wil_total}+@{drainattribute})@{standardroll}]]}}{{description=@{spelldescription}}}" />
-                        <button type="roll" class="spellrolltechno" name="roll_spellrolltechnoeasy" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{spellbonus}-@{mag_total}]]}}{{val3=@{wil_name}}}{{val3_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}" />
+                        <button type="roll" class="spellrollmage" name="roll_spellrollmageeasy" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname}}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{spellbonus}-(@{mag_total})]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[?{Force|6}]]]]}}{{drain=Drain}}{{drain_num=[[?{Force|6}@{spelldrain}]]}}{{after2=Drain Resist}}{{after2_num=[[(@{wil_total}+@{drainattribute})@{standardroll}]]}}{{description=@{spelldescription}}}" />
+                        <button type="roll" class="spellrolltechno" name="roll_spellrolltechnoeasy" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{spellbonus}-(@{mag_total})]]}}{{val3=@{wil_name}}}{{val3_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}" />
                     </div>
                     <div class="spellbuttonwrapper">
-                        <button type="roll" class="spellrollmage" name="roll_spellrollmagefull" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname}}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{spellbonus}-@{mag_total}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Force|6}+?{Raise Limit by|0})]]]]}}{{drain=Drain}}{{drain_num=[[?{Force|6}@{spelldrain}+?{Increase Drain|0}]]}}{{after2=Drain Resist}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}" />
-                        <button type="roll" class="spellrolltechno" name="roll_spellrolltechnofull" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{spellbonus}-@{mag_total}]]}}{{val3=@{wil_name}}}{{val3_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}" />
+                        <button type="roll" class="spellrollmage" name="roll_spellrollmagefull" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname}}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{spellbonus}-(@{mag_total})]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Force|6}+?{Raise Limit by|0})]]]]}}{{drain=Drain}}{{drain_num=[[?{Force|6}@{spelldrain}+?{Increase Drain|0}]]}}{{after2=Drain Resist}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}" />
+                        <button type="roll" class="spellrolltechno" name="roll_spellrolltechnofull" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=for @{spellname}}}{{val1=@{res_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=@{spellschool_name}}}{{val2_num=[[@{spellschool}+@{spellspecialized}+@{spellbonus}-(@{mag_total})]]}}{{val3=@{wil_name}}}{{val3_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{spellschool}+@{spellspecialized}+@{spellbonus}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level|6})]]]]}}{{drain=Fade}}{{drain_num=[[?{Level|6}@{spelldrain}]]}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}{{description=@{spelldescription}}}" />
                     </div>
                 </div>
             </fieldset>
@@ -6707,10 +6707,10 @@ make sure to enter what the spell is resisted with">
                 </div>
                 <div class="spiriterow">
                     <div class="spiritelabel">
-                        <button type="roll" class="spellrollmage" name="roll_summonrollmage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to summon}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=Summoning}}{{val2_num=[[@{skilldicepool69}-@{mag_total}+?{Specialized in this Spirit|yes,2|no,0}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}+?{Drain Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{skilldicepool69}+?{Specialized in this Spirit}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Force}+?{Raise Limit by|0})]]]]}}{{after1=Spirit Defense}}{{after1_num=[[?{Force|6}@{standardroll}]]}}{{after2=Drain Resist}}{{drain=Drain}}{{spiritdrain=true}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})@{standardroll}]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_summonrollmage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to summon}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=Summoning}}{{val2_num=[[@{skilldicepool69}-(@{mag_total})+?{Specialized in this Spirit|yes,2|no,0}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}+?{Drain Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{skilldicepool69}+?{Specialized in this Spirit}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Force}+?{Raise Limit by|0})]]]]}}{{after1=Spirit Defense}}{{after1_num=[[?{Force|6}@{standardroll}]]}}{{after2=Drain Resist}}{{drain=Drain}}{{spiritdrain=true}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})@{standardroll}]]}}" />
                     </div>
                     <div class="spiritelabel">
-                        <button type="roll" class="spellrollmage" name="roll_bindrollmage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to bind}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=Binding}}{{val2_num=[[@{skilldicepool64}-@{mag_total}+?{Specialized in this Spirit|yes,2|no,0}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}+?{Drain Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{skilldicepool64}+?{Specialized in this Spirit}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Force}+?{Raise Limit by|0})]]]]}}{{after1=Spirit Defense}}{{after1_num=[[(?{Force|6}*2)@{standardroll}]]}}{{after2=Drain Resist}}{{drain=Drain}}{{spiritdrain=true}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})@{standardroll}]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_bindrollmage" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to bind}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=Binding}}{{val2_num=[[@{skilldicepool64}-(@{mag_total})+?{Specialized in this Spirit|yes,2|no,0}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}+?{Drain Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{skilldicepool64}+?{Specialized in this Spirit}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Force}+?{Raise Limit by|0})]]]]}}{{after1=Spirit Defense}}{{after1_num=[[(?{Force|6}*2)@{standardroll}]]}}{{after2=Drain Resist}}{{drain=Drain}}{{spiritdrain=true}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})@{standardroll}]]}}" />
                     </div>
                 </div>
             </div>
@@ -6722,10 +6722,10 @@ make sure to enter what the spell is resisted with">
                 </div>
                 <div class="spiriterow">
                     <div class="spiritelabel">
-                        <button type="roll" class="spellrollmage" name="roll_summonrolltechno" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to compile}}{{val1=@{res_name}}}{{val1_num=[[@{res_total}]]}}{{val2=Compiling}}{{val2_num=[[@{skilldicepool70}-@{mag_total}+?{Specialized in this Sprite|yes,2|no,0}]]}}{{val3=Fade Resist Bonus}}{{val3_num=[[?{Fade Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Level}}{{val5_num=[[?{Level|6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{skilldicepool70}+?{Specialized in this Sprite}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level})]]]]}}{{after1=Sprite Defense}}{{after1_num=[[?{Level|6}@{standardroll}]]}}{{drain=Fade}}{{spiritdrain=true}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_summonrolltechno" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to compile}}{{val1=@{res_name}}}{{val1_num=[[@{res_total}]]}}{{val2=Compiling}}{{val2_num=[[@{skilldicepool70}-(@{mag_total})+?{Specialized in this Sprite|yes,2|no,0}]]}}{{val3=Fade Resist Bonus}}{{val3_num=[[?{Fade Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Level}}{{val5_num=[[?{Level|6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{skilldicepool70}+?{Specialized in this Sprite}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level})]]]]}}{{after1=Sprite Defense}}{{after1_num=[[?{Level|6}@{standardroll}]]}}{{drain=Fade}}{{spiritdrain=true}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}" />
                     </div>
                     <div class="spiritelabel">
-                        <button type="roll" class="spellrollmage" name="roll_bindrolltechno" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to register}}{{val1=@{res_name}}}{{val1_num=[[@{res_total}]]}}{{val2=Registering}}{{val2_num=[[@{skilldicepool72}-@{mag_total}+?{Specialized in this Sprite|yes,2|no,0}]]}}{{val3=Fade Resist Bonus}}{{val3_num=[[?{Fade Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Level}}{{val5_num=[[?{Level|6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{skilldicepool72}+?{Specialized in this Sprite}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level})]]]]}}{{after1=Sprite Defense}}{{after1_num=[[(?{Level|6}*2)@{standardroll}]]}}{{drain=Fade}}{{spiritdrain=true}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_bindrolltechno" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to register}}{{val1=@{res_name}}}{{val1_num=[[@{res_total}]]}}{{val2=Registering}}{{val2_num=[[@{skilldicepool72}-(@{mag_total})+?{Specialized in this Sprite|yes,2|no,0}]]}}{{val3=Fade Resist Bonus}}{{val3_num=[[?{Fade Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Level}}{{val5_num=[[?{Level|6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Level}}{{limit_num=[[?{Level|6}]]}}{{result=[[(@{skilldicepool72}+?{Specialized in this Sprite}-[[@{wound_total}]]+?{Situational Modifiers|0}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Level})]]]]}}{{after1=Sprite Defense}}{{after1_num=[[(?{Level|6}*2)@{standardroll}]]}}{{drain=Fade}}{{spiritdrain=true}}{{after2=Fade Resist}}{{after2_num=[[(@{wil_total}+@{res_total}+?{Fade Resist Bonus|0})@{standardroll}]]}}" />
                     </div>
                 </div>
             </div>
@@ -8089,10 +8089,10 @@ Only takes the first match even if multiple identical entries are found.">
                     <input type="text" name="attr_weapondice1" value="@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll1" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll1" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll1" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach1}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll1" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach1}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy1}]]}}{{after1=AP([[@{weaponap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}]]}}{{after1dmg=@{weapondmgtype1}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes1" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -8167,10 +8167,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 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}}}" /> 
                         </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 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}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -8244,10 +8244,10 @@ Only takes the first match even if multiple identical entries are found.">
                     <input type="text" name="attr_weapondice2" value="@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll2" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll2" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll2" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach2}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll2" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach2}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy2}]]}}{{after1=AP([[@{weaponap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}]]}}{{after1dmg=@{weapondmgtype2}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes2" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -8322,10 +8322,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 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}}}" /> 
                         </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 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}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -8399,10 +8399,10 @@ Only takes the first match even if multiple identical entries are found.">
                     <input type="text" name="attr_weapondice3" value="@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll3" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll3" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll3" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach3}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll3" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach3}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy3}]]}}{{after1=AP([[@{weaponap3}]]) ~ DV}}{{after1_num=[[@{weapondv3}]]}}{{after1dmg=@{weapondmgtype3}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes3" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -8477,10 +8477,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 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}}}" /> 
                         </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 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}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -8554,10 +8554,10 @@ Only takes the first match even if multiple identical entries are found.">
                     <input type="text" name="attr_weapondice4" value="@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll4" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll4" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll4" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach4}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll4" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach4}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy4}]]}}{{after1=AP([[@{weaponap4}]]) ~ DV}}{{after1_num=[[@{weapondv4}]]}}{{after1dmg=@{weapondmgtype4}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes4" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -8632,10 +8632,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 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}}}" /> 
                         </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 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}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -8709,10 +8709,10 @@ Only takes the first match even if multiple identical entries are found.">
                     <input type="text" name="attr_weapondice5" value="@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll5" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll5" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll5" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach5}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll5" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach5}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy5}]]}}{{after1=AP([[@{weaponap5}]]) ~ DV}}{{after1_num=[[@{weapondv5}]]}}{{after1dmg=@{weapondmgtype5}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes5" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -8787,10 +8787,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 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}}}" /> 
                         </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 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}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -8864,10 +8864,10 @@ Only takes the first match even if multiple identical entries are found.">
                     <input type="text" name="attr_weapondice6" value="@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll6" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll6" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll6" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll6" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy6}]]}}{{after1=AP([[@{weaponap6}]]) ~ DV}}{{after1_num=[[@{weapondv6}]]}}{{after1dmg=@{weapondmgtype6}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes6" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -8942,10 +8942,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 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}}}" /> 
                         </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 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}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -9019,10 +9019,10 @@ Only takes the first match even if multiple identical entries are found.">
                     <input type="text" name="attr_weapondice7" value="@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll7" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll7" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll7" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach7}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll7" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach7}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy7}]]}}{{after1=AP([[@{weaponap7}]]) ~ DV}}{{after1_num=[[@{weapondv7}]]}}{{after1dmg=@{weapondmgtype7}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes7" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -9097,10 +9097,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 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}}}" /> 
                         </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 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}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -9174,10 +9174,10 @@ Only takes the first match even if multiple identical entries are found.">
                     <input type="text" name="attr_weapondice8" value="@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}" disabled="true" title="Total Dicepool">
                 </div>
                 <div class="weaponrangerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll8" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponrangebaseroll8" title="Fire the Weapon" 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}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
                 </div>
                 <div class="weaponmeleerollwrapper">
-                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll8" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach8}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
+                    <button type="roll" class="weaponroll" name="roll_weaponmeleebaseroll8" title="Attack with the Weapon" 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=Reach}}{{val3_num=[[@{weaponreach8}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh@{weaponaccuracy8}]]}}{{after1=AP([[@{weaponap8}]]) ~ DV}}{{after1_num=[[@{weapondv8}]]}}{{after1dmg=@{weapondmgtype8}}}" />
                 </div>
                 <input class="weaponcheckbox hiddencheckbox" type="checkbox" name="attr_showweaponnotes8" title="Need more Space?">
                 <div class="checkboxticker weaponunticked"></div>
@@ -9252,10 +9252,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 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}}}" /> 
                         </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 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}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -10881,10 +10881,10 @@ on("change:skillhideunusedcheckbox9", function() {
 on("change:edgeroll", function(){
     getAttrs(["edgeroll"], function(value){
         var multiplier;
-        if(value.edgeroll!=null){
-            multiplier=1;
-        }else{
+        if(value.edgeroll==""){
             multiplier=0;
+        }else{
+            multiplier=1;
         }
         setAttrs({
             edgn:multiplier