From 2a5cd8c2a9f20e600a4fa22f1052a39bc8f10e38 Mon Sep 17 00:00:00 2001
From: RinVindor <zackball1990@gmail.com>
Date: Mon, 12 Dec 2016 02:02:07 -0500
Subject: [PATCH] Update 12/12/2016

-Fixed ID Roll calculations
-Implemented a spot for Talent bonuses in ID and Learn
---
 Naruto d20 Modern/Naruto d20 Modern.html | 146 ++++++++++++-----------
 1 file changed, 78 insertions(+), 68 deletions(-)

diff --git a/Naruto d20 Modern/Naruto d20 Modern.html b/Naruto d20 Modern/Naruto d20 Modern.html
index d2a68fc400..11ee1da82a 100644
--- a/Naruto d20 Modern/Naruto d20 Modern.html	
+++ b/Naruto d20 Modern/Naruto d20 Modern.html	
@@ -2162,7 +2162,7 @@
         </tr>
         <tr>
             <td><button type="roll" class="sheet-btn" name="roll_ID_Chakra_Control" value="/e rolls Chakra Control ID [[1d20+@{ID_Chakra_Control}]]" >ID</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_ID_Chakra_Control" value="[[@{ID_Chakra_Control-ability}+@{ID_Chakra_Control-Ranks}+@{ID_Chakra_Control-Blood}+@{ID_Chakra_Control-Occu}+@{ID_Chakra_Control-Feats}+@{ID_Chakra_Control-Synergy}+@{ID_Chakra_Control-Items}+@{ID_Chakra_Control-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_ID_Chakra_Control" value="[[@{ID_Chakra_Control-ability}+@{ID_Chakra_Control-Ranks}+@{ID_Chakra_Control-Blood}+@{ID_Chakra_Control-Occu}@{ID_Chakra_Control-Talents}+@{ID_Chakra_Control-Feats}+@{ID_Chakra_Control-Synergy}+@{ID_Chakra_Control-Items}+@{ID_Chakra_Control-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_ID_Chakra_Control-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2176,6 +2176,7 @@
             <td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Ranks" value="@{Chakra_Control-Ranks}" disabled='true'/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Blood" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Occu" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Talents" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Feats" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Synergy" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Items" value="0"/></td>
@@ -2183,7 +2184,7 @@
         </tr>
         <tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Chakra_Control" value="/e rolls Chakra Control Learn [[1d20+@{Learn_Chakra_Control}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Chakra_Control" value="[[@{Learn_Chakra_Control-ability}+@{Learn_Chakra_Control-Ranks}+@{Learn_Chakra_Control-Blood}+@{Learn_Chakra_Control-Occu}+@{Learn_Chakra_Control-Feats}+@{Learn_Chakra_Control-Synergy}+@{Learn_Chakra_Control-Items}+@{Learn_Chakra_Control-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Chakra_Control" value="[[@{Learn_Chakra_Control-ability}+@{Learn_Chakra_Control-Ranks}+@{Learn_Chakra_Control-Blood}+@{Learn_Chakra_Control-Occu}+@{Learn_Chakra_Control-Talents}+@{Learn_Chakra_Control-Feats}+@{Learn_Chakra_Control-Synergy}+@{Learn_Chakra_Control-Items}+@{Learn_Chakra_Control-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Chakra_Control-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2197,6 +2198,7 @@
             <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Ranks" value="@{Chakra_Control-Ranks}" disabled='true'/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Blood" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Occu" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Talents" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Feats" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Synergy" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Items" value="0"/></td>
@@ -2293,16 +2295,16 @@
                                 <select class="sheet-number" name="attr_cc-TX-Duration-Opt" title="@{cc-TX-Duration-Opt}" style="width:50px">
                                     <option value='Instantaneous' selected>Instantaneous</option>
                                     <option value='Concentration'>Concentration</option>
-                                    <option value='Concentration + @{cc-TX-Duration}'>Concentration+Rounds</option>
+                                    <option value='Concentration + @{cc-TX-Duration} Round(s)'>Concentration+Rounds</option>
                                     <option value='Permanent'>Permanent</option>
                                     <option value='@{cc-TX-Duration} Round(s)'>Rounds</option>
-                                    <option value='[[@{cc-TX-Duration} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ]] Round(s)'>Rounds/Lvl</option>
+                                    <option value='[[@{cc-TX-Duration} * [[(@{cc-Character_Level} + @{cc-TX-masLevel})]] ]] Round(s)'>Rounds/Lvl</option>
                                     <option value='@{cc-TX-Duration} Minute(s)'>Minutes</option>
-                                    <option value='[[@{cc-TX-Duration} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] Minute(s)'>Minutes/Lvl</option>
+                                    <option value='[[@{cc-TX-Duration} * [[(@{cc-Character_Level} + @{cc-TX-masLevel})]] ]] Minute(s)'>Minutes/Lvl</option>
                                     <option value='@{cc-TX-Duration} Hour(s)'>Hours</option>
-                                    <option value='[[@{cc-TX-Duration} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] Hour(s)'>Hours/Lvl</option>
+                                    <option value='[[@{cc-TX-Duration} * [[(@{cc-Character_Level} + @{cc-TX-masLevel}) ]] ]] Hour(s)'>Hours/Lvl</option>
                                     <option value='@{cc-TX-Duration} Day(s)'>Days</option>
-                                    <option value='[[@{cc-TX-Duration} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] Day(s)'>Days/Lvl</option>
+                                    <option value='[[@{cc-TX-Duration} * [[(@{cc-Character_Level} + @{cc-TX-masLevel}) ]] ]] Day(s)'>Days/Lvl</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_cc-TX-Duration" title="@{cc-TX-Duration}" style="width:150px"/>
                             </td>
@@ -2441,16 +2443,16 @@
                                 <select class="sheet-number" name="attr_cc-TX-Duration-Opt" title="@{cc-TX-Duration-Opt}" style="width:50px">
                                     <option value='Instantaneous' selected>Instantaneous</option>
                                     <option value='Concentration'>Concentration</option>
-                                    <option value='Concentration + @{cc-TX-Duration}'>Concentration+Rounds</option>
+                                    <option value='Concentration + @{cc-TX-Duration} Rounds'>Concentration+Rounds</option>
                                     <option value='Permanent'>Permanent</option>
                                     <option value='@{cc-TX-Duration} Round(s)'>Rounds</option>
-                                    <option value='[[@{cc-TX-Duration} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ]] Round(s)'>Rounds/Lvl</option>
+                                    <option value='[[@{cc-TX-Duration} * [[(@{cc-Character_Level} + @{cc-TX-masLevel})]] ]] Round(s)'>Rounds/Lvl</option>
                                     <option value='@{cc-TX-Duration} Minute(s)'>Minutes</option>
-                                    <option value='[[@{cc-TX-Duration} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] Minute(s)'>Minutes/Lvl</option>
+                                    <option value='[[@{cc-TX-Duration} * [[(@{cc-Character_Level} + @{cc-TX-masLevel})]] ]] Minute(s)'>Minutes/Lvl</option>
                                     <option value='@{cc-TX-Duration} Hour(s)'>Hours</option>
-                                    <option value='[[@{cc-TX-Duration} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] Hour(s)'>Hours/Lvl</option>
+                                    <option value='[[@{cc-TX-Duration} * [[(@{cc-Character_Level} + @{cc-TX-masLevel})]] ]] Hour(s)'>Hours/Lvl</option>
                                     <option value='@{cc-TX-Duration} Day(s)'>Days</option>
-                                    <option value='[[@{cc-TX-Duration} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] Day(s)'>Days/Lvl</option>
+                                    <option value='[[@{cc-TX-Duration} * [[(@{cc-Character_Level} + @{cc-TX-masLevel})]] ]] Day(s)'>Days/Lvl</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_cc-TX-Duration" title="@{cc-TX-Duration}" style="width:150px"/>
                             </td>
@@ -2546,7 +2548,7 @@
         </tr>
         <tr>                  
             <td><button type="roll" class="sheet-btn" name="roll_ID_Fuinjutsu" value="/e rolls Fuinjutsu ID [[1d20+@{ID_Fuinjutsu}]]" >ID</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_ID_Fuinjutsu" value="[[@{ID_Fuinjutsu-ability}+@{ID_Fuinjutsu-Ranks}+@{ID_Fuinjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_ID_Fuinjutsu" value="[[@{ID_Fuinjutsu-ability}+@{ID_Fuinjutsu-Ranks}+@{ID_Fuinjutsu-Blood}+@{ID_Fuinjutsu-Occu}+@{ID_Fuinjutsu-Talents}+@{ID_Fuinjutsu-Feats}+@{ID_Fuinjutsu-Synergy}+@{ID_Fuinjutsu-Items}+@{ID_Fuinjutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_ID_Fuinjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2560,14 +2562,15 @@
             <td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Ranks" value="@{Fuinjutsu-Ranks}" disabled='true'/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Blood" value="0"/></td>
 		   	<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Occu" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Talents" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Feats" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Syn" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Synergy" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Items" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Misc" value="0" /></td>
         </tr>
 		<tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Fuinjutsu" value="/e rolls Fuinjutsu Learn [[1d20+@{Learn_Fuinjutsu}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Fuinjutsu" value="[[@{Learn_Fuinjutsu-ability}+@{Learn_Fuinjutsu-Ranks}+@{Learn_Fuinjutsu-Blood}+@{Learn_Fuinjutsu-Occu}+@{Learn_Fuinjutsu-Feats}+@{Learn_Fuinjutsu-Synergy}+@{Learn_Fuinjutsu-Items}+@{Learn_Fuinjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Fuinjutsu" value="[[@{Learn_Fuinjutsu-ability}+@{Learn_Fuinjutsu-Ranks}+@{Learn_Fuinjutsu-Blood}+@{Learn_Fuinjutsu-Occu}+@{Learn_Fuinjutsu-Talents}+@{Learn_Fuinjutsu-Feats}+@{Learn_Fuinjutsu-Synergy}+@{Learn_Fuinjutsu-Items}+@{Learn_Fuinjutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Fuinjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2581,6 +2584,7 @@
             <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Ranks" value="@{Fuinjutsu-Ranks}" disabled='true'/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Blood" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Occu" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Talents" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Feats" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Synergy" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Items" value="0"/></td>
@@ -2678,16 +2682,16 @@
                                 <select class="sheet-number" name="attr_fu-TX-Duration-Opt" title="@{fu-TX-Duration-Opt}" style="width:50px">
                                     <option value='Instantaneous' selected>Instantaneous</option>
                                     <option value='Concentration'>Concentration</option>
-                                    <option value='Concentration + @{fu-TX-Duration}'>Concentration+Rounds</option>
+                                    <option value='Concentration + @{fu-TX-Duration} Rounds'>Concentration+Rounds</option>
                                     <option value='Permanent'>Permanent</option>
                                     <option value='@{fu-TX-Duration} Round(s)'>Rounds</option>
-                                    <option value='[[@{fu-TX-Duration} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ]] Round(s)'>Rounds/Lvl</option>
+                                    <option value='[[@{fu-TX-Duration} * [[(@{fu-Character_Level} + @{fu-TX-masLevel})]] ]] Round(s)'>Rounds/Lvl</option>
                                     <option value='@{fu-TX-Duration} Minute(s)'>Minutes</option>
-                                    <option value='[[@{fu-TX-Duration} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] Minute(s)'>Minutes/Lvl</option>
+                                    <option value='[[@{fu-TX-Duration} * [[(@{fu-Character_Level} + @{fu-TX-masLevel})]] ]] Minute(s)'>Minutes/Lvl</option>
                                     <option value='@{fu-TX-Duration} Hour(s)'>Hours</option>
-                                    <option value='[[@{fu-TX-Duration} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] Hour(s)'>Hours/Lvl</option>
+                                    <option value='[[@{fu-TX-Duration} * [[(@{fu-Character_Level} + @{fu-TX-masLevel})]] ]] Hour(s)'>Hours/Lvl</option>
                                     <option value='@{fu-TX-Duration} Day(s)'>Days</option>
-                                    <option value='[[@{fu-TX-Duration} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] Day(s)'>Days/Lvl</option>
+                                    <option value='[[@{fu-TX-Duration} * [[(@{fu-Character_Level} + @{fu-TX-masLevel})]] ]] Day(s)'>Days/Lvl</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_fu-TX-Duration" title="@{fu-TX-Duration}" style="width:150px"/>
                             </td>
@@ -2826,16 +2830,16 @@
                                 <select class="sheet-number" name="attr_fu-TX-Duration-Opt" title="@{fu-TX-Duration-Opt}" style="width:50px">
                                     <option value='Instantaneous' selected>Instantaneous</option>
                                     <option value='Concentration'>Concentration</option>
-                                    <option value='Concentration + @{fu-TX-Duration}'>Concentration+Rounds</option>
+                                    <option value='Concentration + @{fu-TX-Duration} Rounds'>Concentration+Rounds</option>
                                     <option value='Permanent'>Permanent</option>
                                     <option value='@{fu-TX-Duration} Round(s)'>Rounds</option>
-                                    <option value='[[@{fu-TX-Duration} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ]] Round(s)'>Rounds/Lvl</option>
+                                    <option value='[[@{fu-TX-Duration} * [[(@{fu-Character_Level} + @{fu-TX-masLevel})]] ]] Round(s)'>Rounds/Lvl</option>
                                     <option value='@{fu-TX-Duration} Minute(s)'>Minutes</option>
-                                    <option value='[[@{fu-TX-Duration} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] Minute(s)'>Minutes/Lvl</option>
+                                    <option value='[[@{fu-TX-Duration} * [[(@{fu-Character_Level} + @{fu-TX-masLevel})]] ]] Minute(s)'>Minutes/Lvl</option>
                                     <option value='@{fu-TX-Duration} Hour(s)'>Hours</option>
-                                    <option value='[[@{fu-TX-Duration} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] Hour(s)'>Hours/Lvl</option>
+                                    <option value='[[@{fu-TX-Duration} * [[(@{fu-Character_Level} + @{fu-TX-masLevel})]] ]] Hour(s)'>Hours/Lvl</option>
                                     <option value='@{fu-TX-Duration} Day(s)'>Days</option>
-                                    <option value='[[@{fu-TX-Duration} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] Day(s)'>Days/Lvl</option>
+                                    <option value='[[@{fu-TX-Duration} * [[(@{fu-Character_Level} + @{fu-TX-masLevel})]] ]] Day(s)'>Days/Lvl</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_fu-TX-Duration" title="@{fu-TX-Duration}" style="width:150px"/>
                             </td>
@@ -2932,7 +2936,7 @@
         </tr>
         <tr>                  
             <td><button type="roll" class="sheet-btn" name="roll_ID_Genjutsu" value="/e rolls Genjutsu ID [[1d20+@{ID_Genjutsu}]]" >ID</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_ID_Genjutsu" value="[[@{ID_Genjutsu-ability}+@{ID_Genjutsu-Ranks}+@{ID_Genjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_ID_Genjutsu" value="[[@{ID_Genjutsu-ability}+@{ID_Genjutsu-Ranks}+@{ID_Genjutsu-Blood}+@{ID_Genjutsu-Occu}+@{ID_Genjutsu-Talents}+@{ID_Genjutsu-Feats}+@{ID_Genjutsu-Synergy}+@{ID_Genjutsu-Items}+@{ID_Genjutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_ID_Genjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2946,14 +2950,15 @@
             <td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Ranks" value="@{Genjutsu-Ranks}" disabled='true'/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Blood" value="0"/></td>
 		   	<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Occu" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Talents" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Feats" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Syn" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Synergy" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Items" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Misc" value="0" /></td>
         </tr>
 		<tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Genjutsu" value="/e rolls Genjutsu Learn [[1d20+@{Learn_Genjutsu}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Genjutsu" value="[[@{Learn_Genjutsu-ability}+@{Learn_Genjutsu-Ranks}+@{Learn_Genjutsu-Blood}+@{Learn_Genjutsu-Occu}+@{Learn_Genjutsu-Feats}+@{Learn_Genjutsu-Synergy}+@{Learn_Genjutsu-Items}+@{Learn_Genjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Genjutsu" value="[[@{Learn_Genjutsu-ability}+@{Learn_Genjutsu-Ranks}+@{Learn_Genjutsu-Blood}+@{Learn_Genjutsu-Occu}+@{Learn_Genjutsu-Talents}+@{Learn_Genjutsu-Feats}+@{Learn_Genjutsu-Synergy}+@{Learn_Genjutsu-Items}+@{Learn_Genjutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Genjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2967,6 +2972,7 @@
             <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Ranks" value="@{Genjutsu-Ranks}" disabled='true'/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Blood" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Occu" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Talents" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Feats" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Synergy" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Items" value="0"/></td>
@@ -3063,16 +3069,16 @@
                                 <select class="sheet-number" name="attr_ge-TX-Duration-Opt" title="@{ge-TX-Duration-Opt}" style="width:50px">
                                     <option value='Instantaneous' selected>Instantaneous</option>
                                     <option value='Concentration'>Concentration</option>
-                                    <option value='Concentration + @{ge-TX-Duration}'>Concentration+Rounds</option>
+                                    <option value='Concentration + @{ge-TX-Duration} Rounds'>Concentration+Rounds</option>
                                     <option value='Permanent'>Permanent</option>
                                     <option value='@{ge-TX-Duration} Round(s)'>Rounds</option>
-                                    <option value='[[@{ge-TX-Duration} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ]] Round(s)'>Rounds/Lvl</option>
+                                    <option value='[[@{ge-TX-Duration} * [[(@{ge-Character_Level} + @{ge-TX-masLevel})]] ]] Round(s)'>Rounds/Lvl</option>
                                     <option value='@{ge-TX-Duration} Minute(s)'>Minutes</option>
-                                    <option value='[[@{ge-TX-Duration} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] Minute(s)'>Minutes/Lvl</option>
+                                    <option value='[[@{ge-TX-Duration} * [[(@{ge-Character_Level} + @{ge-TX-masLevel})]] ]] Minute(s)'>Minutes/Lvl</option>
                                     <option value='@{ge-TX-Duration} Hour(s)'>Hours</option>
-                                    <option value='[[@{ge-TX-Duration} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] Hour(s)'>Hours/Lvl</option>
+                                    <option value='[[@{ge-TX-Duration} * [[(@{ge-Character_Level} + @{ge-TX-masLevel})]] ]] Hour(s)'>Hours/Lvl</option>
                                     <option value='@{ge-TX-Duration} Day(s)'>Days</option>
-                                    <option value='[[@{ge-TX-Duration} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] Day(s)'>Days/Lvl</option>
+                                    <option value='[[@{ge-TX-Duration} * [[(@{ge-Character_Level} + @{ge-TX-masLevel})]] ]] Day(s)'>Days/Lvl</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_ge-TX-Duration" title="@{ge-TX-Duration}" style="width:150px"/>
                             </td>
@@ -3211,16 +3217,16 @@
                                 <select class="sheet-number" name="attr_ge-TX-Duration-Opt" title="@{ge-TX-Duration-Opt}" style="width:50px">
                                     <option value='Instantaneous' selected>Instantaneous</option>
                                     <option value='Concentration'>Concentration</option>
-                                    <option value='Concentration + @{ge-TX-Duration}'>Concentration+Rounds</option>
+                                    <option value='Concentration + @{ge-TX-Duration} Rounds'>Concentration+Rounds</option>
                                     <option value='Permanent'>Permanent</option>
                                     <option value='@{ge-TX-Duration} Round(s)'>Rounds</option>
-                                    <option value='[[@{ge-TX-Duration} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ]] Round(s)'>Rounds/Lvl</option>
+                                    <option value='[[@{ge-TX-Duration} * [[(@{ge-Character_Level} + @{ge-TX-masLevel})]] ]] Round(s)'>Rounds/Lvl</option>
                                     <option value='@{ge-TX-Duration} Minute(s)'>Minutes</option>
-                                    <option value='[[@{ge-TX-Duration} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] Minute(s)'>Minutes/Lvl</option>
+                                    <option value='[[@{ge-TX-Duration} * [[(@{ge-Character_Level} + @{ge-TX-masLevel})]] ]] Minute(s)'>Minutes/Lvl</option>
                                     <option value='@{ge-TX-Duration} Hour(s)'>Hours</option>
-                                    <option value='[[@{ge-TX-Duration} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] Hour(s)'>Hours/Lvl</option>
+                                    <option value='[[@{ge-TX-Duration} * [[(@{ge-Character_Level} + @{ge-TX-masLevel})]] ]] Hour(s)'>Hours/Lvl</option>
                                     <option value='@{ge-TX-Duration} Day(s)'>Days</option>
-                                    <option value='[[@{ge-TX-Duration} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] Day(s)'>Days/Lvl</option>
+                                    <option value='[[@{ge-TX-Duration} * [[(@{ge-Character_Level} + @{ge-TX-masLevel})]] ]] Day(s)'>Days/Lvl</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_ge-TX-Duration" title="@{ge-TX-Duration}" style="width:150px"/>
                             </td>
@@ -3317,7 +3323,7 @@
         </tr>
         <tr>                  
             <td><button type="roll" class="sheet-btn" name="roll_ID_Ninjutsu" value="/e rolls Ninjutsu ID [[1d20+@{ID_Ninjutsu}]]" >ID</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_ID_Ninjutsu" value="[[@{ID_Ninjutsu-ability}+@{ID_Ninjutsu-Ranks}+@{ID_Ninjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_ID_Ninjutsu" value="[[@{ID_Ninjutsu-ability}+@{ID_Ninjutsu-Ranks}+@{ID_Ninjutsu-Blood}+@{ID_Ninjutsu-Occu}+@{ID_Ninjutsu-Talents}+@{ID_Ninjutsu-Feats}+@{ID_Ninjutsu-Synergy}+@{ID_Ninjutsu-Items}+@{ID_Ninjutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_ID_Ninjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -3331,14 +3337,15 @@
             <td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Ranks" value="@{Ninjutsu-Ranks}" disabled='true'/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Blood" value="0"/></td>
 		   	<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Occu" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Talents" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Feats" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Syn" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Synergy" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Items" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Misc" value="0" /></td>
         </tr>
 		<tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Ninjutsu" value="/e rolls Ninjutsu Learn [[1d20+@{Learn_Ninjutsu}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Ninjutsu" value="[[@{Learn_Ninjutsu-ability}+@{Learn_Ninjutsu-Ranks}+@{Learn_Ninjutsu-Blood}+@{Learn_Ninjutsu-Occu}+@{Learn_Ninjutsu-Feats}+@{Learn_Ninjutsu-Synergy}+@{Learn_Ninjutsu-Items}+@{Learn_Ninjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Ninjutsu" value="[[@{Learn_Ninjutsu-ability}+@{Learn_Ninjutsu-Ranks}+@{Learn_Ninjutsu-Blood}+@{Learn_Ninjutsu-Occu}+@{Learn_Ninjutsu-Talents}+@{Learn_Ninjutsu-Feats}+@{Learn_Ninjutsu-Synergy}+@{Learn_Ninjutsu-Items}+@{Learn_Ninjutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Ninjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -3352,6 +3359,7 @@
             <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Ranks" value="@{Ninjutsu-Ranks}" disabled='true'/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Blood" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Occu" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Talents" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Feats" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Synergy" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Items" value="0"/></td>
@@ -3413,11 +3421,11 @@
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include5" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include5" value="{{Range= @{ni-TX-Ranni-Opt}}}" /><span></span></th>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include5" value="{{Range= @{ni-TX-Range-Opt}}}" /><span></span></th>
                             <th class="sheet-heading">Range</th>
                             <div name="attr_ni-TX-Range"></div>
                             <td>
-                                <select class="sheet-number" name="attr_ni-TX-Ranni-Opt" title="@{ni-TX-Ranni-Opt}" style="width:50px">
+                                <select class="sheet-number" name="attr_ni-TX-Range-Opt" title="@{ni-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
                                     <option value='[[@{ni-TX-Range} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
                                     <option value='[[10 + (5*(0.5 * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] ft.'>Close</option>
@@ -3448,16 +3456,16 @@
                                 <select class="sheet-number" name="attr_ni-TX-Duration-Opt" title="@{ni-TX-Duration-Opt}" style="width:50px">
                                     <option value='Instantaneous' selected>Instantaneous</option>
                                     <option value='Concentration'>Concentration</option>
-                                    <option value='Concentration + @{ni-TX-Duration}'>Concentration+Rounds</option>
+                                    <option value='Concentration + @{ni-TX-Duration} Rounds'>Concentration+Rounds</option>
                                     <option value='Permanent'>Permanent</option>
                                     <option value='@{ni-TX-Duration} Round(s)'>Rounds</option>
-                                    <option value='[[@{ni-TX-Duration} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ]] Round(s)'>Rounds/Lvl</option>
+                                    <option value='[[@{ni-TX-Duration} * [[(@{ni-Character_Level} + @{ni-TX-masLevel})]] ]] Round(s)'>Rounds/Lvl</option>
                                     <option value='@{ni-TX-Duration} Minute(s)'>Minutes</option>
-                                    <option value='[[@{ni-TX-Duration} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] Minute(s)'>Minutes/Lvl</option>
+                                    <option value='[[@{ni-TX-Duration} * [[(@{ni-Character_Level} + @{ni-TX-masLevel})]] ]] Minute(s)'>Minutes/Lvl</option>
                                     <option value='@{ni-TX-Duration} Hour(s)'>Hours</option>
-                                    <option value='[[@{ni-TX-Duration} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] Hour(s)'>Hours/Lvl</option>
+                                    <option value='[[@{ni-TX-Duration} * [[(@{ni-Character_Level} + @{ni-TX-masLevel})]] ]] Hour(s)'>Hours/Lvl</option>
                                     <option value='@{ni-TX-Duration} Day(s)'>Days</option>
-                                    <option value='[[@{ni-TX-Duration} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] Day(s)'>Days/Lvl</option>
+                                    <option value='[[@{ni-TX-Duration} * [[(@{ni-Character_Level} + @{ni-TX-masLevel})]] ]] Day(s)'>Days/Lvl</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_ni-TX-Duration" title="@{ni-TX-Duration}" style="width:150px"/>
                             </td>
@@ -3561,11 +3569,11 @@
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include5" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include5" value="{{Range= @{ni-TX-Ranni-Opt}}}" /><span></span></th>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include5" value="{{Range= @{ni-TX-Range-Opt}}}" /><span></span></th>
                             <th class="sheet-heading">Range</th>
                             <div name="attr_ni-TX-Range"></div>
                             <td>
-                                <select class="sheet-number" name="attr_TX-Ranni-Opt" title="@{ni-TX-Ranni-Opt}" style="width:50px">
+                                <select class="sheet-number" name="attr_TX-Range-Opt" title="@{ni-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
                                     <option value='[[@{ni-TX-Range} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
                                     <option value='[[10 + (5*(0.5 * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] ft.'>Close</option>
@@ -3596,16 +3604,16 @@
                                 <select class="sheet-number" name="attr_ni-TX-Duration-Opt" title="@{ni-TX-Duration-Opt}" style="width:50px">
                                     <option value='Instantaneous' selected>Instantaneous</option>
                                     <option value='Concentration'>Concentration</option>
-                                    <option value='Concentration + @{ni-TX-Duration}'>Concentration+Rounds</option>
+                                    <option value='Concentration + @{ni-TX-Duration} Rounds'>Concentration+Rounds</option>
                                     <option value='Permanent'>Permanent</option>
                                     <option value='@{ni-TX-Duration} Round(s)'>Rounds</option>
-                                    <option value='[[@{ni-TX-Duration} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ]] Round(s)'>Rounds/Lvl</option>
+                                    <option value='[[@{ni-TX-Duration} * [[(@{ni-Character_Level} + @{ni-TX-masLevel})]] ]] Round(s)'>Rounds/Lvl</option>
                                     <option value='@{ni-TX-Duration} Minute(s)'>Minutes</option>
-                                    <option value='[[@{ni-TX-Duration} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] Minute(s)'>Minutes/Lvl</option>
+                                    <option value='[[@{ni-TX-Duration} * [[(@{ni-Character_Level} + @{ni-TX-masLevel})]] ]] Minute(s)'>Minutes/Lvl</option>
                                     <option value='@{ni-TX-Duration} Hour(s)'>Hours</option>
-                                    <option value='[[@{ni-TX-Duration} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] Hour(s)'>Hours/Lvl</option>
+                                    <option value='[[@{ni-TX-Duration} * [[(@{ni-Character_Level} + @{ni-TX-masLevel})]] ]] Hour(s)'>Hours/Lvl</option>
                                     <option value='@{ni-TX-Duration} Day(s)'>Days</option>
-                                    <option value='[[@{ni-TX-Duration} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] Day(s)'>Days/Lvl</option>
+                                    <option value='[[@{ni-TX-Duration} * [[(@{ni-Character_Level} + @{ni-TX-masLevel})]] ]] Day(s)'>Days/Lvl</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_ni-TX-Duration" title="@{ni-TX-Duration}" style="width:150px"/>
                             </td>
@@ -3703,7 +3711,7 @@
         </tr>
         <tr>                  
             <td><button type="roll" class="sheet-btn" name="roll_ID_Taijutsu" value="/e rolls Taijutsu ID [[1d20+@{ID_Taijutsu}]]" >ID</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_ID_Taijutsu" value="[[@{ID_Taijutsu-ability}+@{ID_Taijutsu-Ranks}+@{ID_Taijutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_ID_Taijutsu" value="[[@{ID_Taijutsu-ability}+@{ID_Taijutsu-Ranks}+@{ID_Taijutsu-Blood}+@{ID_Taijutsu-Occu}+@{ID_Taijutsu-Talents}+@{ID_Taijutsu-Feats}+@{ID_Taijutsu-Synergy}+@{ID_Taijutsu-Items}+@{ID_Taijutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_ID_Taijutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}"selected>Str</option>
@@ -3717,14 +3725,15 @@
             <td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Ranks" value="@{Taijutsu-Ranks}" disabled='true'/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Blood" value="0"/></td>
 		   	<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Occu" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Talents" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Feats" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Syn" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Synergy" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Items" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Misc" value="0" /></td>
         </tr>
 		<tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Taijutsu" value="/e rolls Taijutsu Learn [[1d20+@{Learn_Taijutsu}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Taijutsu" value="[[@{Learn_Taijutsu-ability}+@{Learn_Taijutsu-Ranks}+@{Learn_Taijutsu-Blood}+@{Learn_Taijutsu-Occu}+@{Learn_Taijutsu-Feats}+@{Learn_Taijutsu-Synergy}+@{Learn_Taijutsu-Items}+@{Learn_Taijutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Taijutsu" value="[[@{Learn_Taijutsu-ability}+@{Learn_Taijutsu-Ranks}+@{Learn_Taijutsu-Blood}+@{Learn_Taijutsu-Occu}+@{Learn_Taijutsu-Talents}+@{Learn_Taijutsu-Feats}+@{Learn_Taijutsu-Synergy}+@{Learn_Taijutsu-Items}+@{Learn_Taijutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Taijutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}"selected>Str</option>
@@ -3738,6 +3747,7 @@
             <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Ranks" value="@{Taijutsu-Ranks}" disabled='true'/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Blood" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Occu" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Talents" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Feats" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Synergy" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Items" value="0"/></td>
@@ -3834,16 +3844,16 @@
                                 <select class="sheet-number" name="attr_ta-TX-Duration-Opt" title="@{ta-TX-Duration-Opt}" style="width:50px">
                                     <option value='Instantaneous' selected>Instantaneous</option>
                                     <option value='Concentration'>Concentration</option>
-                                    <option value='Concentration + @{ta-TX-Duration}'>Concentration+Rounds</option>
+                                    <option value='Concentration + @{ta-TX-Duration} Rounds'>Concentration+Rounds</option>
                                     <option value='Permanent'>Permanent</option>
                                     <option value='@{ta-TX-Duration} Round(s)'>Rounds</option>
-                                    <option value='[[@{ta-TX-Duration} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ]] Round(s)'>Rounds/Lvl</option>
+                                    <option value='[[@{ta-TX-Duration} * [[(@{ta-Character_Level} + @{ta-TX-masLevel})]] ]] Round(s)'>Rounds/Lvl</option>
                                     <option value='@{ta-TX-Duration} Minute(s)'>Minutes</option>
-                                    <option value='[[@{ta-TX-Duration} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] Minute(s)'>Minutes/Lvl</option>
+                                    <option value='[[@{ta-TX-Duration} * [[(@{ta-Character_Level} + @{ta-TX-masLevel})]] ]] Minute(s)'>Minutes/Lvl</option>
                                     <option value='@{ta-TX-Duration} Hour(s)'>Hours</option>
-                                    <option value='[[@{ta-TX-Duration} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] Hour(s)'>Hours/Lvl</option>
+                                    <option value='[[@{ta-TX-Duration} * [[(@{ta-Character_Level} + @{ta-TX-masLevel})]] ]] Hour(s)'>Hours/Lvl</option>
                                     <option value='@{ta-TX-Duration} Day(s)'>Days</option>
-                                    <option value='[[@{ta-TX-Duration} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] Day(s)'>Days/Lvl</option>
+                                    <option value='[[@{ta-TX-Duration} * [[(@{ta-Character_Level} + @{ta-TX-masLevel})]] ]] Day(s)'>Days/Lvl</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_ta-TX-Duration" title="@{ta-TX-Duration}" style="width:150px"/>
                             </td>
@@ -3982,16 +3992,16 @@
                                 <select class="sheet-number" name="attr_ta-TX-Duration-Opt" title="@{ta-TX-Duration-Opt}" style="width:50px">
                                     <option value='Instantaneous' selected>Instantaneous</option>
                                     <option value='Concentration'>Concentration</option>
-                                    <option value='Concentration + @{ta-TX-Duration}'>Concentration+Rounds</option>
+                                    <option value='Concentration + @{ta-TX-Duration} Rounds'>Concentration+Rounds</option>
                                     <option value='Permanent'>Permanent</option>
                                     <option value='@{ta-TX-Duration} Round(s)'>Rounds</option>
-                                    <option value='[[@{ta-TX-Duration} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ]] Round(s)'>Rounds/Lvl</option>
+                                    <option value='[[@{ta-TX-Duration} * [[(@{ta-Character_Level} + @{ta-TX-masLevel})]] ]] Round(s)'>Rounds/Lvl</option>
                                     <option value='@{ta-TX-Duration} Minute(s)'>Minutes</option>
-                                    <option value='[[@{ta-TX-Duration} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] Minute(s)'>Minutes/Lvl</option>
+                                    <option value='[[@{ta-TX-Duration} * [[(@{ta-Character_Level} + @{ta-TX-masLevel})]] ]] Minute(s)'>Minutes/Lvl</option>
                                     <option value='@{ta-TX-Duration} Hour(s)'>Hours</option>
-                                    <option value='[[@{ta-TX-Duration} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] Hour(s)'>Hours/Lvl</option>
+                                    <option value='[[@{ta-TX-Duration} * [[(@{ta-Character_Level} + @{ta-TX-masLevel})]] ]] Hour(s)'>Hours/Lvl</option>
                                     <option value='@{ta-TX-Duration} Day(s)'>Days</option>
-                                    <option value='[[@{ta-TX-Duration} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] Day(s)'>Days/Lvl</option>
+                                    <option value='[[@{ta-TX-Duration} * [[(@{ta-Character_Level} + @{ta-TX-masLevel})]] ]] Day(s)'>Days/Lvl</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_ta-TX-Duration" title="@{ta-TX-Duration}" style="width:150px"/>
                             </td>