From 102a7cb6cd79749030bd76bf26edc651e241f22b Mon Sep 17 00:00:00 2001
From: Toby <toby.scandling@gmail.com>
Date: Wed, 13 Jan 2021 13:28:58 +0000
Subject: [PATCH] Fixed several skill bugs

---
 Dragon Ball Universe/DragonBallV2.css  |   8 +-
 Dragon Ball Universe/DragonBallV2.html | 100 ++++++++++++++-----------
 2 files changed, 64 insertions(+), 44 deletions(-)

diff --git a/Dragon Ball Universe/DragonBallV2.css b/Dragon Ball Universe/DragonBallV2.css
index ce2c76491e..ee36e0c38a 100644
--- a/Dragon Ball Universe/DragonBallV2.css	
+++ b/Dragon Ball Universe/DragonBallV2.css	
@@ -187,7 +187,11 @@ button[type="roll"].sheet-attack-button{
     grid-area: ccol1;
     justify-content: center;
 }
-
+.sheet-saves{
+    display: grid;
+    grid-template-areas: 
+    'save1 save2 save3 save4';
+}
 .sheet-custom-attack-table{
     display: grid;
     border: 2px solid rgb(156, 155, 155);
@@ -306,7 +310,7 @@ button[type="roll"].sheet-attack-button{
 
 .sheet-attacks{
     background-image: url(https://i.pinimg.com/564x/cf/db/99/cfdb99728dfe48c17957810e9c65f23a.jpg);
-    background-position: center top;
+    background-position: center;
     background-repeat: no-repeat;
     background-color: rgb(38, 44, 58);
     text-align: center;
diff --git a/Dragon Ball Universe/DragonBallV2.html b/Dragon Ball Universe/DragonBallV2.html
index c454a2d903..5f486e02ab 100644
--- a/Dragon Ball Universe/DragonBallV2.html	
+++ b/Dragon Ball Universe/DragonBallV2.html	
@@ -35,7 +35,23 @@
                             if(!changed){
                                 if(pl<5){
                                     setAttrs({
-                                        "hidden_power":"0"
+                                        "hidden_power":"1d0"
+                                    });
+                                }else if(pl<10){
+                                    setAttrs({
+                                        "hidden_power":"1d4"
+                                    });
+                                }else if(pl<15){
+                                    setAttrs({
+                                        "hidden_power":"1d6"
+                                    });
+                                }else if(pl<20){
+                                    setAttrs({
+                                        "hidden_power":"1d8"
+                                    });
+                                }else if(pl<25){
+                                    setAttrs({
+                                        "hidden_power":"1d10"
                                     });
                                 };
                             };
@@ -264,7 +280,7 @@
             </div>
             
             <div class="attr-bot">
-                <div><label>Ki Pool:  <input type="number" name="attr_ki" value="26" /> / <input type="number" name="attr_ki_max" value="26+12*(@{power_level}-1)" disabled="true" /> </label></div>
+                <div><label>Ki Pool:  <input type="number" name="attr_ki" value="26" /> / <input type="number" name="attr_ki_max" value="26+12*(@{power_level}-1)"/> </label></div>
                 <div><label>Capacity Rate: <input type="checkbox" name="attr_power_up" value="0.25"/>  <input type="number" name="attr_capacity" value="12"/> / <input type="number" name="attr_influx_max" value="12+8*(@{power_level}-1)+floor(@{power_up}*(12+8*(@{power_level}-1)))" disabled="true" /></label></div>
                 <div><label>Zeni: <input type="number" name="attr_zeni" value="0"/></label></div>
                 <div><label>XP: <input type="number" name="attr_xp" value = "0"/> </label></div>
@@ -342,30 +358,30 @@
             </div>
 
             <div class="skill1">
-                <div><label class="skill-label">Acrobatics (Agi): <input type="number" name="attr_acrobatics" value="0"/><button class="skill" type="roll" name="roll_agility" value="/r 1d10!10+@{agility_modifier}+@{acrobatics}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Athletics (Str): <input type="number" name="attr_athletics" value="0"/><button class="skill" type="roll" name="roll_strength" value="/r 1d10!10+@{strength_modifier}+@{athletics}+@{hidden_power}"></button></label></div>
-                <div><label class="skill-label">Bluff (Per): <input type="number" name="attr_bluff" value="0"/><button class="skill" type="roll" name="roll_bluff" value="/r 1d10!10+@{personality_modifier}+@{bluff}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Clairvoyant (Spi): <input type="number" name="attr_clairvoyant" value="0"/><button class="skill" type="roll" name="roll_clairvoyant" value="/r 1d10!10+@{spirit_modifier}+@{clairvoyant}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Concealment (Agi): <input type="number" name="attr_concealment" value="0"/><button class="skill" type="roll" name="roll_concealment" value="/r 1d10!10+@{spirit_modifier}+@{concealment}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Craft (Sch): <input type="number" name="attr_craft" value="0"/><button class="skill" type="roll" name="roll_craft" value="/r 1d10!10+@{scholarship_modifier}+@{craft}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Creature Handling (Ins): <input type="number" name="attr_creature_handling" value="0"/><button class="skill" type="roll" name="roll_creature_handling" value="/r 1d10!10+@{insight_modifier}+@{creature_handling}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Intimidate (Per): <input type="number" name="attr_intimidate" value="0"/><button class="skill" type="roll" name="roll_intimidate" value="/r 1d10!10+@{personality_modifier}+@{intimidate}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Investigation (Sch): <input type="number" name="attr_investigation" value="0"/><button class="skill" type="roll" name="roll_investigation" value="/r 1d10!10+@{scholarship_modifier}+@{investigation}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Knowledge (Sch): <input type="number" name="attr_knowledge" value="0"/><button class="skill" type="roll" name="roll_knowledge" value="/r 1d10!10+@{scholarship_modifier}+@{knowledge}+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Acrobatics (Agi): <input type="number" name="attr_acrobatics" value="0"/><button class="skill" type="roll" name="roll_agility" value="/r 1d10!10+@{agility_modifier}+@{acrobatics}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Athletics (Str): <input type="number" name="attr_athletics" value="0"/><button class="skill" type="roll" name="roll_strength" value="/r 1d10!10+@{strength_modifier}+@{athletics}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></button></label></div>
+                <div><label class="skill-label">Bluff (Per): <input type="number" name="attr_bluff" value="0"/><button class="skill" type="roll" name="roll_bluff" value="/r 1d10!10+@{personality_modifier}+@{bluff}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Clairvoyant (Spi): <input type="number" name="attr_clairvoyant" value="0"/><button class="skill" type="roll" name="roll_clairvoyant" value="/r 1d10!10+@{spirit_modifier}+floor(@{scholarship_modifier}/2)+@{clairvoyant}+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Concealment (Spi): <input type="number" name="attr_concealment" value="0"/><button class="skill" type="roll" name="roll_concealment" value="/r 1d10!10+@{spirit_modifier}+@{concealment}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Craft (Sch): <input type="number" name="attr_craft" value="0"/><button class="skill" type="roll" name="roll_craft" value="/r 1d10!10+@{scholarship_modifier}+@{craft}+floor(@{scholarship_modifier})+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Creature Handling (Ins): <input type="number" name="attr_creature_handling" value="0"/><button class="skill" type="roll" name="roll_creature_handling" value="/r 1d10!10+@{insight_modifier}+@{creature_handling}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Intimidate (Per): <input type="number" name="attr_intimidate" value="0"/><button class="skill" type="roll" name="roll_intimidate" value="/r 1d10!10+@{personality_modifier}+@{intimidate}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Investigation (Sch): <input type="number" name="attr_investigation" value="0"/><button class="skill" type="roll" name="roll_investigation" value="/r 1d10!10+@{scholarship_modifier}+@{investigation}+floor(@{scholarship_modifier})+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Knowledge (Sch): <input type="number" name="attr_knowledge" value="0"/><button class="skill" type="roll" name="roll_knowledge" value="/r 1d10!10+@{scholarship_modifier}+@{knowledge}+floor(@{scholarship_modifier})+@{hidden_power}"></label></div>
             </div>
 
             <div class="skill2">
-                <div><label class="skill-label">Medicine (Sch): <input type="number" name="attr_medicine" value="0"/><button class="skill" type="roll" name="roll_medicine" value="/r 1d10!10+@{scholarship_modifier}+@{medicine}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Perception (Ins): <input type="number" name="attr_perception" value="0"/><button class="skill" type="roll" name="roll_perception" value="/r 1d10!10+@{insight_modifier}+@{perception}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Performance (Per): <input type="number" name="attr_performance" value="0"/><button class="skill" type="roll" name="roll_performance" value="/r 1d10!10+@{personality_modifier}+@{performance}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Persuasion (Per): <input type="number" name="attr_persuasion" value="0"/><button class="skill" type="roll" name="roll_persuasion" value="/r 1d10!10+@{personality_modifier}+@{persuasion}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Pilot (Agi): <input type="number" name="attr_pilot" value="0"/><button class="skill" type="roll" name="roll_pilot" value="/r 1d10!10+@{agility_modifier}+@{pilot}+@{hidden_power}"></button></label></div>
-                <div><label class="skill-label">Profession (Sch): <input type="number" name="attr_profession" value="0"/><button class="skill" type="roll" name="roll_profession" value="/r 1d10!10+@{scholarship_modifier}+@{profession}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Science (Sch): <input type="number" name="attr_science" value="0"/><button class="skill" type="roll" name="roll_science" value="/r 1d10!10+@{scholarship_modifier}+@{science}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Stealth (Agi): <input type="number" name="attr_stealth" value="0"/><button class="skill" type="roll" name="roll_stealth" value="/r 1d10!10+@{agility_modifier}+@{stealth}+@{hidden_power}"></button></label></div>
-                <div><label class="skill-label">Survival (Ins): <input type="number" name="attr_survival" value="0"/><button class="skill" type="roll" name="roll_survival" value="/r 1d10!10+@{insight_modifier}+@{survival}+@{hidden_power}"></label></div>
-                <div><label class="skill-label">Thievery (Agi): <input type="number" name="attr_thievery" value="0"/><button class="skill" type="roll" name="roll_thievery" value="/r 1d10!10+@{agility_modifier}+@{thievery}+@{hidden_power}"></button></label></div>
-                <div><label class="skill-label">Use Magic (Spi): <input type="number" name="attr_use_magic" value="0"/><button class="skill" type="roll" name="roll_use_magic" value="/r 1d10!10+@{spirit_modifier}+@{use_nagic}+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Medicine (Sch): <input type="number" name="attr_medicine" value="0"/><button class="skill" type="roll" name="roll_medicine" value="/r 1d10!10+@{scholarship_modifier}+@{medicine}+floor(@{scholarship_modifier})+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Perception (Ins): <input type="number" name="attr_perception" value="0"/><button class="skill" type="roll" name="roll_perception" value="/r 1d10!10+@{insight_modifier}+@{perception}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Performance (Per): <input type="number" name="attr_performance" value="0"/><button class="skill" type="roll" name="roll_performance" value="/r 1d10!10+@{personality_modifier}+@{performance}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Persuasion (Per): <input type="number" name="attr_persuasion" value="0"/><button class="skill" type="roll" name="roll_persuasion" value="/r 1d10!10+@{personality_modifier}+@{persuasion}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Pilot (Agi): <input type="number" name="attr_pilot" value="0"/><button class="skill" type="roll" name="roll_pilot" value="/r 1d10!10+@{agility_modifier}+@{pilot}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></button></label></div>
+                <div><label class="skill-label">Profession (Sch): <input type="number" name="attr_profession" value="0"/><button class="skill" type="roll" name="roll_profession" value="/r 1d10!10+@{scholarship_modifier}+@{profession}+floor(@{scholarship_modifier})+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Science (Sch): <input type="number" name="attr_science" value="0"/><button class="skill" type="roll" name="roll_science" value="/r 1d10!10+@{scholarship_modifier}+@{science}+floor(@{scholarship_modifier})+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Stealth (Agi): <input type="number" name="attr_stealth" value="0"/><button class="skill" type="roll" name="roll_stealth" value="/r 1d10!10+@{agility_modifier}+@{stealth)+floor(@{scholarship_modifier}/2)}+@{hidden_power}"></button></label></div>
+                <div><label class="skill-label">Survival (Ins): <input type="number" name="attr_survival" value="0"/><button class="skill" type="roll" name="roll_survival" value="/r 1d10!10+@{insight_modifier}+@{survival}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></label></div>
+                <div><label class="skill-label">Thievery (Agi): <input type="number" name="attr_thievery" value="0"/><button class="skill" type="roll" name="roll_thievery" value="/r 1d10!10+@{agility_modifier}+@{thievery}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></button></label></div>
+                <div><label class="skill-label">Use Magic (Spi): <input type="number" name="attr_use_magic" value="0"/><button class="skill" type="roll" name="roll_use_magic" value="/r 1d10!10+@{spirit_modifier}+@{use_magic}+floor(@{scholarship_modifier}/2)+@{hidden_power}"></label></div>
             </div>
             
         </div>
@@ -381,7 +397,8 @@
     <h2 style="color: rgb(185, 102, 0);">Soak <input type="number" name="attr_soak" value="0"/>/<input type="number" name="attr_soak_max" value="@{hidden_soak}+@{soak_modifier}"  disabled> Modifier: <input type="number" name="attr_soak_modifier" value="0"/></h2>
     <h2 style="color: rgb(185, 102, 0);">Dodge <input type="number" name="attr_dodge_modifier" value="0"/><button class="attack-button" type="roll" name="roll_dodge" value="/r 1d10!10+@{dodge_modifier}+@{agility_modifier}"></button></h2>
     <input type="hidden" name="attr_hidden_soak" value="0">
-    <div><h2 style="color: rgb(185, 102, 0);">Hit Modifier: <input type="number" name="attr_global_hit" value="0"></h2><h2 style="color: rgb(185, 102, 0);">Wound Modifier: <input type="number" name="attr_global_wound" value="0"></h2></div>
+    <div style="display: flex;"><h2 style="color: rgb(185, 102, 0);">Hit Modifier: <input type="number" name="attr_global_hit" value="0"></h2><h2 style="color: rgb(185, 102, 0);">Wound Modifier: <input type="number" name="attr_global_wound" value="0"></h2></div>
+    <div class="saves"><label style="color: rgb(185, 102, 0); grid-area: save1;">Cognitive save: <button class="attack-button" type="roll" name="roll_cognitive" value="/r 1d10!10+@{insight_modifier}"></button></label><label style="color: rgb(185, 102, 0); grid-area: save2;">Corporeal Save: <button class="attack-button" type="roll" name="roll_corporeal" value="/r 1d10!10+@{tenacity_modifier}"></button></label><label style="color: rgb(185, 102, 0); grid-area: save3;">Impulsive Save: <button class="attack-button" type="roll" name="roll_impulsive" value="/r 1d10!10+@{agility_modifier}"></button></label><label style="color: rgb(185, 102, 0); grid-area: save4;">Morale Save: <button class="attack-button" type="roll" name="roll_morale" value="/r 1d10!10+@{personality_modifier}"></button></label></div>
     <script type="text/worker">
         on("change:tenacity, sheet:opened", function(){
             getAttrs(["TENACITY_MODIFIER"], function(values){
@@ -389,7 +406,6 @@
                 if(ten == 1){
                     setAttrs({
                         "hidden_soak":2
-                    });
                 }else{
                     setAttrs({
                         "hidden_soak":ten
@@ -402,18 +418,18 @@
     <div class="basic-attack">
         <div class="basic-attacks-col1">
             <h2 style="color: rgb(202, 111, 0); border: 1px solid rgb(156, 155, 155);">Name:</h2>
-            <div class="basic-attacks-row"><input type="text" value="Basic Physical" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_physical" value="/em swings a kick at the enemy for [[@{basic_physical_hit}d10!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_physical_wound}d10!10+@{strength_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_physical_ki} ki"></button></div>
-            <div class="basic-attacks-row"><input type="text" value="Sphere Energy Attack" style="width: 100px;" disabled><button class="attack-button" type="roll" name="roll_basic_sphere" value="/em hurls a sphere of energy for [[@{basic_sphere_hit}d10!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_sphere_wound}d10!10+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_sphere_ki} ki"></button></div>
-            <div class="basic-attacks-row"><input type="text" value="Incantation" style="width: 100px;" disabled><button class="attack-button" type="roll" name="roll_basic_incantation" value="/em casts an incantation for [[@{basic_incantation_hit}d10!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_incantation_wound}d10!10+@{spirit_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_incantation_ki} ki"></button></div>
-            <div class="basic-attacks-row"><input type="text" value="Rapid Fire" style="width: 100px;" disabled><button class="attack-button" type="roll" name="roll_basic_rapid" value="/em fires several energy attacks for [[@{basic_rapid_hit}d10!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}+@{global_hit}]], dealing [[(@{basic_rapid_wound}d10!10)*2+@{hidden_power}+@{global_wound}]] and costing @{basic_rapid_ki} ki"></button></div>
-            <div class="basic-attacks-row"><input type="text" value="Guided" style="width: 100px;" disabled><button class="attack-button" type="roll" name="roll_basic_guided" value="/em a guided blast for [[@{basic_guided_hit}d10!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}+@{global_hit}]] or [[(@{basic_guided_hit}d10!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}+@{global_hit})/2]], dealing [[@{basic_guided_wound}d10!10+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_guided_ki} ki"></button></div>
-            <div class="basic-attacks-row"><input type="text" value="Kiai" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_kiai" value="/em fires an kiai blast for [[@{basic_kiai_hit}d10d1!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_kiai_wound}d10d1!10+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_kiai_ki} ki"></button></div>
-            <div class="basic-attacks-row"><input type="text" value="Energy Focus" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_focus" value="/em focuses their ki into a weapon and strikes for [[@{basic_focus_hit}d10!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_focus_wound}d10!10+@{strength_modifier}+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_focus_ki} ki"></button></div>
-            <div class="basic-attacks-row"><input type="text" value="Blast" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_blast" value="/em fires a blast of energy in front of them, 3 feet wide and 3 feet long for [[@{basic_blast_hit}d10!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}@{global_hit}]], dealing [[@{basic_blast_wound}d10!10+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_blast_ki} ki"></button></div>
-            <div class="basic-attacks-row"><input type="text" value="Explosion" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_explosion" value="/em fires off an explosion measuring 3 feet by 3 feet for [[@{basic_explosion_hit}d10!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}@{global_hit}]], dealing [[@{basic_explosion_wound}d10!10+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_explosion_ki} ki"></button></div>
-            <div class="basic-attacks-row"><input type="text" value="Beam" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_beam" value="/em fires a beam of energy, impeding its target, for [[@{basic_beam_hit}d10!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_beam_wound}d10!10+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_beam_ki} ki"></button></div>
-            <div class="basic-attacks-row"><input type="text" value="Combination" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_combination" value="/em attcks with a flurry of blows for [[@{basic_combination_hit}d10!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_combination_wound}d10!10+@{hidden_power}+@{global_wound}]] and costing @{basic_combination_ki} ki"></button></div>
-            <div class="basic-attacks-row"><input type="text" value="Powered" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_powered" value="/em empowers themselves with ki energy and strikes for [[@{basic_powered_hit}d10!10+@{hidden_power}+@{agility_modifier}+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_powered_wound}d10!10+@{strength_modifier}+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_powered_ki} ki"></button></div>
+            <div class="basic-attacks-row"><input type="text" value="Basic Physical" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_physical" value="/em swings a kick at the enemy for [[@{basic_physical_hit}d10!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_physical_wound}d10!10+@{strength_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_physical_ki} ki"></button></div>
+            <div class="basic-attacks-row"><input type="text" value="Sphere Energy Attack" style="width: 100px;" disabled><button class="attack-button" type="roll" name="roll_basic_sphere" value="/em hurls a sphere of energy for [[@{basic_sphere_hit}d10!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_sphere_wound}d10!10+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_sphere_ki} ki"></button></div>
+            <div class="basic-attacks-row"><input type="text" value="Incantation" style="width: 100px;" disabled><button class="attack-button" type="roll" name="roll_basic_incantation" value="/em casts an incantation for [[@{basic_incantation_hit}d10!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_incantation_wound}d10!10+@{spirit_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_incantation_ki} ki"></button></div>
+            <div class="basic-attacks-row"><input type="text" value="Rapid Fire" style="width: 100px;" disabled><button class="attack-button" type="roll" name="roll_basic_rapid" value="/em fires several energy attacks for [[@{basic_rapid_hit}d10!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}+@{global_hit}]], dealing [[(@{basic_rapid_wound}d10!10)*2+@{hidden_power}+@{global_wound}]] and costing @{basic_rapid_ki} ki"></button></div>
+            <div class="basic-attacks-row"><input type="text" value="Guided" style="width: 100px;" disabled><button class="attack-button" type="roll" name="roll_basic_guided" value="/em a guided blast for [[@{basic_guided_hit}d10!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}+@{global_hit}]] or [[(@{basic_guided_hit}d10!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}+@{global_hit})/2]], dealing [[@{basic_guided_wound}d10!10+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_guided_ki} ki"></button></div>
+            <div class="basic-attacks-row"><input type="text" value="Kiai" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_kiai" value="/em fires an kiai blast for [[@{basic_kiai_hit}d10d1!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_kiai_wound}d10d1!10+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_kiai_ki} ki"></button></div>
+            <div class="basic-attacks-row"><input type="text" value="Energy Focus" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_focus" value="/em focuses their ki into a weapon and strikes for [[@{basic_focus_hit}d10!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_focus_wound}d10!10+@{strength_modifier}+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_focus_ki} ki"></button></div>
+            <div class="basic-attacks-row"><input type="text" value="Blast" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_blast" value="/em fires a blast of energy in front of them, 3 feet wide and 3 feet long for [[@{basic_blast_hit}d10!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}@{global_hit}]], dealing [[@{basic_blast_wound}d10!10+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_blast_ki} ki"></button></div>
+            <div class="basic-attacks-row"><input type="text" value="Explosion" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_explosion" value="/em fires off an explosion measuring 3 feet by 3 feet for [[@{basic_explosion_hit}d10!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}@{global_hit}]], dealing [[@{basic_explosion_wound}d10!10+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_explosion_ki} ki"></button></div>
+            <div class="basic-attacks-row"><input type="text" value="Beam" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_beam" value="/em fires a beam of energy, impeding its target, for [[@{basic_beam_hit}d10!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_beam_wound}d10!10+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_beam_ki} ki"></button></div>
+            <div class="basic-attacks-row"><input type="text" value="Combination" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_combination" value="/em attcks with a flurry of blows for [[@{basic_combination_hit}d10!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_combination_wound}d10!10+@{hidden_power}+@{global_wound}]] and costing @{basic_combination_ki} ki"></button></div>
+            <div class="basic-attacks-row"><input type="text" value="Powered" style="width: 100px;" disabled> <button class="attack-button" type="roll" name="roll_basic_powered" value="/em empowers themselves with ki energy and strikes for [[@{basic_powered_hit}d10!10+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}+@{global_hit}]], dealing [[@{basic_powered_wound}d10!10+@{strength_modifier}+@{potency_modifier}+@{hidden_power}+@{global_wound}]] and costing @{basic_powered_ki} ki"></button></div>
         </div>
         <div class="basic-attacks-col2">
             <h2 style="color: rgb(202, 111, 0); border: 1px solid rgb(156, 155, 155);">To Hit Die:</h2>
@@ -474,7 +490,7 @@
                 <h2 style="color:rgb(202, 111, 0); border: 1px solid rgb(156, 155, 155);">TP Cost:</h2>
             </div>
             <div class="custom-attacks-hcol4">
-                <h2 style="color:rgb(202, 111, 0); border: 1px solid rgb(156, 155, 155);">To Hit:</h2>
+                <h2 style="color:rgb(202, 111, 0); border: 1px solid rgb(156, 155, 155);">Roll:</h2>
             </div>
             <div class="custom-attacks-hcol5">
                 <h2 style="color:rgb(202, 111, 0); border: 1px solid rgb(156, 155, 155);">To Wound:</h2>
@@ -486,9 +502,9 @@
                 <div class="custom-attack-table">
                     <div class="ccol1"><input type="text" name="attr_custom_attack_name" style="width: 100px;"></div>
                     <div class="ccol2"><input type="number" name="attr_custom_attack_ki" value="0"></div>
-                    <div class="ccol3"><input type="number" name="attr_custom_attack_technique" value="0" ></div>
-                    <div class="ccol4"><input type="number" name="attr_custom_attack_hit" value="0"></div>
-                    <div class="ccol5"><input type="number" name="attr_custom_attack_wound" value="0"><button class="attack-button" type="roll" name="roll_custom_attack" value="/em @{custom_attack_name} for [[1d10!10+@{custom_attack_hit}+@{hidden_power}+@{agility_modifier}+@{insight_modifier}+@{global_hit}]], dealing [[1d10!10+@{custom_attack_wound}+?{What ability are you using?|Strength,@{strength_modifier} | Potency,@{potency_modifier} |Spirit,@{spirit_modifier} | Balistic, 0}+@{hidden_power}+@{global_wound}]] and costing @{custom_attack_ki} ki"></button></div>
+                    <div class="ccol3"><input type="number" name="attr_custom_attack_technique" value="0" ></div>  
+                    <div class="ccol4"><input type="text" name="attr_custom_attack_hit" value="0" style="width: 50px;"></div>
+                    <div class="ccol5"><input type="text" name="attr_custom_attack_wound" value="0" style="width: 50px;"><button class="attack-button" type="roll" name="roll_custom_attack" value="/em @{custom_attack_name} for [[@{custom_attack_hit}+@{hidden_power}+floor(@{agility_modifier}/2)+@{insight_modifier}+@{global_hit}]], dealing [[@{custom_attack_wound}+@{hidden_power}+@{global_wound}+?{What ability are you using?|Strength,@{strength_modifier} | Potency,@{potency_modifier} |Spirit,@{spirit_modifier} | Balistic, 0}+@{hidden_power}+@{global_wound}]] and costing @{custom_attack_ki} ki"></button></div>
                 </div>
             </fieldset>
         </div>
@@ -713,4 +729,4 @@
         });
     });
     */
-</script>
\ No newline at end of file
+</script>