Merge pull request #13685 from vince-roll20/1eUpdate

AD&D1e
Roll20 · Jan 16, 2025 · e80247a · e80247a
2 parents 6980534 + a2efada
commit e80247a
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 56 deletions.
diff --git a/ADnD_1E_Revised/1ESheet.css b/ADnD_1E_Revised/1ESheet.css
@@ -38,13 +38,15 @@
   --portrait-min-xy: 130px;
   --purple: rgb(116, 0, 145);
   --red: rgb(214, 0, 16);
-  --text-lg: 1.4rem;
+  --white: rgb(255, 255, 255);
+  --yellow: rgb(252, 237, 36);
+
+  --text-sm: 1rem; /* 10px based on :root */
   --text-med: 1.2rem;
-  --text-sm: 1rem;
+  --text-lg: 1.4rem;
   --text-xl: 1.6rem;
   --text-xxl: 1.8rem;
-  --white: rgb(255, 255, 255);
-  --yellow: rgb(252, 237, 36);
+  --text-xxxl: 2.4rem;
 
   --font-buttons1: 'Poppins', system-ui;
   --font-buttons2: 'Caladea', serif;
@@ -4310,7 +4312,7 @@ details[open].thac0-box {
   color: var(--color-white1);
   font-family: var(--font-headers);
   font-size: var(--text-xxl);
-  padding: 2px 2px 0 2px;
+  padding: 2px;
   text-align: center;
   text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
 }
@@ -4322,7 +4324,7 @@ details[open].thac0-box {
   color: var(--color-white1);
   font-family: var(--font-headers);
   font-size: var(--text-lg);
-  padding-bottom: 2px;
+  padding: 2px;
   text-align: center;
   text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
 }
@@ -4347,13 +4349,13 @@ details[open].thac0-box {
   line-height: normal;
   margin-bottom: -5px;
   min-height: 1em;
-  padding-bottom: 5px;
+  padding: 2px;
   z-index: 1;
 }
 
 .sheet-rolltemplate-attacks .sheet-big-text,
 .sheet-rolltemplate-general .sheet-big-text {
-  font-family: var(--font-headers);
+  /* font-family: var(--font-headers); */
   font-size: var(--text-xxl);
 }
 
