Skip to content

[PHB24] Fixes from Testing #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FreshRoyal merged 7 commits into from
Mar 16, 2026
Merged

[PHB24] Fixes from Testing #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a11727d
Misc. Fixes
NickVendel Mar 7, 2026
7793438
Blocked duplicates
NickVendel Mar 9, 2026
650cbdc
More Fixes and Compatibility Changes
NickVendel Mar 13, 2026
004bf49
correcting sources
NickVendel Mar 13, 2026
3cd2cb8
Compatibility Fixes for Subclasses
NickVendel Mar 14, 2026
f83b64e
Merge branch 'phb24-misc-fixes' into PHB24-fixes-from-testing
NickVendel Mar 15, 2026
4d5b5be
fix copy-paste error
NickVendel Mar 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
777 changes: 764 additions & 13 deletions core/ALE.xml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/dungeon-masters-guide/classes/class-oathbreaker.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>Oathbreaker</name>
<description>The Oathbreaker Sacred Oath for the Paladin</description>
<author url="http://dnd.wizards.com/products/tabletop-games/rpg-products/dungeon-masters-guide">Wizards of the Coast</author>
<update version="0.0.9">
<update version="0.1.0">
<file name="class-oathbreaker.xml" url="https://raw.githubusercontent.com/AuroraLegacy/elements/master/core/dungeon-masters-guide/classes/class-oathbreaker.xml" />
</update>
</info>
Expand Down Expand Up @@ -32,7 +32,7 @@
</rules>
</element>

<element name="Oathbreaker Spells" type="Archetype Feature" source="Player’s Handbook" id="ID_DMG_ARCHETYPE_FEATURE_OATHBREAKER_OATHBREAKER_SPELLS">
<element name="Oathbreaker Spells" type="Archetype Feature" source="Dungeon Master’s Guide" id="ID_DMG_ARCHETYPE_FEATURE_OATHBREAKER_OATHBREAKER_SPELLS">
<requirements>!ID_INTERNAL_FEATURE_REPLACEMENT_PALADIN_OATHBREAKER_SPELLS</requirements>
<description>
<p>An oathbreaker loses previously gained oath spells and instead gain the following Oathbreaker spells at the paladin levels listed.</p>
Expand Down
649 changes: 0 additions & 649 deletions core/internal.xml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions core/players-handbook-2024.index
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
<file name="background-scribe.xml" url="https://raw.githubusercontent.com/AuroraLegacy/elements/master/core/players-handbook-2024/backgrounds/background-scribe.xml" />
<file name="background-soldier.xml" url="https://raw.githubusercontent.com/AuroraLegacy/elements/master/core/players-handbook-2024/backgrounds/background-soldier.xml" />
<file name="background-wayfarer.xml" url="https://raw.githubusercontent.com/AuroraLegacy/elements/master/core/players-handbook-2024/backgrounds/background-wayfarer.xml" />
<file name="optional-background-feature.xml" url="https://raw.githubusercontent.com/AuroraLegacy/elements/master/core/players-handbook-2024/backgrounds/optional-background-feature.xml" />

<!-- feats -->
<file name="feats-epic-boons.xml" url="https://raw.githubusercontent.com/AuroraLegacy/elements/master/core/players-handbook-2024/feats/feats-epic-boons.xml" />
Expand Down
48 changes: 24 additions & 24 deletions core/players-handbook-2024/archetypes/fighter-battle-master.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
<stat name="combat superiority:dc" value="proficiency" bonus="proficiency"/>
<stat name="combat superiority:dc" value="combat superiority:dc:ability" bonus="ability"/>

<select type="Archetype Feature" name="Maneuver (Combat Superiority 3)" supports="Maneuver, Battle Master" number="3" />
<select type="Archetype Feature" name="Maneuver (Combat Superiority 7)" supports="Maneuver, Battle Master" number="2" level="7" />
<select type="Archetype Feature" name="Maneuver (Combat Superiority 10)" supports="Maneuver, Battle Master" number="2" level="10" />
<select type="Archetype Feature" name="Maneuver (Combat Superiority 15)" supports="Maneuver, Battle Master" number="2" level="15" />
<select type="Archetype Feature" name="Maneuver (Combat Superiority 3)" supports="Maneuver,(Battle Master||PHB24 Battle Master)" number="3" />
<select type="Archetype Feature" name="Maneuver (Combat Superiority 7)" supports="Maneuver,(Battle Master||PHB24 Battle Master)" number="2" level="7" />
<select type="Archetype Feature" name="Maneuver (Combat Superiority 10)" supports="Maneuver,(Battle Master||PHB24 Battle Master)" number="2" level="10" />
<select type="Archetype Feature" name="Maneuver (Combat Superiority 15)" supports="Maneuver,(Battle Master||PHB24 Battle Master)" number="2" level="15" />
</rules>
</element>

