From b989cef5bbe1b4ec3e2a8d685ecf5ce1853d87a3 Mon Sep 17 00:00:00 2001
From: cwstra <cwstra@gmail.com>
Date: Wed, 1 Apr 2015 23:23:41 -0400
Subject: [PATCH] Slight Cleanup

Compressed the crit rolls so they take up less space.
---
 PokemonTabletopUnited/ptu.html | 68 +++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/PokemonTabletopUnited/ptu.html b/PokemonTabletopUnited/ptu.html
index b0cde8ba98..f88e25573d 100644
--- a/PokemonTabletopUnited/ptu.html
+++ b/PokemonTabletopUnited/ptu.html
@@ -434,8 +434,8 @@
             <tr>
                <td class='sheet-table-header'>Damage Rolls:</td> 
                <td>
-                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move1_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move1_AC}}} {{Type=@{Move1_Type}}} {{Frequency=@{Move1_Freq}}} {{damage=[[@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move1_Range}}} {{effect=@{Move1_Effects}}}' name='roll_Move1AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move1_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move1_AC}}} {{Type=@{Move1_Type}}} {{Frequency=@{Move1_Freq}}} {{damage=[[@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move1_Range}}} {{effect=@{Move1_Effects}}}' name='roll_Move1AtkSpec' /> <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move1_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move1_AC}}} {{Type=@{Move1_Type}}} {{Frequency=@{Move1_Freq}}} {{damage=[[@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move1_Amount}*2)@{Move1_Dice}+2*@{Move1_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move1_Range}}} {{effect=@{Move1_Effects}}}' name='roll_Move1AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move1_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move1_AC}}} {{Type=@{Move1_Type}}} {{Frequency=@{Move1_Freq}}} {{damage=[[@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move1_Amount}*2)@{Move1_Dice}+2*@{Move1_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move1_Range}}} {{effect=@{Move1_Effects}}}' name='roll_Move1AtkSpec' /> <img src="http://www.serebii.net/pokedex-dp/type/special.png">
 		<button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move1_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move1_AC}}} {{Type=@{Move1_Type}}} {{Frequency=@{Move1_Freq}}} {{range=@{Move1_Range}}} {{effect=@{Move1_Effects}}}' name='roll_Move1AtkStat' /> <img src="http://www.serebii.net/pokedex-dp/type/other.png">             
                </td>
             </tr>
@@ -487,8 +487,8 @@
             <tr>
                <td class='sheet-table-header'>Damage Rolls:</td> 
                <td>
-                 <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move4_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move4_AC}}} {{Type=@{Move4_Type}}} {{Frequency=@{Move4_Freq}}} {{damage=[[@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move4_Range}}} {{effect=@{Move4_Effects}}}' name='roll_Move4AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                 <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move4_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move4_AC}}} {{Type=@{Move4_Type}}} {{Frequency=@{Move4_Freq}}} {{damage=[[@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move4_Range}}} {{effect=@{Move4_Effects}}}' name='roll_Move4AtkSpec' /> <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                 <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move4_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move4_AC}}} {{Type=@{Move4_Type}}} {{Frequency=@{Move4_Freq}}} {{damage=[[@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move4_Amount}*2)@{Move4_Dice}+2*@{Move4_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move4_Range}}} {{effect=@{Move4_Effects}}}' name='roll_Move4AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                 <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move4_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move4_AC}}} {{Type=@{Move4_Type}}} {{Frequency=@{Move4_Freq}}} {{damage=[[@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move4_Amount}*2)@{Move4_Dice}+2*@{Move4_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move4_Range}}} {{effect=@{Move4_Effects}}}' name='roll_Move4AtkSpec' /> <img src="http://www.serebii.net/pokedex-dp/type/special.png">
                  <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move4_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move4_AC}}} {{Type=@{Move4_Type}}} {{Frequency=@{Move4_Freq}}} {{range=@{Move4_Range}}} {{effect=@{Move4_Effects}}}' name='roll_Move4AtkStat' />  <img src="http://www.serebii.net/pokedex-dp/type/other.png">             
                </td>
             </tr>
@@ -542,8 +542,8 @@
             <tr>
                <td class='sheet-table-header'>Damage Rolls:</td> 
                <td>