@@ -4373,7 +4375,7 @@ details[open].thac0-box {
 .sheet-rolltemplate-attacks .sheet-tcat,
 .sheet-rolltemplate-attacks-table .sheet-tcat {
   align-items: end;
-  font-family: var(--font-headers);
+  /* font-family: var(--font-headers); */
   font-size: var(--text-lg);
   font-weight: bold;
 }
@@ -4393,7 +4395,7 @@ details[open].thac0-box {
 .sheet-rolltemplate-general span.sheet-text.sheet-text {
   color: var(--color-black1);
   display: block;
-  font-size: var(--text-med) rem;
+  font-size: var(--text-med);
   line-height: initial;
   max-height: 10em;
   overflow: auto;

diff --git a/ADnD_1E_Revised/1ESheet.html b/ADnD_1E_Revised/1ESheet.html
@@ -63,9 +63,12 @@ <h5 class="right two-columns">
             <span class="left">
               <span>v<span name="attr_sheet_version">
             </span>
-            <span class="right"> • 1/13/25'</span>
+            <span class="right"> • 1/16/25'</span>
           </h5>
           <ul>
+            <li>Small adjustment to the roll template header and subheader padding.</li>
+            <li>Changed the attack template font style to be the same as the general template.</li>
+            <li><code>{{bigtext1}}</code> keys expanded to 12 rows to allow 6 grey(odd) and 6 white(odd) rows for custom macros.</li>
             <li>Updated the portrait image option: Added "none" as an option. Updated the image url parsing to detect png, jpg, and gif. While you can post a sheet's image to chat by simply clicking on the portrait image, you can now access the sheet's image URL as well for macro usage. Call the attribute's value directly using; @{selected|sheet_image_url} macro example; <code>[x](@{selected|sheet_image_url})</code></li>
             <li>Added <code>{{bigname}}</code> to both templates. This key can be used to display text in the header that is 1.75x's larger than the normal header ie <code>{{name}}</code>. These additional keys are provided for those that desire to customize and/or their own macros. They do not impact the sheet's default rolls and macros. Feel free to experiment.</li>
             <li>Added some missing css for the bigtext if used in the attacks roll template.</li>
@@ -4819,27 +4822,18 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         {{/subtag}}
       </span>
       <!-- text will be large and center-aligned -->
-      <span class="sheet-row">
-        {{#bigtext1}}
-          <span class="sheet-big-text sheet-span-two">{{bigtext1}}</span>
-        {{/bigtext1}}
-      </span>
-      <span class="sheet-row">
-        {{#bigtext2}}
-          <span class="sheet-big-text sheet-span-two">{{bigtext2}}</span>
-        {{/bigtext2}}
-      </span>
-      <span class="sheet-row">
-        {{#bigtext3}}
-          <span class="sheet-big-text sheet-span-two">{{bigtext3}}</span>
-        {{/bigtext3}}
-      </span>
-      <span class="sheet-row">
-        {{#bigtext4}}
-          <span class="sheet-big-text sheet-span-two">{{bigtext4}}</span>
-        {{/bigtext4}}
-      </span>
-
+      <span class="sheet-row">{{#bigtext1}}<span class="sheet-big-text sheet-span-two">{{bigtext1}}</span>{{/bigtext1}}</span>
+      <span class="sheet-row">{{#bigtext2}}<span class="sheet-big-text sheet-span-two">{{bigtext2}}</span>{{/bigtext2}}</span>
+      <span class="sheet-row">{{#bigtext3}}<span class="sheet-big-text sheet-span-two">{{bigtext3}}</span>{{/bigtext3}}</span>
+      <span class="sheet-row">{{#bigtext4}}<span class="sheet-big-text sheet-span-two">{{bigtext4}}</span>{{/bigtext4}}</span>
+      <span class="sheet-row">{{#bigtext5}}<span class="sheet-big-text sheet-span-two">{{bigtext5}}</span>{{/bigtext5}}</span>
+      <span class="sheet-row">{{#bigtext6}}<span class="sheet-big-text sheet-span-two">{{bigtext6}}</span>{{/bigtext6}}</span>
+      <span class="sheet-row">{{#bigtext7}}<span class="sheet-big-text sheet-span-two">{{bigtext7}}</span>{{/bigtext7}}</span>
+      <span class="sheet-row">{{#bigtext8}}<span class="sheet-big-text sheet-span-two">{{bigtext8}}</span>{{/bigtext8}}</span>
+      <span class="sheet-row">{{#bigtext9}}<span class="sheet-big-text sheet-span-two">{{bigtext9}}</span>{{/bigtext9}}</span>
+      <span class="sheet-row">{{#bigtext10}}<span class="sheet-big-text sheet-span-two">{{bigtext10}}</span>{{/bigtext10}}</span>
+      <span class="sheet-row">{{#bigtext11}}<span class="sheet-big-text sheet-span-two">{{bigtext11}}</span>{{/bigtext11}}</span>
+      <span class="sheet-row">{{#bigtext12}}<span class="sheet-big-text sheet-span-two">{{bigtext12}}</span>{{/bigtext12}}</span>
       {{#attack1}}
         <span class="sheet-row">
           <span class="sheet-span-two sheet-tcat"><span class="sheet-center">Attack =</span>&nbsp;{{attack1}}
@@ -5110,12 +5104,12 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         <span class="sheet-ToHit sheet-span-two">AC: **0**| 1| 2| 3| 4| 5| 6| 7| 8| 9|10<br />{{ToHitAC1to10}}</span>
       {{/ToHitAC1to10}}
 
-      {{#allprops() name subtag bigname bigtext1 bigtext2 bigtext3 bigtext4 footer backstab crit dual color attack1 attack2 attack3 attack4 damagevsSMchatmenu damagevsLchatmenu critdamagevsSMchatmenu critdamagevsLchatmenu damage1vsSM damage2vsSM damage3vsSM damage4vsSM damage1vsL damage2vsL damage3vsL damage4vsL damage1 ToHitACadj2to10 ToHitAC-10to0 ToHitAC1to10 WeaponNotes freetext damagetype rate range length space speed ammo whisper}}
+      {{#allprops() name subtag bigname bigtext1 bigtext2 bigtext3 bigtext4 bigtext5 bigtext6 bigtext7 bigtext8 bigtext9 bigtext10 bigtext11 bigtext12 footer backstab crit dual color attack1 attack2 attack3 attack4 damagevsSMchatmenu damagevsLchatmenu critdamagevsSMchatmenu critdamagevsLchatmenu damage1vsSM damage2vsSM damage3vsSM damage4vsSM damage1vsL damage2vsL damage3vsL damage4vsL damage1 ToHitACadj2to10 ToHitAC-10to0 ToHitAC1to10 WeaponNotes freetext damagetype rate range length space speed ammo whisper}}
         <span class="sheet-row sheet-all-props">
           <span class="sheet-tcat">{{key}}</span>
           <span>{{value}}</span>
         </span>
-      {{/allprops() name subtag bigname bigtext1 bigtext2 bigtext3 bigtext4 footer backstab crit dual color attack1 attack2 attack3 attack4 damagevsSMchatmenu damagevsLchatmenu critdamagevsSMchatmenu critdamagevsLchatmenu damage1vsSM damage2vsSM damage3vsSM damage4vsSM damage1vsL damage2vsL damage3vsL damage4vsL damage1 ToHitACadj2to10 ToHitAC-10to0 ToHitAC1to10 WeaponNotes freetext damagetype rate range length space speed ammo whisper}}
+      {{/allprops() name subtag bigname bigtext1 bigtext2 bigtext3 bigtext4 bigtext5 bigtext6 bigtext7 bigtext8 bigtext9 bigtext10 bigtext11 bigtext12 footer backstab crit dual color attack1 attack2 attack3 attack4 damagevsSMchatmenu damagevsLchatmenu critdamagevsSMchatmenu critdamagevsLchatmenu damage1vsSM damage2vsSM damage3vsSM damage4vsSM damage1vsL damage2vsL damage3vsL damage4vsL damage1 ToHitACadj2to10 ToHitAC-10to0 ToHitAC1to10 WeaponNotes freetext damagetype rate range length space speed ammo whisper}}
 
       {{#WeaponNotes}}
         <span class="sheet-row">
@@ -5175,26 +5169,18 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         {{/subtag}}
       </span>
       <!-- text will be large and center-aligned -->
-      <span class="sheet-row">
-        {{#bigtext1}}
-          <span class="sheet-big-text sheet-span-two">{{bigtext1}}</span>
-        {{/bigtext1}}
-      </span>
-      <span class="sheet-row">
-        {{#bigtext2}}
-          <span class="sheet-big-text sheet-span-two">{{bigtext2}}</span>
-        {{/bigtext2}}
-      </span>
-      <span class="sheet-row">
-        {{#bigtext3}}
-          <span class="sheet-big-text sheet-span-two">{{bigtext3}}</span>
-        {{/bigtext3}}
-      </span>
-      <span class="sheet-row">
-        {{#bigtext4}}
-          <span class="sheet-big-text sheet-span-two">{{bigtext4}}</span>
-        {{/bigtext4}}
-      </span>
+      <span class="sheet-row">{{#bigtext1}}<span class="sheet-big-text sheet-span-two">{{bigtext1}}</span>{{/bigtext1}}</span>
+      <span class="sheet-row">{{#bigtext2}}<span class="sheet-big-text sheet-span-two">{{bigtext2}}</span>{{/bigtext2}}</span>
+      <span class="sheet-row">{{#bigtext3}}<span class="sheet-big-text sheet-span-two">{{bigtext3}}</span>{{/bigtext3}}</span>
+      <span class="sheet-row">{{#bigtext4}}<span class="sheet-big-text sheet-span-two">{{bigtext4}}</span>{{/bigtext4}}</span>
+      <span class="sheet-row">{{#bigtext5}}<span class="sheet-big-text sheet-span-two">{{bigtext5}}</span>{{/bigtext5}}</span>
+      <span class="sheet-row">{{#bigtext6}}<span class="sheet-big-text sheet-span-two">{{bigtext6}}</span>{{/bigtext6}}</span>
+      <span class="sheet-row">{{#bigtext7}}<span class="sheet-big-text sheet-span-two">{{bigtext7}}</span>{{/bigtext7}}</span>
+      <span class="sheet-row">{{#bigtext8}}<span class="sheet-big-text sheet-span-two">{{bigtext8}}</span>{{/bigtext8}}</span>
+      <span class="sheet-row">{{#bigtext9}}<span class="sheet-big-text sheet-span-two">{{bigtext9}}</span>{{/bigtext9}}</span>
+      <span class="sheet-row">{{#bigtext10}}<span class="sheet-big-text sheet-span-two">{{bigtext10}}</span>{{/bigtext10}}</span>
+      <span class="sheet-row">{{#bigtext11}}<span class="sheet-big-text sheet-span-two">{{bigtext11}}</span>{{/bigtext11}}</span>
+      <span class="sheet-row">{{#bigtext12}}<span class="sheet-big-text sheet-span-two">{{bigtext12}}</span>{{/bigtext12}}</span>
       <!--Success/Failure for Roll High-->
       {{#roll_high}}
         {{#^rollLess() roll_high roll_target}}
@@ -5366,15 +5352,15 @@ <h4 style="grid-row: 1/3; justify-self: left;">ADVANCED Options:</h4>
         </span>
       </span>
 
-      {{#allprops() name subtag bigname bigtext1 bigtext2 bigtext3 bigtext4 footer freetext color effect_type school spell_level spell_class spell_class_level range duration area_of_effect components casting_time saving_throw save_type link type roll roll_high roll_low roll_target roll_target2 rolldecimal nwp_mod_applied mod_applied wis_applied current_encumbrance dex_adjustment quantity quantity_max uses uses_max whisper attribute_mod_1_name attribute_mod_1 attribute_mod_1_max attribute_mod_2_name attribute_mod_2 attribute_mod_2_max attribute_mod_3_name attribute_mod_3 attribute_mod_3_max attribute_mod_4_name attribute_mod_4 attribute_mod_4_max attribute_mod_5_name attribute_mod_5 attribute_mod_5_max attribute_mod_6_name attribute_mod_6 attribute_mod_6_max notes locked_doors}}
+      {{#allprops() name subtag bigname bigtext1 bigtext2 bigtext3 bigtext4 bigtext5 bigtext6 bigtext7 bigtext8 bigtext9 bigtext10 bigtext11 bigtext12 footer freetext color effect_type school spell_level spell_class spell_class_level range duration area_of_effect components casting_time saving_throw save_type link type roll roll_high roll_low roll_target roll_target2 rolldecimal nwp_mod_applied mod_applied wis_applied current_encumbrance dex_adjustment quantity quantity_max uses uses_max whisper attribute_mod_1_name attribute_mod_1 attribute_mod_1_max attribute_mod_2_name attribute_mod_2 attribute_mod_2_max attribute_mod_3_name attribute_mod_3 attribute_mod_3_max attribute_mod_4_name attribute_mod_4 attribute_mod_4_max attribute_mod_5_name attribute_mod_5 attribute_mod_5_max attribute_mod_6_name attribute_mod_6 attribute_mod_6_max notes locked_doors}}
         <!-- <span class="sheet-row sheet-span-two sheet-all-props">
           {{key}}{{value}}
         </span> -->
         <span class="sheet-row sheet-all-props">
           <span class="sheet-tcat">{{key}}</span>
           <span>{{value}}</span>
         </span>
-      {{/allprops() name subtag bigname bigtext1 bigtext2 bigtext3 bigtext4 footer freetext color effect_type school spell_level spell_class spell_class_level range duration area_of_effect components casting_time saving_throw save_type link type roll roll_high roll_low roll_target roll_target2 rolldecimal nwp_mod_applied mod_applied wis_applied current_encumbrance dex_adjustment quantity quantity_max uses uses_max whisper attribute_mod_1_name attribute_mod_1 attribute_mod_1_max attribute_mod_2_name attribute_mod_2 attribute_mod_2_max attribute_mod_3_name attribute_mod_3 attribute_mod_3_max attribute_mod_4_name attribute_mod_4 attribute_mod_4_max attribute_mod_5_name attribute_mod_5 attribute_mod_5_max attribute_mod_6_name attribute_mod_6 attribute_mod_6_max notes locked_doors}}
+      {{/allprops() name subtag bigname bigtext1 bigtext2 bigtext3 bigtext4 bigtext5 bigtext6 bigtext7 bigtext8 bigtext9 bigtext10 bigtext11 bigtext12 footer freetext color effect_type school spell_level spell_class spell_class_level range duration area_of_effect components casting_time saving_throw save_type link type roll roll_high roll_low roll_target roll_target2 rolldecimal nwp_mod_applied mod_applied wis_applied current_encumbrance dex_adjustment quantity quantity_max uses uses_max whisper attribute_mod_1_name attribute_mod_1 attribute_mod_1_max attribute_mod_2_name attribute_mod_2 attribute_mod_2_max attribute_mod_3_name attribute_mod_3 attribute_mod_3_max attribute_mod_4_name attribute_mod_4 attribute_mod_4_max attribute_mod_5_name attribute_mod_5 attribute_mod_5_max attribute_mod_6_name attribute_mod_6 attribute_mod_6_max notes locked_doors}}
 
       <span class="sheet-row">
         <!-- keep }}{{ on same line otherwise the vtt mysteriously adds whitespace -->