Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/kvarak/dnd into main
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-saga committed Dec 8, 2023
2 parents 7ffea44 + a0a4cea commit 29b6edc
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 4 deletions.
19 changes: 19 additions & 0 deletions _data/scenery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,22 @@
- path: 9
name: Ebaleke's Origin
img: ../assets/campaigns/09-Adventures-in-the-Shackles/ebaleke-home.png

- path: 9
name: Zun K'thon Island
img: ../assets/campaigns/09-Adventures-in-the-Shackles/zunkton1.jpg
- path: 9
name: Zun K'thon Welcome Party
img: ../assets/campaigns/09-Adventures-in-the-Shackles/zunkton2.jpg
- path: 9
name: Zun K'thon Traps
img: ../assets/campaigns/09-Adventures-in-the-Shackles/zunkton3.jpg
- path: 9
name: Sunken Boat
img: ../assets/campaigns/09-Adventures-in-the-Shackles/sunkenboat.jpg
- path: 9
name: Extract from text by Rigelor, priestess of Bast
img: ../assets/campaigns/09-Adventures-in-the-Shackles/desert1.jpg
- path: 9
name: Island of Rigelor
img: ../assets/campaigns/09-Adventures-in-the-Shackles/desert2.jpg
3 changes: 3 additions & 0 deletions _includes/navigation.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
</div>
</li>
{% endfor %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="{{ site.baseurl }}/RulesMagic/spells.html" >Spells</a>
</li>
</ul>
</div>
</nav>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions docs/_Classes/fighter.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ The following additions are made to the general rest rules.

| Long rest |
|:-|
| After a short rest: |
| After a long rest: |
| * Regain ***Superiority*** equal to your proficiency bonus.
| |
| Add the following class specific benefits to choose from: |
Expand All @@ -196,7 +196,7 @@ In addition you always have access to the ***Action Surge*** maneuver (see below
To use a maneuver, you have to spend ***Superiority***. Most maneuvers require you to spend 2 superiority, some cost only 1, and the action surge maneuver costs 4. The amount of superiority you have per level as shown in the Fighter table.

#### Superiority Dice
Some maneuvers have effects based on your superiority die. You start with a d6, and it increases as you level, as shown in the Fighter table.
Some maneuvers have effects based on your superiority die. You start with a d4, and it increases as you level, as shown in the Fighter table.

#### Saving Throws
Some of your maneuvers require your target to make a saving throw to resist their effects. The saving throw DC is calculated as follows:
Expand Down
2 changes: 1 addition & 1 deletion docs/_Classes/paladin.md
Original file line number Diff line number Diff line change
Expand Up @@ -2953,7 +2953,7 @@ You learn the following two Channel Divinity options.
- #### Invoke Legacy
You call upon the spirits of those who have passed, granting your targets inspiration. Each target gains a Spirit die. A Spirit die can be used to add a d8 to one ability check, attack roll, or saving throw that they make.

This can be made after making the roll but before the results are revealed. If the bonus is not used before 10 minutes have passed, a target instead gains 1d8 temprary hp.
This can be made after making the roll but before the results are revealed. If the bonus is not used before 10 minutes have passed, a target instead gains 1d8 temporary hp.

- #### Turn Machination
You can use your Channel Divinity to abjure fabricated locomotion. Each construct or undead that can see or hear you within 30 ft of you must make a Wisdom saving throw. If the creature fails its saving throw, it is turned for 1 minute or until it takes damage.
Expand Down
2 changes: 1 addition & 1 deletion docs/_RulesCharacter/skills_combat.md
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ The training to fight and defend in a formation, in which the presence of friend
Your training includes watching your flanks and making it harder to pass. Creatures provoke opportunity attacks from you even if they take the Disengage action before leaving your reach.

<details><summary>Stand Your Ground</summary>
During combat, if at the end of your turn you have not moved, gain 3 temporary hit points. These temprary hit points last for 1 minute.
During combat, if at the end of your turn you have not moved, gain 3 temporary hit points. These temporary hit points last for 1 minute.
</details>
</details>

Expand Down

0 comments on commit 29b6edc

Please sign in to comment.