-                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move2_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move2_AC}}} {{Type=@{Move2_Type}}} {{Frequency=@{Move2_Freq}}} {{damage=[[@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move2_Range}}} {{effect=@{Move2_Effects}}}' name='roll_Move2AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move2_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move2_AC}}} {{Type=@{Move2_Type}}} {{Frequency=@{Move2_Freq}}} {{damage=[[@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move2_Range}}} {{effect=@{Move2_Effects}}}' name='roll_Move2AtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move2_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move2_AC}}} {{Type=@{Move2_Type}}} {{Frequency=@{Move2_Freq}}} {{damage=[[@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move2_Amount}*2)@{Move2_Dice}+2*@{Move2_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move2_Range}}} {{effect=@{Move2_Effects}}}' name='roll_Move2AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move2_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move2_AC}}} {{Type=@{Move2_Type}}} {{Frequency=@{Move2_Freq}}} {{damage=[[@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move2_Amount}*2)@{Move2_Dice}+2*@{Move2_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move2_Range}}} {{effect=@{Move2_Effects}}}' name='roll_Move2AtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
 		<button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move2_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move2_AC}}} {{Type=@{Move2_Type}}} {{Frequency=@{Move2_Freq}}} {{range=@{Move2_Range}}} {{effect=@{Move2_Effects}}}' name='roll_Move2AtkStat' /> <img src="http://www.serebii.net/pokedex-dp/type/other.png">                              
                 </td>
             </tr>
@@ -595,8 +595,8 @@
             <tr>
                <td class='sheet-table-header'>Damage Rolls:</td> 
                <td>
-                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move5_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move5_AC}}} {{Type=@{Move5_Type}}} {{Frequency=@{Move5_Freq}}} {{damage=[[@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move5_Range}}} {{effect=@{Move5_Effects}}}' name='roll_Move5AtkPhys' />  <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move5_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move5_AC}}} {{Type=@{Move5_Type}}} {{Frequency=@{Move5_Freq}}} {{damage=[[@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move5_Range}}} {{effect=@{Move5_Effects}}}' name='roll_Move5AtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move5_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move5_AC}}} {{Type=@{Move5_Type}}} {{Frequency=@{Move5_Freq}}} {{damage=[[@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move5_Amount}*2)@{Move5_Dice}+2*@{Move5_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move5_Range}}} {{effect=@{Move5_Effects}}}' name='roll_Move5AtkPhys' />  <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move5_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move5_AC}}} {{Type=@{Move5_Type}}} {{Frequency=@{Move5_Freq}}} {{damage=[[@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move5_Amount}*2)@{Move5_Dice}+2*@{Move5_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move5_Range}}} {{effect=@{Move5_Effects}}}' name='roll_Move5AtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
                 <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move5_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move5_AC}}} {{Type=@{Move5_Type}}} {{Frequency=@{Move5_Freq}}} {{range=@{Move5_Range}}} {{effect=@{Move5_Effects}}}' name='roll_Move5AtkStat' />  <img src="http://www.serebii.net/pokedex-dp/type/other.png">              
                </td>
             </tr>
@@ -650,8 +650,8 @@
             <tr>
                <td class='sheet-table-header'>Damage Rolls:</td> 
                <td>
-                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move3_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move3_AC}}} {{Type=@{Move3_Type}}} {{Frequency=@{Move3_Freq}}} {{damage=[[@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move3_Range}}} {{effect=@{Move3_Effects}}}' name='roll_Move3AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move3_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move3_AC}}} {{Type=@{Move3_Type}}} {{Frequency=@{Move3_Freq}}} {{damage=[[@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move3_Range}}} {{effect=@{Move3_Effects}}}' name='roll_Move3AtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move3_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move3_AC}}} {{Type=@{Move3_Type}}} {{Frequency=@{Move3_Freq}}} {{damage=[[@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move3_Amount}*2)@{Move3_Dice}+2*@{Move3_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move3_Range}}} {{effect=@{Move3_Effects}}}' name='roll_Move3AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move3_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move3_AC}}} {{Type=@{Move3_Type}}} {{Frequency=@{Move3_Freq}}} {{damage=[[@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move3_Amount}*2)@{Move3_Dice}+2*@{Move3_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move3_Range}}} {{effect=@{Move3_Effects}}}' name='roll_Move3AtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
                 <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move3_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move3_AC}}} {{Type=@{Move3_Type}}} {{Frequency=@{Move3_Freq}}} {{range=@{Move3_Range}}} {{effect=@{Move3_Effects}}}' name='roll_Move3AtkStat' />  <img src="http://www.serebii.net/pokedex-dp/type/other.png">              
                </td>
             </tr>
