Revised PA and GWFS

Combat/Melee/Power/index.md

@@ -8,4 +8,8 @@ grand_parent: Combat
 *Attack*<br>
 **Actions:** 1
 
-Before you make an attack with a melee weapon using your Strength modifier, you can choose to suffer disadvantage on the attack roll and attempt to put more of your raw strength behind a powerful blow. If the attack hits, you roll the damage dice twice and take the better result.
+When you take the [Strike](https://stormchaserroleplaying.com/stormchaserRPG/Combat/Actions/Strike/) action using your Strength modifier, you can choose to take -1d to the attack roll and attempt to put more of your raw strength behind a powerful blow. 
+
+If the attack hits, you roll the damage dice twice and take the better result. Additionally, the target's speed is reduced by half and can't take the [Dodge](https://stormchaserroleplaying.com/stormchaserRPG/Combat/Actions/Dodge/) or [Step](https://stormchaserroleplaying.com/stormchaserRPG/Combat/Moves/Step/) actions until the beginning of your next turn.
+
+If you miss, you are [Flat-Footed](https://stormchaserroleplaying.com/stormchaserRPG/Conditions/Flatfooted/) until the beginning of your next turn.

Introduction/Credits/index.md

@@ -23,4 +23,4 @@ Many thanks to all of my dedicated patrons and the members of the Stormchaser Ro
 * Sphynxy - Playtesting
 * Trent - Cleric, Druid, Ranger, Sorcerer and Warlock Talent Branches, Spells, Playtesting
 
-* Daniel Duane Harcourt (August 1978 — December 2021). The Witcher archetype was written in collaboration with and is dedicated to our friend, fellow player, games master and brewer... We miss you, Dan. Rest in peace.
+* Daniel Duane Harcourt (August 1978 — December 2021). The witcher branch of the ranger talent tree was written in collaboration with and is dedicated to our friend, fellow player, games master and brewer... We miss you, Dan. Rest in peace.

Skills/+1dand-1d/index.md → Introduction/Playing/+1d/index.md

@@ -1,7 +1,8 @@
 ---
 title: +1d and -1d
-parent: Skills
-nav_order: 2
+parent: Playing the Game
+grand_parent: Introduction
+nav_order: 4
 ---
 
 # +1d and -1d

Introduction/Playing/Terms/index.md

@@ -2,7 +2,7 @@
 title: Key Terms
 parent: Playing the Game
 grand_parent: Introduction
-nav_order: 4
+nav_order: 5
 ---
 
 # Key Terms

Skills/Subskills/index.md

@@ -1,7 +1,7 @@
 ---
 title: Subskills
 parent: Skills
-nav_order: 3
+nav_order: 2
 ---
 
 # Subskills

Talents/Combat/index.md

@@ -89,13 +89,6 @@ You have +1d on initiative.
 #### **Cost:** 5 Character Points
 While wielding a double-bladed weapon with two hands, the weapon has the finesse trait for your attacks with it.
 
-## Savage Attacker
-
-<div style="margin-top:-10px;"></div>
-
-#### **Cost:** 5 Character Points
-Once per turn, when you roll damage for a melee weapon attack with which you are proficient, you can reroll the weapon's damage dice and use either total.
-
 ## Titan's Power
 
 <div style="margin-top:-10px;"></div>

Talents/Fighting/Duelist/index.md → Talents/Fighting/Dueling/index.md

@@ -1,10 +1,10 @@
 ---
-title: Duelist
+title: Dueling
 parent: Fighting Styles
 grand_parent: Talents
 ---
 
-# Duelist Fighting Style
+# Dueling Fighting Style
 
 ## Style
 
@@ -13,14 +13,13 @@ grand_parent: Talents
 #### **Cost:** 5 Character Points
 You are skilled in the art of fighting with a single weapon. While you are wielding a weapon with which you are proficient in one hand and no other weapons, you gain the following benefit:
 * You have +1d on feint attempts and to avoid being disarmed.
-* Once on each of your turns, drawing or stowing a one-handed weapon no longer requires your object interaction.
+* Once on each of your turns, drawing or stowing a one-handed weapon is a free action.
 
 ## Mastery
 
 <div style="margin-top:-10px;"></div>
 
-#### **Cost:** 10 Character Points<br>**Prerequisite:** Duelist Fighting Style
+#### **Cost:** 10 Character Points<br>**Prerequisite:** Dueling Fighting Style
 You've mastered the art of fighting with a single weapon, making one weapon feel like many. While you are wielding a weapon with which you are proficient in one hand and no other weapons, you gain the following benefits:
-* When you miss with a weapon attack on your turn, you have +1d on your next attack against the same target. Any modifications to the original attack roll, such as +1d, or -1d, also affect this attack roll.
-* Each round, the first time that a creature hits you with a melee attack, if +1 to your defence score would cause the attack to miss, then the attack misses.
-
+* When you miss with a weapon attack on your turn, you have +1d on your next attack against the same target.
+* Each round, the first time that a creature hits you with a melee attack, if +1d to your defence score would cause the attack to miss, then the attack misses.

Talents/Fighting/Great/index.md

@@ -0,0 +1,27 @@
+---
+title: Great Weapon
+parent: Fighting Styles
+grand_parent: Talents
+---
+
+# Great Weapon Fighting Style
+
+## Style
+
+<div style="margin-top:-10px;"></div>
+
+#### **Cost:** 5 Character Points
+You are skilled at putting the weight of a weapon to your advantage. While you are wielding a melee weapon with the two-handed property with which you are proficient, you gain the following benefit:
+* When you make a melee attack and the attack roll hits both the target's strength and dexterity defences, then the target suffers damage as normal and is shoved as per the [Shove](https://stormchaserroleplaying.com/stormchaserRPG/Combat/Melee/Shove/) action.
+* Grasping a two-handed weapon you are wielding in only one hand with your other hand is a free action.
+
+## Mastery
+
+<div style="margin-top:-10px;"></div>
+
+#### **Cost:** 10 Character Points<br>**Prerequisite:** Great Weapon Fighting Style
+You've mastered putting the weight of a weapon to your advantage, letting its momentum empower your strikes. While you are wielding a melee weapon with the two-handed property with which you are proficient, you gain the following benefits:
+* On your turn, when you score a critical hit, or reduce a creature to 0 hit points with a melee weapon, you have +1d on your next melee weapon attack.
+* ~~When you miss with a melee weapon attack, you can use your bonus action to repeat the attack against the same target. Any modifications to the original attack roll, such as advantage, disadvantage, or without your proficiency bonus, also affect this attack roll. On a hit, this attack deals bludgeoning damage equal to your Strength modifier.~~ Rework to apply shock damage on miss?
+* Before you make a melee weapon attack, you can choose to suffer -1d. If the attack hits, your weapon dice deal maximum damage.
+* While wielding the weapon in two hands, you have +1d to avoid being disarmed.

Talents/Fighting/index.md

@@ -6,20 +6,6 @@ has_children: true
 
 # Fighting Styles
 
-## Great Weapon
-
-### Style
-You are skilled at putting the weight of a weapon to your advantage. While you are wielding a melee weapon with the two-handed property with which you are proficient, you gain the following benefit:
-- When you roll a 1 or 2 on a weapon damage die, you can reroll the die once and keep the better result.
-- Grasping a two-handed weapon you are wielding in only one hand with your other hand no longer requires your object interaction.
-
-### Mastery
-You've mastered putting the weight of a weapon to your advantage, letting its momentum empower your strikes. While you are wielding a melee weapon with the two-handed property with which you are proficient, you gain the following benefits:
-- On your turn, when you score a critical hit or reduce a creature to 0 hit points with a melee weapon, you can make one melee weapon attack as a bonus action.
-- When you miss with a melee weapon attack, you can use your bonus action to repeat the attack against the same target. Any modifications to the original attack roll, such as advantage, disadvantage, or without your proficiency bonus, also affect this attack roll. On a hit, this attack deals bludgeoning damage equal to your Strength modifier.
-- Before you make a melee weapon attack, you can choose to forgo your proficiency bonus. If the attack hits, your weapon dice deal maximum damage.
-- While wielding the weapon in two hands, you have advantage on ability checks to avoid being disarmed. Attempts to disarm you suffer disadvantage.
-
 ## Guerrilla
 
 ### Style