Minor rogue fixes

Vek17 · Nov 5, 2024 · 6c54627 · 6c54627
1 parent ed313c1
commit 6c54627
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Version 2.6.10
+* Fixes
+    * Fixed Lethal Stance bonuses sometimes applying twice.
+    * Fixed Crippling Strike prerequisites being broken.
+
 # Version 2.6.9
 * Fixes
     * Fixed issues with alchemist and brown fur spells sometimes breaking with targeting rules changes.

diff --git a/TabletopTweaks-Base/Bugfixes/Classes/Alchemist.cs b/TabletopTweaks-Base/Bugfixes/Classes/Alchemist.cs
@@ -333,7 +333,7 @@ void PatchMedicalDiscovery() {
                     RemoveVivisectionistGroup(DispellingAttack);
 
                     CripplingStrike.TemporaryContext(bp => {
-                        bp.GetComponents<PrerequisiteFeature>(c => c.Feature == AdvanceTalents).ForEach(c => {
+                        bp.GetComponents<PrerequisiteFeaturesFromList>(c => c.Features.Contains(AdvanceTalents)).ForEach(c => {
                             c.Group = Prerequisite.GroupType.Any;
                         });
                         bp.AddPrerequisite<PrerequisiteArchetypeLevel>(c => {

diff --git a/TabletopTweaks-Base/Bugfixes/Classes/Fighter.cs b/TabletopTweaks-Base/Bugfixes/Classes/Fighter.cs
@@ -143,11 +143,13 @@ void PatchTwoHandedWeaponTraining() {
                         Helpers.Create<WeaponGroupAttackBonus>(c => {
                             c.WeaponGroup = (WeaponFighterGroup)AdditionalWeaponFighterGroups.TwoHanded;
                             c.AttackBonus = 1;
+                            c.Descriptor = (ModifierDescriptor)AdditionalModifierDescriptors.Untyped.WeaponTraining;
                             c.contextMultiplier = new ContextValue();
                         }),
                         Helpers.Create<WeaponGroupDamageBonus>(c => {
                             c.WeaponGroup = (WeaponFighterGroup)AdditionalWeaponFighterGroups.TwoHanded;
                             c.DamageBonus = 1;
+                            c.Descriptor = (ModifierDescriptor)AdditionalModifierDescriptors.Untyped.WeaponTraining;
                             c.AdditionalValue = new ContextValue();
                         }),
                         Helpers.Create<WeaponTraining>()
@@ -158,15 +160,6 @@ void PatchTwoHandedWeaponTraining() {
                         c.Level = 5;
                     });
                     TTTContext.Logger.LogPatch("Patched", TwoHandedFighterWeaponTraining);
-                    WeaponTrainingSelection.m_AllFeatures
-                        .Where(feature => !AdvancedWeapontrainingSelection.m_AllFeatures.Contains(feature))
-                        .ForEach(feature => {
-                            var component = feature.Get().GetComponent<WeaponGroupDamageBonus>();
-                            if (component != null) {
-                                component.Descriptor = (ModifierDescriptor)AdditionalModifierDescriptors.Untyped.WeaponTraining;
-                                TTTContext.Logger.LogPatch("Patched", feature.Get());
-                            }
-                        });
                 }
                 void PatchWeaponTrainingStacking() {
                     if (Main.TTTContext.Fixes.Fighter.Base.IsDisabled("WeaponTrainingStacking")) { return; }
@@ -188,7 +181,6 @@ void PatchWeaponTrainingStacking() {
                                 TTTContext.Logger.LogPatch("Patched", feature.Get());
                             }
                         });
-
                 }
                 void PatchUnarmedWeaponTraining() {
                     if (Main.TTTContext.Fixes.Fighter.Base.IsDisabled("UnarmedWeaponTraining")) { return; }
@@ -300,7 +292,7 @@ static bool Prefix(UnitPartWeaponTraining __instance, ref int __result, ItemEnti
             }
         }
 
-        [HarmonyPatch(typeof(WeaponGroupAttackBonus), "OnEventAboutToTrigger", new Type[] { typeof(RuleCalculateAttackBonusWithoutTarget) })]
+        //[HarmonyPatch(typeof(WeaponGroupAttackBonus), "OnEventAboutToTrigger", new Type[] { typeof(RuleCalculateAttackBonusWithoutTarget) })]
         static class WeaponGroupAttackBonus_OnEventAboutToTrigger_Patch {
             static bool Prefix(WeaponGroupAttackBonus __instance, RuleCalculateAttackBonusWithoutTarget evt) {
                 if (Main.TTTContext.Fixes.Fighter.Base.IsDisabled("TwoHandedWeaponTraining")) { return true; }
@@ -329,7 +321,7 @@ static bool Prefix(WeaponGroupAttackBonus __instance, RuleCalculateAttackBonusWi
             }
         }
 
-        [HarmonyPatch(typeof(WeaponGroupDamageBonus), "OnEventAboutToTrigger", new Type[] { typeof(RuleCalculateWeaponStats) })]
+        //[HarmonyPatch(typeof(WeaponGroupDamageBonus), "OnEventAboutToTrigger", new Type[] { typeof(RuleCalculateWeaponStats) })]
         static class WeaponGroupDamageBonus_OnEventAboutToTrigger_Patch {
             static bool Prefix(WeaponGroupDamageBonus __instance, RuleCalculateWeaponStats evt) {
                 if (Main.TTTContext.Fixes.Fighter.Base.IsDisabled("TwoHandedWeaponTraining")) { return true; }

diff --git a/TabletopTweaks-Base/Config/AddedContent.json b/TabletopTweaks-Base/Config/AddedContent.json
@@ -543,6 +543,11 @@
         "Enabled": true,
         "Homebrew": false,
         "Description": "A rogue with this ability can cause living opponents to bleed by hitting them with a sneak attack. This attack causes the target to take 1 additional point of damage each round for each die of the rogue’s sneak attack."
+      },
+      "EmboldeningStrike": {
+        "Enabled": true,
+        "Homebrew": false,
+        "Description": "When a rogue with this talent hits a creature with a melee attack that deals sneak attack damage, she gains a +1 circumstance bonus on saving throws for every 2 sneak attack dice rolled (minimum +1) for 1 round."
       }
     },
     "IsExpanded": true

diff --git a/TabletopTweaks-Base/Info.json b/TabletopTweaks-Base/Info.json
@@ -10,5 +10,5 @@
   "Repository": "https://raw.githubusercontent.com/Vek17/TabletopTweaks-Base/master/Repository.json",
   "Requirements": [ "TabletopTweaks-Core-0.7.7" ],
   "LoadAfter": [ "TabletopTweaks-Core" ],
-  "Version": "2.6.9"
+  "Version": "2.6.10"
 }