@@ -703,8 +703,8 @@
             <tr>
                 <td class='sheet-table-header'>Damage Rolls:</td> 
                <td>
-                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move6_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move6_AC}}} {{Type=@{Move6_Type}}} {{Frequency=At-Will}} {{damage=[[@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move6_Range}}} {{effect=@{Move6_Effects}}}' name='roll_Move6AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move6_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move6_AC}}} {{Type=@{Move6_Type}}} {{Frequency=At-Will}} {{damage=[[@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move6_Range}}} {{effect=@{Move6_Effects}}}' name='roll_Move6AtkSpec' /> <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move6_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move6_AC}}} {{Type=@{Move6_Type}}} {{Frequency=At-Will}} {{damage=[[@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move6_Amount}*2)@{Move6_Dice}+2*@{Move6_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move6_Range}}} {{effect=@{Move6_Effects}}}' name='roll_Move6AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move6_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move6_AC}}} {{Type=@{Move6_Type}}} {{Frequency=At-Will}} {{damage=[[@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move6_Amount}*2)@{Move6_Dice}+2*@{Move6_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move6_Range}}} {{effect=@{Move6_Effects}}}' name='roll_Move6AtkSpec' /> <img src="http://www.serebii.net/pokedex-dp/type/special.png">
 		<button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move6_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move6_AC}}} {{Type=@{Move6_Type}}} {{Frequency=@{Move6_Freq}}} {{range=@{Move6_Range}}} {{effect=@{Move6_Effects}}}' name='roll_Move6AtkStat' />  <img src="http://www.serebii.net/pokedex-dp/type/other.png">                             
                </td>
             </tr>
@@ -759,8 +759,8 @@
             <tr>
                <td class='sheet-table-header'>Damage Rolls:</td>
                <td>
-                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=Struggle}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Struggle_AC}}} {{Type=@{Struggle_Type}}} {{Frequency=At-Will}} {{damage=[[@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Struggle_Range}}} {{effect=@{Struggle_Effects}}}' name='roll_StruggleAtkPhys' />  <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=Struggle}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Struggle_AC}}} {{Type=@{Struggle_Type}}} {{Frequency=At-Will}} {{damage=[[@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Struggle_Range}}} {{effect=@{Struggle_Effects}}}' name='roll_StruggleAtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=Struggle}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Struggle_AC}}} {{Type=@{Struggle_Type}}} {{Frequency=At-Will}} {{damage=[[@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Struggle_Amount}*2)@{Struggle_Dice}+2*@{Struggle_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Struggle_Range}}} {{effect=@{Struggle_Effects}}}' name='roll_StruggleAtkPhys' />  <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=Struggle}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Struggle_AC}}} {{Type=@{Struggle_Type}}} {{Frequency=At-Will}} {{damage=[[@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Struggle_Amount}*2)@{Struggle_Dice}+2*@{Struggle_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Struggle_Range}}} {{effect=@{Struggle_Effects}}}' name='roll_StruggleAtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
                </td>
             </tr>
             <tr>
@@ -854,8 +854,8 @@
                 <tr class="sheet-normal">
                    <td class='sheet-table-header-1'>Damage Rolls:</td>
                    <td colspan="3">
-                        <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move_AC}}} {{Type=@{Move_Type}}} {{Frequency=@{Move_Freq}}} {{damage=[[@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move_Range}}} {{effect=@{Move_Effects}}}' name='roll_MoveAtkPhys' />  <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                        <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move_AC}}} {{Type=@{Move_Type}}} {{Frequency=@{Move_Freq}}} {{damage=[[@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move_Range}}} {{effect=@{Move_Effects}}}' name='roll_MoveAtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                        <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move_AC}}} {{Type=@{Move_Type}}} {{Frequency=@{Move_Freq}}} {{damage=[[@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move_Amount}*2)@{Move_Dice}+2*@{Move_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move_Range}}} {{effect=@{Move_Effects}}}' name='roll_MoveAtkPhys' />  <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                        <button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move_AC}}} {{Type=@{Move_Type}}} {{Frequency=@{Move_Freq}}} {{damage=[[@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move_Amount}*2)@{Move_Dice}+2*@{Move_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move_Range}}} {{effect=@{Move_Effects}}}' name='roll_MoveAtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
 			<button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move_AC}}} {{Type=@{Move_Type}}} {{Frequency=@{Move_Freq}}} {{range=@{Move_Range}}} {{effect=@{Move_Effects}}}' name='roll_MoveAtkStat' />  <img src="http://www.serebii.net/pokedex-dp/type/other.png">                                  
                     </td>
                 </tr>
