Merge pull request #13231 from eGellman89/master

Table Top Defined - Bug Fixes
Roll20 · Aug 27, 2024 · 1eb3235 · 1eb3235
2 parents b3bb768 + b1049e1
commit 1eb3235
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 29 deletions.
diff --git a/Table Top Defined/Table_Top_Defined.css b/Table Top Defined/Table_Top_Defined.css
@@ -145,6 +145,7 @@
     text-align: center;
 }
 
+.sheet-rolltemplate-custom .sheet-key .inlinerollresult,
 .sheet-rolltemplate-custom .sheet-desc .inlinerollresult,
 .sheet-rolltemplate-custom .sheet-value .inlinerollresult{
     background-color: #f6efe4;
@@ -988,14 +989,30 @@ input.sptoggle[value="1"] ~ .sheet-repeating-fields{
 
 .minimizable-repeat-spells .spells_description .Details-2 {
     grid-area: Details-2;
-    justify-items: start;
     padding: 3px;
+    justify-items: start;
     text-align: left;
 }
+
+.minimizable-repeat-spells .spells_description .Details-2 .spellselect{
+    padding: 0;
+    border: 0;
+    text-align: center;
+    height: 18px;
+    width: 80px;
+    margin: 0;
+    justify-self: end;
+}
+
+
 .minimizable-repeat-spells .spells_description .Details-2 input{
     justify-self: end;
 }
 
+.minimizable-repeat-spells .spells_description .Details-2 select{
+    justify-self: end;
+}
+
 .minimizable-repeat-spells .spells_description .Details-2 input[type=checkbox]{
     float: right;
 }

diff --git a/Table Top Defined/Table_Top_Defined.html b/Table Top Defined/Table_Top_Defined.html
@@ -783,8 +783,8 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
          <div>
-          Success Effect:
-           <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+          <div style="float:left"><div style="float:left">On Success:</div></div>
+          <select name="attr_savesucces" class="spellselect">
             <option value="">None</option>
             <option value="; disbelief">Disbelief</option>
             <option value="; half">Half</option>
@@ -873,8 +873,8 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
          <div>
-          Success Effect:
-          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+          <div style="float:left">On Success:</div>
+         <select name="attr_savesucces" class="spellselect">
            <option value="">None</option>
            <option value="; disbelief">Disbelief</option>
            <option value="; half">Half</option>
@@ -963,8 +963,8 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
          <div>
-          Success Effect:
-          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+          <div style="float:left">On Success:</div>
+         <select name="attr_savesucces" class="spellselect">
            <option value="">None</option>
            <option value="; disbelief">Disbelief</option>
            <option value="; half">Half</option>
@@ -1053,8 +1053,8 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
          <div>
-          Success Effect:
-          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+          <div style="float:left">On Success:</div>
+         <select name="attr_savesucces" class="spellselect">
            <option value="">None</option>
            <option value="; disbelief">Disbelief</option>
            <option value="; half">Half</option>
@@ -1143,8 +1143,8 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
          <div>
-          Success Effect:
-          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+          <div style="float:left">On Success:</div>
+         <select name="attr_savesucces" class="spellselect">
            <option value="">None</option>
            <option value="; disbelief">Disbelief</option>
            <option value="; half">Half</option>
@@ -1235,8 +1235,8 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
          <div>
-          Success Effect:
-          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+          <div style="float:left">On Success:</div>
+         <select name="attr_savesucces" class="spellselect">
            <option value="">None</option>
            <option value="; disbelief">Disbelief</option>
            <option value="; half">Half</option>
@@ -1325,8 +1325,8 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
          <div>
-          Success Effect:
-          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+          <div style="float:left">On Success:</div>
+         <select name="attr_savesucces" class="spellselect">
            <option value="">None</option>
            <option value="; disbelief">Disbelief</option>
            <option value="; half">Half</option>
@@ -1415,8 +1415,8 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
          <div>
-          Success Effect:
-          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+          <div style="float:left">On Success:</div>
+         <select name="attr_savesucces" class="spellselect">
            <option value="">None</option>
            <option value="; disbelief">Disbelief</option>
            <option value="; half">Half</option>
@@ -1505,8 +1505,8 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
          <div>
-          Success Effect:
-          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+          <div style="float:left">On Success:</div>
+         <select name="attr_savesucces" class="spellselect">
            <option value="">None</option>
            <option value="; disbelief">Disbelief</option>
            <option value="; half">Half</option>
@@ -1595,8 +1595,8 @@ <h3 style="color:white">Spell Casting</h3>
          <div>Duration: <input type="text" name="attr_duration"/></div>
          <div>Dice Rolled:<span style="float: right; background-color: #FFFFFF"><input style="float:none" type="text" name="attr_dicenum" placeholder="#"><input style="float:none" type="text" name="attr_dicetype" placeholder="d#"></span></div>
          <div>
-          Success Effect:
-          <select name="attr_savesucces" class="fixed-select" style="width: 90px;">
+          <div style="float:left">On Success:</div>
+         <select name="attr_savesucces" class="spellselect">
            <option value="">None</option>
            <option value="; disbelief">Disbelief</option>
            <option value="; half">Half</option>
@@ -2368,15 +2368,15 @@ <h3 style="color:white">Spell Casting</h3>
         name="roll_weapondamage"
         value=
          "
-        &{template:custom}{{title=Damage}}{{subtitle= with @{character_name}'s @{weaponname} }} {{Deals [[(@{dnum}@{dtype})[Dice]+(@{weapontodamage})+(floor(@{weapontodamage}*@{twohanded}))[Key Ability]+(@{bonustodamage})[Feats]+@{enhancetoattack}[Magic]+(@{enchdamagedice}[Bonus])+(?{Do you have a miscellaneaous bonus to damage?|0})]] damage to their target.}}
+        &{template:custom}{{title=Damage}}{{subtitle= with @{character_name}'s @{weaponname} }} {{desc= Deals [[(@{dnum}@{dtype})[Dice]+(@{weapontodamage})+(floor(@{weapontodamage}*@{twohanded}))[Key Ability]+(@{bonustodamage})[Feats]+@{enhancetoattack}[Magic]+(@{enchdamagedice}[Bonus])+(?{Do you have a miscellaneaous bonus to damage?|0})]] damage to their target.}}
         "
        ></button></div>
        <div style="padding-bottom: 3px;" class="grc2 titleblock">Critical Damage:&nbsp;<button
         type="roll"
         name="roll_critweapondamage"
         value=
          "
-        &{template:custom}{{title=Damage}}{{subtitle= with @{character_name}'s @{weaponname} }} {{Deals an astonishing [[[[@{weaponcritmod}*@{dnum}]]@{dtype}[Dice]+(0@{weaponcritmod}*(@{weapontodamage}+(floor(0@{weapontodamage}*@{twohanded}))))[Key Ability]+(0@{weaponcritmod}*(@{bonustodamage}[Feats]+@{enhancetoattack}[Magic]+(?{Do you have a miscellaneaous bonus to damage?|0})))+(0@{enchdamagedice})+(0@{extraenchdicecrit})]] damage to their target.}}
+        &{template:custom}{{title=Damage}}{{subtitle= with @{character_name}'s @{weaponname} }} {{desc= Deals an astonishing [[[[@{weaponcritmod}*@{dnum}]]@{dtype}[Dice]+(0@{weaponcritmod}*(@{weapontodamage}+(floor(0@{weapontodamage}*@{twohanded}))))[Key Ability]+(0@{weaponcritmod}*(@{bonustodamage}[Feats]+@{enhancetoattack}[Magic]+(?{Do you have a miscellaneaous bonus to damage?|0})))+(0@{enchdamagedice})+(0@{extraenchdicecrit})]] damage to their target.}}
         "
        ></button></div>
       </div>
@@ -2541,15 +2541,15 @@ <h3 style="color:white">Spell Casting</h3>
         name="roll_weapondamage"
         value=
          "
-        &{template:custom}{{title=Damage}}{{subtitle= with @{character_name}'s @{weaponname} }} {{Deals [[(@{dnum}@{dtype})[Dice]+(@{weapontodamage})+(floor(@{weapontodamage}*@{twohanded}))[Key Ability]+(@{bonustodamage})[Feats]+@{enhancetoattack}[Magic]+(@{enchdamagedice}[Bonus])+(?{Do you have a miscellaneaous bonus to damage?|0})]] damage to their target.}}
+        &{template:custom}{{title=Damage}}{{subtitle= with @{character_name}'s @{weaponname} }} {{desc= Deals [[(@{dnum}@{dtype})[Dice]+(@{weapontodamage})+(floor(@{weapontodamage}*@{twohanded}))[Key Ability]+(@{bonustodamage})[Feats]+@{enhancetoattack}[Magic]+(@{enchdamagedice}[Bonus])+(?{Do you have a miscellaneaous bonus to damage?|0})]] damage to their target.}}
         "
        ></button></div>
        <div style="padding-bottom: 3px;" class="grc2 titleblock">Critical Damage:&nbsp;<button
         type="roll"
         name="roll_critweapondamage"
         value=
          "
-        &{template:custom}{{title=Damage}}{{subtitle= with @{character_name}'s @{weaponname} }} {{Deals an astonishing [[[[@{weaponcritmod}*@{dnum}]]@{dtype}[Dice]+(0@{weaponcritmod}*(@{weapontodamage}+(floor(0@{weapontodamage}*@{twohanded}))))[Key Ability]+(0@{weaponcritmod}*(@{bonustodamage}[Feats]+@{enhancetoattack}[Magic]+(?{Do you have a miscellaneaous bonus to damage?|0})))+(0@{enchdamagedice})+(0@{extraenchdicecrit})]] damage to their target.}}
+        &{template:custom}{{title=Damage}}{{subtitle= with @{character_name}'s @{weaponname} }} {{desc= Deals an astonishing [[[[@{weaponcritmod}*@{dnum}]]@{dtype}[Dice]+(0@{weaponcritmod}*(@{weapontodamage}+(floor(0@{weapontodamage}*@{twohanded}))))[Key Ability]+(0@{weaponcritmod}*(@{bonustodamage}[Feats]+@{enhancetoattack}[Magic]+(?{Do you have a miscellaneaous bonus to damage?|0})))+(0@{enchdamagedice})+(0@{extraenchdicecrit})]] damage to their target.}}
          "
        ></button></div>
       </div>
@@ -2735,7 +2735,7 @@ <h3 style="color:white">Spell Casting</h3>
 </div>
 <!--</editor-fold>-->
 
- <!--<editor-fold desc="Inventory"-->
+<!--<editor-fold desc="Inventory"-->
  <div class="sheet-inventory">
   <div class="inventory-grid">
    <div class="Header-I">
@@ -2766,7 +2766,7 @@ <h3 style="color:white">Spell Casting</h3>
   </div>
  </div>
 
- <!--</editor-fold>-->
+<!--</editor-fold>-->
 
 <!-- <editor-fold desc="Roll Template" -->
 <rolltemplate class="sheet-rolltemplate-custom">
@@ -3121,7 +3121,7 @@ <h3 style="color:white">Spell Casting</h3>
             }
             setAttrs({
                 BaseSkillGrowth: attack + specialty + versatile
-            });
+            },checkmaxskillpoints);
         });
     });
 
@@ -3557,7 +3557,7 @@ <h3 style="color:white">Spell Casting</h3>
             setAttrs({
                 Profession1Total: Math.min(skill_cap_calc(HD,values.Profession1Trained),SP) + key + misc,
                 Profession1SP: Math.min(skill_cap_calc(HD,values.Profession1Trained),SP)
-            }, checkmaxskillpoints);
+            }, v);
         });
     });