Skip to content

Commit

Permalink
Merge pull request #13270 from DBFBlackbull/grenadelike-test
Browse files Browse the repository at this point in the history 
[ADnD 2E Revised] Feature: More Grenades-like misses, magical items, and Scaling scroll failure! 4.21.0!
  • Loading branch information
@NBrooks-Roll20
NBrooks-Roll20 authored Sep 3, 2024
2 parents 9d791ab + 0991163 commit 7e133ec
Show file tree
Hide file tree
Showing 29 changed files with 1,814 additions and 560 deletions.
1,170 changes: 893 additions & 277 deletions ADnD_2E_Revised/2ESheet.html
View file

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions ADnD_2E_Revised/2EStyle.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1450,6 +1450,9 @@ input.sheet-toast-error:checked ~ .sheet-toast-content {

/*#endregion*/
/*#region Styles for the 2Egrenade Template /*/
.sheet-rolltemplate-2Egrenademiss {
/*Overwrite roll commands to look like a button*/
}
.sheet-rolltemplate-2Egrenademiss .sheet-template-head {
background: #B7A64E;
}
Expand All @@ -1464,6 +1467,16 @@ input.sheet-toast-error:checked ~ .sheet-toast-content {
.sheet-rolltemplate-2Egrenademiss .sheet-miss-text {
font-size: 8pt;
}
.sheet-rolltemplate-2Egrenademiss a[href^="`"] {
background-color: rgb(206, 15, 105);
padding: 5px;
color: white;
display: inline-block;
border: 1px solid white;
}
.sheet-rolltemplate-2Egrenademiss p:last-child {
margin-bottom: 0;
}

/*#endregion*/
/*#region Styles for the 2Epocrit Template*/
Expand Down
13 changes: 13 additions & 0 deletions ADnD_2E_Revised/css/rolltemplates.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,9 @@

/*#endregion*/
/*#region Styles for the 2Egrenade Template /*/
.sheet-rolltemplate-2Egrenademiss {
/*Overwrite roll commands to look like a button*/
}
.sheet-rolltemplate-2Egrenademiss .sheet-template-head {
background: #B7A64E;
}
Expand All @@ -423,6 +426,16 @@
.sheet-rolltemplate-2Egrenademiss .sheet-miss-text {
font-size: 8pt;
}
.sheet-rolltemplate-2Egrenademiss a[href^="`"] {
background-color: rgb(206, 15, 105);
padding: 5px;
color: white;
display: inline-block;
border: 1px solid white;
}
.sheet-rolltemplate-2Egrenademiss p:last-child {
margin-bottom: 0;
}

/*#endregion*/
/*#region Styles for the 2Epocrit Template*/
Expand Down
12 changes: 6 additions & 6 deletions ADnD_2E_Revised/html/changelog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<h2 style="color: black;">Changes in <span name="attr_version"></span></h2>
<div class="sheet-announce-items">
<ul style="font-style:italic">
<li>Fixed the Poison save button name for Henchmen and Monsters</li>
<li>Added spells to Grenade-like miss options</li>
<li>Added Miscellaneous magical item section</li>
<li>Added Rods, Staves and Wands section</li>
<li>Added automatic Scroll spell failure that scales with your level</li>
<li>Moved Scroll, Potion, and Magical item information to be next to their appropriate sections</li>
<li>Corrected and reordered Concealed/Secret doors notes</li>
</ul>
<hr>
<p>
If you want to help improve the sheet, you can go and vote for these suggestions on the Roll20 forum! With these I could make the sheet even better! :)
<span class="sheet-selectable">https://app.roll20.net/forum/post/4922089/gmrolls-that-are-hidden-even-from-the-player-that-makes-the-roll</span>
</p>
<hr>
<p>
To get notified on future updates, discuss changes, or contribute suggestions, please follow this topic on the forum:
<span class="sheet-selectable">https://app.roll20.net/forum/post/9311682/official-ad-and-d-2e-revised-update-thread</span>
Expand Down
31 changes: 26 additions & 5 deletions ADnD_2E_Revised/html/components/rolltemplates.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,29 +522,50 @@
<tr>
<td class="sheet-grenade-c1 sheet-ignore-inlineroll">Direct Hit:<br>({{aoe}} Feet Diameter)</td>
{{#rollTotal() computed::hit 1}}
<td class="sheet-template-result sheet-template-success sheet-ignore-inlineroll">Hit!<br><span class="sheet-hit-text">{{hitdmg}}</span></td>
<td class="sheet-template-result sheet-template-success">Hit!<br><span class="sheet-hit-text">{{hitdmg}}</span></td>
{{/rollTotal() computed::hit 1}}
{{#rollTotal() computed::hit 0}}
<td class="sheet-template-result sheet-template-failure sheet-ignore-inlineroll">Miss!<br><span class="sheet-miss-text">{{hitdmg}}</span></td>
<td class="sheet-template-result sheet-template-failure">Miss!<br><span class="sheet-miss-text">{{hitdmg}}</span></td>
{{/rollTotal() computed::hit 0}}
</tr>
{{#splashdmg}}
<tr>
<td class="sheet-grenade-c1 sheet-ignore-inlineroll">Splash Hit:<br>({{aoesplash}} Feet Diameter)</td>
<!-- Direct hit is true -->
{{#rollTotal() computed::hit 1}}
<td class="sheet-template-result sheet-template-info sheet-ignore-inlineroll sheet-hit-text">Info<br><span class="sheet-miss-text">{{splashdmg}}</span></td>
<td class="sheet-template-result sheet-template-info">Info<br><span class="sheet-miss-text">{{splashdmg}}</span></td>
{{/rollTotal() computed::hit 1}}

<!-- Direct hit is false -->
{{#rollTotal() computed::hit 0}}
{{#rollTotal() computed::splash 1}}
<td class="sheet-template-result sheet-template-success sheet-ignore-inlineroll">Hit!<br><span class="sheet-hit-text">{{splashdmg}}</span></td>
<td class="sheet-template-result sheet-template-success">Hit!<br><span class="sheet-hit-text">{{splashdmg}}</span></td>
{{/rollTotal() computed::splash 1}}
{{#rollTotal() computed::splash 0}}
<td class="sheet-template-result sheet-template-failure sheet-ignore-inlineroll">Miss!<br><span class="sheet-miss-text">{{splashdmg}}</span></td>
<td class="sheet-template-result sheet-template-failure">Miss!<br><span class="sheet-miss-text">{{splashdmg}}</span></td>
{{/rollTotal() computed::splash 0}}
{{/rollTotal() computed::hit 0}}
</tr>
{{/splashdmg}}
{{#bounce}}
<tr>
<td colspan="2" style="font-size: 9pt;">
<p>
The boulder bounces and rolls for {{bounce}} feet,
{{#^rollBetween() direction 2 7}}following the original line of attack.{{/^rollBetween() direction 2 7}}
{{#rollBetween() direction 2 7}}moving roughly 45 to 60 degrees off the original line of attack.{{/rollBetween() direction 2 7}}
</p>
<p>
<strong>In an open area:</strong><br>
For each character the boulder moves though, reroll to-hit with a -2 penalty for each 10 feet, or fraction thereof, the boulder has bounced since it hit.
</p>
<p>
<strong>In an area where movement is restricted</strong>—a formation of pikemen or a large party in a 10-foot wide corridor:<br>
The boulder strikes all targets in its path.
</p>
</td>
</tr>
{{/bounce}}
</table>
</div>
</div>
Expand Down
44 changes: 32 additions & 12 deletions ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-details-tab.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="sheet-col">

<h4>Player and Character</h4>
<table style='width:400px;' class="sheet-default-header">
<table style="width:400px;" class="sheet-default-header">
<tr><td colspan="14">Roll20 Name</td></tr>
<tr><td colspan="14"><input type="text" name="attr_roll20_name" title="@{roll20_name}" class="sheet-table-dynamic" placeholder="Your Roll20 tag"></td></tr>
<tr><td colspan="14">Player Name:</td></tr>
Expand Down Expand Up @@ -51,26 +51,46 @@ <h4>Player and Character</h4>

<div class="sheet-col">
<h4>Character Details</h4>
<table style='width:400px;' class="sheet-default-header">
<table style="width:400px;" class="sheet-default-header">
<tr>
<td>Race:</td>
<td>Gender:</td>
</tr>
<tr>
<td><input type="text" name="attr_race" title="@{race}" class="sheet-half" placeholder="PC's Race" list="races"/><span></span></td>
<td><input type="text" name="attr_gender" title="@{gender}" class="sheet-half" placeholder="PC's Gender"/></td>
</tr>
<tr>
<td>Hair Color:</td>
<td>Eye Color:</td>
</tr>
<tr>
<td><input type="text" name="attr_hair-color" title="@{hair-color}" class="sheet-half" placeholder="Or skull features (horns, etc)"/></td>
<td><input type="text" name="attr_eye-color" title="@{eye-color}" class="sheet-half" placeholder="Color or special eye type"/></td>
</tr>
<tr>
<td>Complexion:</td>
<td>Features:</td>
</tr>
<tr>
<td>Race:<br><input type="text" name="attr_race" title="@{race}" class="sheet-half" placeholder="PC's Race" list="races"/><span></span></td>
<td>Gender:<br><input type="text" name="attr_gender" title="@{gender}" class="sheet-half" placeholder="PC's Gender"/></td>
<td><input type="text" name="attr_complexion" title="@{complexion}" class="sheet-half" placeholder="Skin color"/></td>
<td><input type="text" name="attr_distinguishing-features" title="@{distinguishing-features}" class="sheet-half" placeholder="Birthmarks, scars, etc"/></td>
</tr>
<tr>
<td>Hair Color:<br><input type="text" name="attr_hair-color" title="@{hair-color}" class="sheet-half" placeholder="Or skull features (horns, etc)"/></td>
<td>Eye Color:<br><input type="text" name="attr_eye-color" title="@{eye-color}" class="sheet-half" placeholder="Color or special eye type"/></td>
<td>Homeland:</td>
<td>Deity:</td>
</tr>
<tr>
<td>Complexion:<br><input type="text" name="attr_complexion" title="@{complexion}" class="sheet-half" placeholder="Skin color"/></td>
<td>Features:<br><input type="text" name="attr_distinguishing-features" title="@{distinguishing-features}" class="sheet-half" placeholder="Birthmarks, scars, etc"/></td>
<td><input type="text" name="attr_homeland" title="@{homeland}" class="sheet-half" placeholder="PC's Homeland"/></td>
<td><input type="text" name="attr_deity" title="@{deity}" class="sheet-half" placeholder="PC's Deity"/></td>
</tr>
<tr>
<td>Homeland:<br><input type="text" name="attr_homeland" title="@{homeland}" class="sheet-half" placeholder="PC's Homeland"/></td>
<td>Deity:<br><input type="text" name="attr_deity" title="@{deity}" class="sheet-half" placeholder="PC's Deity"/></td>
<td>Vision:</td>
<td>Secondary Skill:</td>
</tr>
<tr>
<td>Vision:<br><input type="text" name="attr_vision-details" title="@{vision-details}" class="sheet-half" placeholder="Vision Details"/></td>
<td>Secondary Skill:<br><input type="text" name="attr_secskill" title="@{secskill}" class="sheet-half" placeholder="PC's Secondary Skill"/></td>
<td><input type="text" name="attr_vision-details" title="@{vision-details}" class="sheet-half" placeholder="Vision Details"/></td>
<td><input type="text" name="attr_secskill" title="@{secskill}" class="sheet-half" placeholder="PC's Secondary Skill"/></td>
</tr>
</table>
<table style="width:400px;" class="sheet-default-header">
Expand Down
28 changes: 10 additions & 18 deletions ADnD_2E_Revised/html/tabs/character-tab/character-info-tab/character-info-tracker-tab.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,7 @@ <h4>Concealed and Secret Door roll</h4>
<td><button type="roll" name="roll_secret-door-check-dm" value="&{template:2Edefault} {{name=Search for Concealed/Secret door}} {{subtitle=for @{character_name}}} {{color=dark-purple}} {{[Secret by DM](~@{character_name}|secret-door-check)=}} {{desc=You try to find a concealed or secret door...}}">Roll</button></td>
</tr>
</table>
<details>
<summary>Notes for finding secret doors</summary>
<ul>
<li>Non-elven characters have a 1 in 6 chance of finding a secret door when searching for it. Sage Advice #152 p. 14 + Sage Advice #273 p. 114</li>
<li>Elves and Half-elves have a 2 in 6 chance of finding a secret door when searching for it. PHB p. 29-31</li>
<li>Elves and Half-elves have a 1 in 6 chance of finding a concealed door when merely passing with in 10 feet of it. PHB p. 29-31</li>
<li>DM information is found in DMG p. 176</li>
</ul>
</details>
insert_hidden-doors-note.html
<hr>
<h4>Movement</h4>
<input type="radio" name="attr_tab3" class="sheet-tab sheet-tab15" value="1" checked/><span class="sheet-tab sheet-tab15">Basic</span>&nbsp;
Expand Down Expand Up @@ -663,15 +655,15 @@ <h4>Save and Magic Resistance Details:</h4>
<details>
<summary>Saving throw modifier notes</summary>
<ul>
<li>Dwarves, Gnomes and Halflings get +1 saving throw vs Wands, Staves, Rods and Spells for every 3½ points in Constitution. (PHB p. 28, 30, 32)</li>
<li>Dwarves and Halflings get the same bonus vs poisons. (PHB p. 28, 30)</li>
<li>Elves have 90% resistance to Sleep and Charm-related spells. (PHB p. 29)</li>
<li>Half-Elves have 30% resistance to Sleep and Charm-related spells. (PHB p.30)</li>
<li>Poison save from high Constitution affects Humans, Elves, Gnomes, and Half-elves. It does <b>not</b> affect Dwarves and Halflings (PHB p. 21)</li>
<li>Defense Adjustment from Dexterity affects saving throws against attacks that can be dodged, like lightning bolt. (PHB p. 20, DMG p. 93)</li>
<li>Magical Defense Adjustment from Wisdom only affects spells that attack the Mind such as: <em>beguiling, charm, fear, hypnosis, illusions, possession, suggestion,</em> etc. (PHB p. 23, DMG p. 93)</li>
<li>Psionicists gain a +2 bonus on all saving throws vs. enchantment/charm spells and the like. (The Complete Psionics Handbook p. 14)</li>
<li>Magical Armor gives bonus to saving throws vs something physical. Magical armor never gives a saving throw bonus against gas (which it cannot block), poison (which operates internally), and spells that are mental or that cause no physical damage. (DMG p. 93)</li>
<li><strong>Dwarves, Gnomes, Halflings:</strong> Get +1 saving throw vs Wands, Staves, Rods and Spells for every 3½ points in Constitution. (PHB p. 28, 30, 32)</li>
<li><strong>Dwarves, Halflings:</strong> Get +1 saving throw vs poisons for every 3½ points in Constitution. (PHB p. 28, 30)</li>
<li><strong>Elves</strong> have 90% resistance to Sleep and Charm-related spells. (PHB p. 29)</li>
<li><strong>Half-Elves</strong> have 30% resistance to Sleep and Charm-related spells. (PHB p.30)</li>
<li><strong>Humans, Elves, Gnomes, Half-elves:</strong> Get bonus to saving throw vs Poison from high Constitution. It does <b>not</b> affect Dwarves and Halflings (PHB p. 21)</li>
<li><strong>Dexterity Defense Adjustment:</strong> Affects saving throws against attacks that can be <strong>dodged</strong>, like lightning bolt. (PHB p. 20, DMG p. 93)</li>
<li><strong>Wisdom Magical Defense Adjustment:</strong> Only affects spells that attack the <strong>Mind</strong> such as: <em>beguiling, charm, fear, hypnosis, illusions, possession, suggestion,</em> etc. (PHB p. 23, DMG p. 93)</li>
<li><strong>Psionicists:</strong> Gain a +2 bonus on all saving throws vs. enchantment/charm spells and the like. (The Complete Psionics Handbook p. 14)</li>
<li><strong>Magical Armor:</strong> Gives bonus to saving throws vs something physical. Magical armor never gives a saving throw bonus against gas (which it cannot block), poison (which operates internally), and spells that are mental or that cause no physical damage. (DMG p. 93)</li>
</ul>
</details>
<hr>
Expand Down
19 changes: 19 additions & 0 deletions ...l/tabs/character-tab/character-info-tab/character-info-tracker-tab/hidden-doors-note.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<details>
<summary>Notes for finding Concealed/Secret doors</summary>
<strong>Concealed doors</strong>
<ul>
<li><strong>All characters</strong> automatically find a <em>concealed door</em> when actively searching for it. (DMG p. 176)</li>
<li><strong>Elves</strong> and <strong>Half-elves</strong> have a 3 in 6 chance of finding a <em>concealed door</em> when merely passing with in 10 feet of it.
<ul>
<li>This is a departure from the PHB p. 29-31. Since the DMG states that all character automatically finds a <em>concealed door</em> when actively searching, the Elf and Half-elf 3 in 6 of actively finding a <em>concealed door</em> has been moved from the active search to passive.
</li>
</ul>
</li>
</ul>
<strong>Secret doors</strong>
<ul>
<li><strong>Non-elven characters</strong> have a 1 in 6 chance of finding a <em>secret door</em> when actively searching for it. (Sage Advice #152 p. 14 + Sage Advice #273 p. 114)</li>
<li><strong>Elves</strong> and <strong>Half-elves</strong> have a 2 in 6 chance of finding a <em>secret door</em> when actively searching for it. (PHB p. 29-31)</li>
</ul>
<strong>DM information on doors is found in the DMG p. 176</strong>
</details>
Loading

0 comments on commit 7e133ec

Please sign in to comment.