@@ -864,8 +864,8 @@
                 <tr class="sheet-five-strike">
                    <td class='sheet-table-header-1'>Damage Rolls:</td>
                    <td colspan="3">
-                        <button type='roll' value='&{template:PTU} {{roll=[[1d8]]}} {{nick=@{nickname}}} {{name=@{Move_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move_AC}}} {{Type=@{Move_Type}}} {{Frequency=@{Move_Freq}}} {{damage=[[@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{ATK_total}]]}} {{damage2=[[@{Move_Amount2}@{Move_Dice2}+@{Move_Bonus2}+@{ATK_total}]]}} {{damage3=[[@{Move_Amount3}@{Move_Dice3}+@{Move_Bonus3}+@{ATK_total}]]}} {{damage4=[[@{Move_Amount4}@{Move_Dice4}+@{Move_Bonus4}+@{ATK_total}]]}} {{damage5=[[@{Move_Amount5}@{Move_Dice5}+@{Move_Bonus5}+@{ATK_total}]]}} {{dmgcrit=[[@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{ATK_total}]]}} {{dmgcrit2=[[@{Move_Amount2}@{Move_Dice2}+@{Move_Bonus2}+@{Move_Amount2}@{Move_Dice2}+@{Move_Bonus2}+@{ATK_total}]]}} {{dmgcrit3=[[@{Move_Amount3}@{Move_Dice3}+@{Move_Bonus3}+@{Move_Amount3}@{Move_Dice3}+@{Move_Bonus3}+@{ATK_total}]]}} {{dmgcrit4=[[@{Move_Amount4}@{Move_Dice4}+@{Move_Bonus4}+@{Move_Amount4}@{Move_Dice4}+@{Move_Bonus4}+@{ATK_total}]]}} {{dmgcrit5=[[@{Move_Amount5}@{Move_Dice5}+@{Move_Bonus5}+@{Move_Amount5}@{Move_Dice5}+@{Move_Bonus5}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move_Range}}} {{effect=@{Move_Effects}}}' name='roll_MoveAtkPhys' />  <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                        <button type='roll' value='&{template:PTU} {{roll=[[1d8]]}} {{nick=@{nickname}}} {{name=@{Move_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move_AC}}} {{Type=@{Move_Type}}} {{Frequency=@{Move_Freq}}} {{damage=[[@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{SPATK_total}]]}} {{damage2=[[@{Move_Amount2}@{Move_Dice2}+@{Move_Bonus2}+@{SPATK_total}]]}} {{damage3=[[@{Move_Amount3}@{Move_Dice3}+@{Move_Bonus3}+@{SPATK_total}]]}} {{damage4=[[@{Move_Amount4}@{Move_Dice4}+@{Move_Bonus4}+@{SPATK_total}]]}} {{damage5=[[@{Move_Amount5}@{Move_Dice5}+@{Move_Bonus5}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{SPATK_total}]]}} {{dmgcrit2=[[@{Move_Amount2}@{Move_Dice2}+@{Move_Bonus2}+@{Move_Amount2}@{Move_Dice2}+@{Move_Bonus2}+@{SPATK_total}]]}} {{dmgcrit3=[[@{Move_Amount3}@{Move_Dice3}+@{Move_Bonus3}+@{Move_Amount3}@{Move_Dice3}+@{Move_Bonus3}+@{SPATK_total}]]}} {{dmgcrit4=[[@{Move_Amount4}@{Move_Dice4}+@{Move_Bonus4}+@{Move_Amount4}@{Move_Dice4}+@{Move_Bonus4}+@{SPATK_total}]]}} {{dmgcrit5=[[@{Move_Amount5}@{Move_Dice5}+@{Move_Bonus5}+@{Move_Amount5}@{Move_Dice5}+@{Move_Bonus5}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move_Range}}} {{effect=@{Move_Effects}}}' name='roll_MoveAtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                        <button type='roll' value='&{template:PTU} {{roll=[[1d8]]}} {{nick=@{nickname}}} {{name=@{Move_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move_AC}}} {{Type=@{Move_Type}}} {{Frequency=@{Move_Freq}}} {{damage=[[@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{ATK_total}]]}} {{damage2=[[@{Move_Amount2}@{Move_Dice2}+@{Move_Bonus2}+@{ATK_total}]]}} {{damage3=[[@{Move_Amount3}@{Move_Dice3}+@{Move_Bonus3}+@{ATK_total}]]}} {{damage4=[[@{Move_Amount4}@{Move_Dice4}+@{Move_Bonus4}+@{ATK_total}]]}} {{damage5=[[@{Move_Amount5}@{Move_Dice5}+@{Move_Bonus5}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move_Amount}*2)@{Move_Dice}+2*@{Move_Bonus}+@{ATK_total}]]}} {{dmgcrit2=[[(@{Move_Amount2}*2)@{Move_Dice2}+2*@{Move_Bonus2}+@{ATK_total}]]}} {{dmgcrit3=[[(@{Move_Amount3}*2)@{Move_Dice3}+2*@{Move_Bonus3}+@{ATK_total}]]}} {{dmgcrit4=[[(@{Move_Amount4}*2)@{Move_Dice4}+2*@{Move_Bonus4}+@{ATK_total}]]}} {{dmgcrit5=[[(@{Move_Amount5}*2)@{Move_Dice5}+2*@{Move_Bonus5}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move_Range}}} {{effect=@{Move_Effects}}}' name='roll_MoveAtkPhys' />  <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                        <button type='roll' value='&{template:PTU} {{roll=[[1d8]]}} {{nick=@{nickname}}} {{name=@{Move_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move_AC}}} {{Type=@{Move_Type}}} {{Frequency=@{Move_Freq}}} {{damage=[[@{Move_Amount}@{Move_Dice}+@{Move_Bonus}+@{SPATK_total}]]}} {{damage2=[[@{Move_Amount2}@{Move_Dice2}+@{Move_Bonus2}+@{SPATK_total}]]}} {{damage3=[[@{Move_Amount3}@{Move_Dice3}+@{Move_Bonus3}+@{SPATK_total}]]}} {{damage4=[[@{Move_Amount4}@{Move_Dice4}+@{Move_Bonus4}+@{SPATK_total}]]}} {{damage5=[[@{Move_Amount5}@{Move_Dice5}+@{Move_Bonus5}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move_Amount}*2)@{Move_Dice}+2*@{Move_Bonus}+@{SPATK_total}]]}} {{dmgcrit2=[[(@{Move_Amount2}*2)@{Move_Dice2}+2*@{Move_Bonus2}+@{SPATK_total}]]}} {{dmgcrit3=[[(@{Move_Amount3}*2)@{Move_Dice3}+2*@{Move_Bonus3}+@{SPATK_total}]]}} {{dmgcrit4=[[(@{Move_Amount4}*2)@{Move_Dice4}+2*@{Move_Bonus4}+@{SPATK_total}]]}} {{dmgcrit5=[[(@{Move_Amount5}*2)@{Move_Dice5}+2*@{Move_Bonus5}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move_Range}}} {{effect=@{Move_Effects}}}' name='roll_MoveAtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
                     </td>
                 </tr>
                 <tr>
@@ -1094,7 +1094,7 @@
             </tr>
             <tr>
                 <td class='sheet-table-header'>Frequency:</td>
-                <td><input class='sheet-shortfield' name='attr_FeatureFreq' type='text'></td>
+                <td><input class='sheet-shortfield' name='attr_FeatureFreq' type='text'></td>@{Move_Amount2}@{Move_Dice2}+@{Move_Bonus2}+@{Move_Amount2}@{Move_Dice2}+@{M
             </tr>
             <tr>
                 <td class='sheet-table-header'>Target:</td>
@@ -1249,54 +1249,54 @@
         <h4 class='sheet-minihead'>Move #1</h4>
         <input class='sheet-shortfield' name="attr_f1" disabled="true" type='text' value="@{Move1_Name}"/>
         <table style="width:100%;" align="center"><tr>
-                <td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move1_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move1_AC}}} {{Type=@{Move1_Type}}} {{Frequency=@{Move1_Freq}}} {{damage=[[@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move1_Range}}} {{effect=@{Move1_Effects}}}' name='roll_Move1AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move1_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move1_AC}}} {{Type=@{Move1_Type}}} {{Frequency=@{Move1_Freq}}} {{damage=[[@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move1_Range}}} {{effect=@{Move1_Effects}}}' name='roll_Move1AtkSpec' /> <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                <td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move1_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move1_AC}}} {{Type=@{Move1_Type}}} {{Frequency=@{Move1_Freq}}} {{damage=[[@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move1_Amount}*2)@{Move1_Dice}+2*@{Move1_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move1_Range}}} {{effect=@{Move1_Effects}}}' name='roll_Move1AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move1_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move1_AC}}} {{Type=@{Move1_Type}}} {{Frequency=@{Move1_Freq}}} {{damage=[[@{Move1_Amount}@{Move1_Dice}+@{Move1_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move1_Amount}*2)@{Move1_Dice}+2*@{Move1_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move1_Range}}} {{effect=@{Move1_Effects}}}' name='roll_Move1AtkSpec' /> <img src="http://www.serebii.net/pokedex-dp/type/special.png">
 	            </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move1_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move1_AC}}} {{Type=@{Move1_Type}}} {{Frequency=@{Move1_Freq}}} {{range=@{Move1_Range}}} {{effect=@{Move1_Effects}}}' name='roll_Move1AtkStat' /> <img src="http://www.serebii.net/pokedex-dp/type/other.png">             
         </td></tr></table>
         <br/>
         <h4 class='sheet-minihead'>Move #4</h4>
         <input class='sheet-shortfield' name="attr_f4" disabled="true" type='text' value="@{Move4_Name}"/>
         <table style="width;100%" align="center"><tr>