Expand Down Expand Up @@ -149,7 +149,7 @@

<!-- Combat Maneuvers -->
<element name="Ambush" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_AMBUSH">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you make a Dexterity (Stealth) check or an Initiative roll, you can expend one Superiority Die and add the die to the roll, unless you have the Incapacitated condition.</p>
</description>
Expand All @@ -158,7 +158,7 @@
</sheet>
</element>
<element name="Bait and Switch" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_BAIT_AND_SWITCH">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you're within 5 feet of a creature on your turn, you can expend one Superiority Die and switch places with that creature, provided you spend at least 5 feet of movement and the creature is willing and doesn't have the Incapacitated condition. This movement doesn't provoke Opportunity Attacks.</p>
<p class="indent">Roll the Superiority Die. Until the start of your next turn, you or the other creature (your choice) gains a bonus to AC equal to the number rolled.</p>
Expand All @@ -169,7 +169,7 @@
</sheet>
</element>
<element name="Commander’s Strike" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_COMMANDERS_STRIKE">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you take the Attack action on your turn, you can replace one of your attacks to direct one of your companions to strike. When you do so, choose a willing creature who can see or hear you and expend one Superiority Die. That creature can immediately use its Reaction to make one attack with a weapon or an Unarmed Strike, adding the Superiority Die to the attack's damage roll on a hit.</p>
</description>
Expand All @@ -178,7 +178,7 @@
</sheet>
</element>
<element name="Commanding Presence" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_COMMANDING_PRESENCE">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you make a Charisma (Intimidation, Performance, or Persuasion) check, you can expend one Superiority Die and add that die to the roll.</p>
</description>
Expand All @@ -187,7 +187,7 @@
</sheet>
</element>
<element name="Disarming Attack" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_DISARMING_ATTACK">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you hit a creature with an attack roll, you can expend one Superiority Die to attempt to disarm the target. Add the Superiority Die roll to the attack's damage roll. The target must succeed on a Strength saving throw or drop one object of your choice that it's holding, with the object landing in its space.</p>
</description>
Expand All @@ -196,7 +196,7 @@
</sheet>
</element>
<element name="Distracting Strike" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_DISTRACTING_STRIKE">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you hit a creature with an attack roll, you can expend one Superiority Die to distract the target. Add the Superiority Die roll to the attack's damage roll. The next attack roll against the target by an attacker other than you has Advantage if the attack is made before the start of your next turn.</p>
</description>
Expand All @@ -205,7 +205,7 @@
</sheet>
</element>
<element name="Evasive Footwork" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_EVASIVE_FOOTWORK">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>As a Bonus Action, you can expend one Superiority Die and take the Disengage action. You also roll the die and add the number rolled to your AC until the start of your next turn.</p>
</description>
Expand All @@ -214,7 +214,7 @@
</sheet>
</element>
<element name="Feinting Attack" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_FEINTING_ATTACK">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>As a Bonus Action, you can expend one Superiority Die to feint, choosing one creature within 5 feet of yourself as your target. You have Advantage on your next attack roll against that target this turn. If that attack hits, add the Superiority Die to the attack's damage roll.</p>
</description>
Expand All @@ -223,7 +223,7 @@
</sheet>
</element>
<element name="Goading Attack" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_GOADING_ATTACK">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you hit a creature with an attack roll, you can expend one Superiority Die to attempt to goad the target into attacking you. Add the Superiority Die to the attack's damage roll. The target must succeed on a Wisdom saving throw or have Disadvantage on attack rolls against targets other than you until the end of your next turn.</p>
</description>
Expand All @@ -232,7 +232,7 @@
</sheet>
</element>
<element name="Lunging Attack" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_LUNGING_ATTACK">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>As a Bonus Action, you can expend one Superiority Die and take the Dash action. If you move at least 5 feet in a straight line immediately before hitting with a melee attack as part of the Attack action on this turn, you can add the Superiority Die to the attack's damage roll.</p>
</description>
Expand All @@ -241,7 +241,7 @@
</sheet>
</element>
<element name="Maneuvering Attack" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_MANEUVERING_ATTACK">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you hit a creature with an attack roll, you can expend one Superiority Die to maneuver one of your comrades into another position. Add the Superiority Die roll to the attack's damage roll, and choose a willing creature who can see or hear you. That creature can use its Reaction to move up to half its Speed without provoking an Opportunity Attacks from the target of your attack.</p>
</description>
Expand All @@ -250,7 +250,7 @@
</sheet>
</element>
<element name="Menacing Attack" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_MENACING_ATTACK">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you hit a creature with an attack roll, you can expend one Superiority Die to attempt to frighten the target. Add the Superiority Die to the attack's damage roll. The target must succeed on a Wisdom saving throw or have the Frightened condition until the end of your next turn.</p>
</description>
Expand All @@ -259,7 +259,7 @@
</sheet>
</element>
<element name="Parry" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_PARRY">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When another creature damages you with a melee attack roll, you can take a Reaction and expend one Superiority Die to reduce the damage by the number you roll on your Superiority Die plus your Strength or Dexterity modifier (your choice).</p>
</description>
Expand All @@ -268,7 +268,7 @@
</sheet>
</element>
<element name="Precision Attack" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_PRECISION_ATTACK">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you miss with an attack roll, you can expend one Superiority Die, roll that die, and add it to the attack roll, potentially causing the attack to hit.</p>
</description>
Expand All @@ -277,7 +277,7 @@
</sheet>
</element>
<element name="Pushing Attack" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_PUSHING_ATTACK">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you hit a creature with an attack roll using a weapon or an Unarmed Strike, you can expend one Superiority Die to attempt to drive the target back. Add the Superiority Die to the attack's damage roll. If the target is Large or smaller, it must succeed on a Strength saving throw or be pushed up to 15 feet directly away from you.</p>
</description>
Expand All @@ -286,7 +286,7 @@
</sheet>
</element>
<element name="Rally" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_RALLY">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>As a Bonus Action, you can expend one Superiority Die to bolster the resolve of a companion. Choose an ally of yours within 30 feet of yourself who can see or hear you. That creature gains Temporary Hit Points equal to the Superiority Die roll plus half your Fighter level (round down).</p>
</description>
Expand All @@ -295,7 +295,7 @@
</sheet>
</element>
<element name="Riposte" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_RIPOSTE">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When a creature misses you with a melee attack roll, you can take a Reaction and expend one Superiority Die to make a melee attack roll with a weapon or an Unarmed Strike against the creature. If you hit, add the Superiority Die to the attack's damage.</p>
</description>
Expand All @@ -304,7 +304,7 @@
</sheet>
</element>
<element name="Sweeping Attack" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_SWEEPING_ATTACK">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you hit a creature with a melee attack roll using a weapon or an Unarmed Strike, you can expend one Superiority Die to attempt to damage another creature. Choose another creature within 5 feet of the original target and within your reach. If the original attack roll would hit the second creature, it takes damage equal to the number you roll on your Superiority Die. The damage is of the same type dealt by the original attack.</p>
</description>
Expand All @@ -313,7 +313,7 @@
</sheet>
</element>
<element name="Tactical Assessment" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_TACTICAL_ASSESSMENT">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you make an Intelligence (History or Investigation) check or a Wisdom (Insight) check, you can expend one Superiority Die and add that die to the ability check.</p>
</description>
Expand All @@ -322,7 +322,7 @@
</sheet>
</element>
<element name="Trip Attack" type="Archetype Feature" source="Player’s Handbook (2024)" id="ID_WOTC_PHB24_ARCHETYPE_FEATURE_MANEUVER_TRIP_ATTACK">
<supports>Maneuver, Battle Master</supports>
<supports>Maneuver, PHB24 Battle Master</supports>
<description>
<p>When you hit a creature with an attack roll using a weapon or an Unarmed Strike, you can expend one Superiority Die and add the die to the attack's damage roll. If the target is Large or smaller, it must succeed on a Strength saving throw or have the Prone condition.</p>
</description>
Expand Down
3 changes: 3 additions & 0 deletions core/players-handbook-2024/backgrounds/background-acolyte.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
<li><strong>Equipment:</strong><i> Choose A or B:</i> (A) Calligrapher’s Supplies, Book (prayers), Holy Symbol, Parchment (10 sheets), Robe, 8 GP; or (B) 50 GP</li>
</ul>
<p>You devoted yourself to service in a temple, either nestled in a town or secluded in a sacred grove. There you performed rites in honor of a god or pantheon. You served under a priest and studied religion. Thanks to your priest’s instruction and your own devotion, you also learned how to channel a modicum of divine power in service to your place of worship and the people who prayed there.</p>
<div class="reference">
<div element="ID_WOTC_PHB24_FEAT_MAGIC_INITIATE" />
</div>
</description>
<setters>
<set name="short">Intelligence, Wisdom, Charisma, Magic Initiate (Cleric) Feat, Insight and Religion Skills, and Calligrapher’s Supplies</set>
Expand Down
3 changes: 3 additions & 0 deletions core/players-handbook-2024/backgrounds/background-artisan.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
<li><strong>Equipment:</strong><i> Choose A or B:</i> (A) Artisan’s Tools (same as above), 2 Pouches, Traveler's Clothes, 32 GP; or (B) 50 GP</li>
</ul>
<p>You began mopping floors and scrubbing counters in an artisan's workshop for a few coppers per day as soon as you were strong enough to carry a bucket. When you were old enough to apprentice, you learned to create basic crafts of your own, as well as how to sweet-talk the occasional demanding customer. Your trade has also given you a keen eye for detail.</p>
<div class="reference">
<div element="ID_WOTC_PHB24_FEAT_CRAFTER" />
</div>
</description>
<setters>
<set name="short">Strength, Dexterity, Intelligence, Crafter Feat, Investigation and Persuasion Skills, an Artisan's Tool</set>
Expand Down
3 changes: 3 additions & 0 deletions core/players-handbook-2024/backgrounds/background-charlatan.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
<li><strong>Equipment:</strong><i> Choose A or B:</i> (A) Forgery Kit, Costume, Fine Clothes, 15 GP; or (B) 50 GP</li>
</ul>
<p>Once you were old enough to order an ale, you soon had a favorite stool in every tavern within ten miles of where you were born. As you traveled the circuit from public house to watering hole, you learned to prey on unfortunates who were in the market for a comforting lie or two-perhaps a sham potion or forged ancestry records.</p>
<div class="reference">
<div element="ID_WOTC_PHB24_FEAT_SKILLED" />
</div>
</description>
<setters>
<set name="short">Dexterity, Constitution, Charisma, Skilled Feat, Deception and Sleight of Hand Skills, Forgery Kit</set>
Expand Down
3 changes: 3 additions & 0 deletions core/players-handbook-2024/backgrounds/background-criminal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
<li><strong>Equipment:</strong><i> Choose A or B:</i> (A) 2 Daggers, Thieves' Tools, Crowbar, 2 Pouches, Traveler's Clothes, 16 CP; or (B) 50 GP</li>
</ul>
<p>You eked out a living in dark alleyways, cutting purses or burgling shops. Perhaps you were part of a small gang of like-minded wrongdoers who looked out for each other. Or maybe you were a lone wolf, fending for yourself against the local thieves' guild and more fearsome lawbreakers.</p>
<div class="reference">
<div element="ID_WOTC_PHB24_FEAT_ALERT" />
</div>
</description>
<setters>
<set name="short">Dexterity, Constitution, Intelligence, Alert Feat, Sleight of Hand and Stealth Skills, Thieves' Tools</set>
Expand Down
3 changes: 3 additions & 0 deletions core/players-handbook-2024/backgrounds/background-entertainer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
<li><strong>Equipment:</strong><i> Choose A or B:</i> (A) Musical Instrument (same as above), 2 Costumes, Mirror, Perfume, Traveler's Clothes, 11 GP; or (B) 50 GP</li>
</ul>
<p>You spent much of your youth following roving fairs and carnivals, performing odd jobs for musicians and acrobats in exchange for lessons. You may have learned how to walk a tightrope, how to play a lute in a distinct style, or how to recite poetry with impeccable diction. To this day, you thrive on applause and long for the stage.</p>
<div class="reference">
<div element="ID_WOTC_PHB24_FEAT_MUSICIAN" />
</div>
</description>
<setters>
<set name="short">Strength, Dexterity, Charisma, Musician Feat, Acrobatics and Performance Skills, a Musical Instrument</set>
Expand Down
Loading