-                <td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move4_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move4_AC}}} {{Type=@{Move4_Type}}} {{Frequency=@{Move4_Freq}}} {{damage=[[@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move4_Range}}} {{effect=@{Move4_Effects}}}' name='roll_Move4AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move4_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move4_AC}}} {{Type=@{Move4_Type}}} {{Frequency=@{Move4_Freq}}} {{damage=[[@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move4_Range}}} {{effect=@{Move4_Effects}}}' name='roll_Move4AtkSpec' /> <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                <td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move4_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move4_AC}}} {{Type=@{Move4_Type}}} {{Frequency=@{Move4_Freq}}} {{damage=[[@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move4_Amount}*2)@{Move4_Dice}+2*@{Move4_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move4_Range}}} {{effect=@{Move4_Effects}}}' name='roll_Move4AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move4_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move4_AC}}} {{Type=@{Move4_Type}}} {{Frequency=@{Move4_Freq}}} {{damage=[[@{Move4_Amount}@{Move4_Dice}+@{Move4_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move4_Amount}*2)@{Move4_Dice}+2*@{Move4_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move4_Range}}} {{effect=@{Move4_Effects}}}' name='roll_Move4AtkSpec' /> <img src="http://www.serebii.net/pokedex-dp/type/special.png">
                 </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move4_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move4_AC}}} {{Type=@{Move4_Type}}} {{Frequency=@{Move4_Freq}}} {{range=@{Move4_Range}}} {{effect=@{Move4_Effects}}}' name='roll_Move4AtkStat' />  <img src="http://www.serebii.net/pokedex-dp/type/other.png">             
         </td></tr></table>
         </div><div class='sheet-col'><br>
         <h4 class='sheet-minihead'>Move #2</h4>
         <input class='sheet-shortfield' name="attr_f2" disabled="true" type='text' value="@{Move2_Name}"/>
         <table style="width;100%" align="center"><tr>
-                <td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move2_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move2_AC}}} {{Type=@{Move2_Type}}} {{Frequency=@{Move2_Freq}}} {{damage=[[@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move2_Range}}} {{effect=@{Move2_Effects}}}' name='roll_Move2AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move2_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move2_AC}}} {{Type=@{Move2_Type}}} {{Frequency=@{Move2_Freq}}} {{damage=[[@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move2_Range}}} {{effect=@{Move2_Effects}}}' name='roll_Move2AtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                <td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move2_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move2_AC}}} {{Type=@{Move2_Type}}} {{Frequency=@{Move2_Freq}}} {{damage=[[@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move2_Amount}*2)@{Move2_Dice}+2*@{Move2_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move2_Range}}} {{effect=@{Move2_Effects}}}' name='roll_Move2AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move2_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move2_AC}}} {{Type=@{Move2_Type}}} {{Frequency=@{Move2_Freq}}} {{damage=[[@{Move2_Amount}@{Move2_Dice}+@{Move2_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move2_Amount}*2)@{Move2_Dice}+2*@{Move2_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move2_Range}}} {{effect=@{Move2_Effects}}}' name='roll_Move2AtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
 	            </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move2_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move2_AC}}} {{Type=@{Move2_Type}}} {{Frequency=@{Move2_Freq}}} {{range=@{Move2_Range}}} {{effect=@{Move2_Effects}}}' name='roll_Move2AtkStat' /> <img src="http://www.serebii.net/pokedex-dp/type/other.png">                              
         </td></tr></table>
         <br>
         <h4 class='sheet-minihead'>Move #5</h4>
         <input class='sheet-shortfield' name="attr_f5" disabled="true" type='text' value="@{Move5_Name}"/>
         <table style="width;100%" align="center"><tr>
-                <td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move5_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move5_AC}}} {{Type=@{Move5_Type}}} {{Frequency=@{Move5_Freq}}} {{damage=[[@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move5_Range}}} {{effect=@{Move5_Effects}}}' name='roll_Move5AtkPhys' />  <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move5_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move5_AC}}} {{Type=@{Move5_Type}}} {{Frequency=@{Move5_Freq}}} {{damage=[[@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move5_Range}}} {{effect=@{Move5_Effects}}}' name='roll_Move5AtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                <td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move5_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move5_AC}}} {{Type=@{Move5_Type}}} {{Frequency=@{Move5_Freq}}} {{damage=[[@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move5_Amount}*2)@{Move5_Dice}+2*@{Move5_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move5_Range}}} {{effect=@{Move5_Effects}}}' name='roll_Move5AtkPhys' />  <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move5_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move5_AC}}} {{Type=@{Move5_Type}}} {{Frequency=@{Move5_Freq}}} {{damage=[[@{Move5_Amount}@{Move5_Dice}+@{Move5_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move5_Amount}*2)@{Move5_Dice}+2*@{Move5_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move5_Range}}} {{effect=@{Move5_Effects}}}' name='roll_Move5AtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
                 </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move5_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move5_AC}}} {{Type=@{Move5_Type}}} {{Frequency=@{Move5_Freq}}} {{range=@{Move5_Range}}} {{effect=@{Move5_Effects}}}' name='roll_Move5AtkStat' />  <img src="http://www.serebii.net/pokedex-dp/type/other.png">              
         </td></tr></table>
         <br>
         <h4 class='sheet-minihead' >Struggle</h4>
         <table style="width;100%" align="center"><tr>
-                <td><button type='roll' name="attr_fs" value='&{template:PTU} {{nick=@{nickname}}} {{name=Struggle}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Struggle_AC}}} {{Type=@{Struggle_Type}}} {{Frequency=At-Will}} {{damage=[[@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Struggle_Range}}} {{effect=@{Struggle_Effects}}}' name='roll_StruggleAtkPhys' />  <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=Struggle}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Struggle_AC}}} {{Type=@{Struggle_Type}}} {{Frequency=At-Will}} {{damage=[[@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Struggle_Range}}} {{effect=@{Struggle_Effects}}}' name='roll_StruggleAtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                <td><button type='roll' name="attr_fs" value='&{template:PTU} {{nick=@{nickname}}} {{name=Struggle}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Struggle_AC}}} {{Type=@{Struggle_Type}}} {{Frequency=At-Will}} {{damage=[[@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Struggle_Amount}*2)@{Struggle_Dice}+2*@{Struggle_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Struggle_Range}}} {{effect=@{Struggle_Effects}}}' name='roll_StruggleAtkPhys' />  <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=Struggle}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Struggle_AC}}} {{Type=@{Struggle_Type}}} {{Frequency=At-Will}} {{damage=[[@{Struggle_Amount}@{Struggle_Dice}+@{Struggle_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Struggle_Amount}*2)@{Struggle_Dice}+2*@{Struggle_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Struggle_Range}}} {{effect=@{Struggle_Effects}}}' name='roll_StruggleAtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
         </td></tr></table>
         </div><div class='sheet-col'><br>
         <h4 class='sheet-minihead'>Move #3</h4>
         <input class='sheet-shortfield' name="attr_f3" disabled="true" type='text' value="@{Move3_Name}"/>
         <table style="width;100%" align="center"><tr>
-                <td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move3_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move3_AC}}} {{Type=@{Move3_Type}}} {{Frequency=@{Move3_Freq}}} {{damage=[[@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move3_Range}}} {{effect=@{Move3_Effects}}}' name='roll_Move3AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move3_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move3_AC}}} {{Type=@{Move3_Type}}} {{Frequency=@{Move3_Freq}}} {{damage=[[@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move3_Range}}} {{effect=@{Move3_Effects}}}' name='roll_Move3AtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
-                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move3_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move3_AC}}} {{Type=@{Move3_Type}}} {{Frequency=@{Move3_Freq}}} {{range=@{Move3_Range}}} {{effect=@{Move3_Effects}}}' name='roll_Move3AtkStat' />  <img src="http://www.serebii.net/pokedex-dp/type/other.png">              
+                <td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move3_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move3_AC}}} {{Type=@{Move3_Type}}} {{Frequency=@{Move3_Freq}}} {{damage=[[@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move3_Amount}*2)@{Move3_Dice}+2*@{Move3_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move3_Range}}} {{effect=@{Move3_Effects}}}' name='roll_Move3AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move3_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move3_AC}}} {{Type=@{Move3_Type}}} {{Frequency=@{Move3_Freq}}} {{damage=[[@{Move3_Amount}@{Move3_Dice}+@{Move3_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move3_Amount}*2)@{Move3_Dice}+2*@{Move3_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move3_Range}}} {{effect=@{Move3_Effects}}}' name='roll_Move3AtkSpec' />  <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move3_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move3_AC}}} {{Type=@{Move3_Type}}} {{Frequency=@{Move3_Freq}}} {{range=@{Move3_Range}}} {{effect=@{Move3_Effects}}}' name='roll_Move3AtkStat' />  <img src="http://www.serebii.net/pokedex-dp/type/other.png">           
         </td></tr></table>
         <br>
         <h4 class='sheet-minihead'>Move #6</h4>
         <input class='sheet-shortfield' name="attr_f6" type='text' value="@{Move6_Name}" disabled="true"/>
         <table style="width;100%" align="center"><tr>
-                <td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move6_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move6_AC}}} {{Type=@{Move6_Type}}} {{Frequency=At-Will}} {{damage=[[@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move6_Range}}} {{effect=@{Move6_Effects}}}' name='roll_Move6AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
-                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move6_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move6_AC}}} {{Type=@{Move6_Type}}} {{Frequency=At-Will}} {{damage=[[@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move6_Range}}} {{effect=@{Move6_Effects}}}' name='roll_Move6AtkSpec' /> <img src="http://www.serebii.net/pokedex-dp/type/special.png">
+                <td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move6_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move6_AC}}} {{Type=@{Move6_Type}}} {{Frequency=At-Will}} {{damage=[[@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{ATK_total}]]}} {{dmgcrit=[[(@{Move6_Amount}*2)@{Move6_Dice}+2*@{Move6_Bonus}+@{ATK_total}]]}} {{dmgcat=Physical}} {{range=@{Move6_Range}}} {{effect=@{Move6_Effects}}}' name='roll_Move6AtkPhys' /> <img src="http://www.serebii.net/pokedex-dp/type/physical.png">
+                </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move6_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move6_AC}}} {{Type=@{Move6_Type}}} {{Frequency=At-Will}} {{damage=[[@{Move6_Amount}@{Move6_Dice}+@{Move6_Bonus}+@{SPATK_total}]]}} {{dmgcrit=[[(@{Move6_Amount}*2)@{Move6_Dice}+2*@{Move6_Bonus}+@{SPATK_total}]]}} {{dmgcat=Special}} {{range=@{Move6_Range}}} {{effect=@{Move6_Effects}}}' name='roll_Move6AtkSpec' /> <img src="http://www.serebii.net/pokedex-dp/type/special.png">
 		        </td><td><button type='roll' value='&{template:PTU} {{nick=@{nickname}}} {{name=@{Move6_Name}}} {{AR=[[1d20+@{Acc}]]}} {{AC=@{Move6_AC}}} {{Type=@{Move6_Type}}} {{Frequency=@{Move6_Freq}}} {{range=@{Move6_Range}}} {{effect=@{Move6_Effects}}}' name='roll_Move6AtkStat' />  <img src="http://www.serebii.net/pokedex-dp/type/other.png">                             
         </td></tr></table>
         <br>