minor fixes

Smole · Apr 14, 2023 · 5194df8 · 5194df8
1 parent 01aea3a
commit 5194df8
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 33 deletions.
diff --git a/SolastaUnfinishedBusiness/Infusions/InfusionsBuilders.cs b/SolastaUnfinishedBusiness/Infusions/InfusionsBuilders.cs
@@ -162,7 +162,7 @@ public static void Build()
             powers.Add(power);
         }
 
-        var masterPower = BuildInfuseItemPowerInvocation(2, name, sprite, FeatureDefinitionPowerSharedPoolBuilder
+        var masterPower = BuildInfuseItemPowerInvocation(1, name, sprite, FeatureDefinitionPowerSharedPoolBuilder
             .Create($"Power{name}")
             .SetGuiPresentation(name, Category.Feature, sprite)
             .SetSharedPool(ActivationTime.Action, InventorClass.InfusionPool)

diff --git a/SolastaUnfinishedBusiness/Subclasses/MartialTactician.cs b/SolastaUnfinishedBusiness/Subclasses/MartialTactician.cs
@@ -52,14 +52,10 @@ internal MartialTactician()
             .AddFeaturesAtLevel(3, BuildEverVigilant(), BuildSharpMind(), GambitPool, Learn4Gambit)
             .AddFeaturesAtLevel(7, BuildSharedVigilance(), BuildGambitPoolIncrease(), Learn2Gambit, unlearn, BuildGambitDieSize(DieType.D8))
             .AddFeaturesAtLevel(10, strategicPlan, BuildGambitDieSize(DieType.D10))
-            .AddFeaturesAtLevel(15, BuildBattleClarity(), Learn2Gambit, unlearn)
+            .AddFeaturesAtLevel(15, BuildBattleClarity(), BuildGambitPoolIncrease(), Learn2Gambit, unlearn)
             .AddFeaturesAtLevel(18, BuildTacticalSurge(), BuildGambitDieSize(DieType.D12))
             .AddToDB();
 
-        // BACKWARD COMPATIBILITY
-        BuildGambitPoolIncrease(); // build PowerUseModifierTacticianGambitPool01
-        BuildGambitPoolIncrease(); // build PowerUseModifierTacticianGambitPool02
-
         BuildGambits();
     }
 

diff --git a/SolastaUnfinishedBusiness/Subclasses/RoguishAcrobat.cs b/SolastaUnfinishedBusiness/Subclasses/RoguishAcrobat.cs
@@ -152,7 +152,7 @@ internal RoguishAcrobat()
             .AddFeaturesAtLevel(3,
                 proficiencyAcrobatConnoisseur,
                 attributeModifierAcrobatDefender,
-                featureAcrobatWarrior, powerHeroicUncannyDodge)
+                featureAcrobatWarrior)
             .AddFeaturesAtLevel(9,
                 featureSetSwiftWind)
             .AddFeaturesAtLevel(13,
@@ -223,6 +223,13 @@ public IEnumerator DefenderBeforeAttackHitConfirmed(
                 yield break;
             }
 
+            var rulesetMe = me.RulesetCharacter;
+
+            if (!rulesetMe.CanUsePower(_featureDefinitionPower))
+            {
+                yield break;
+            }
+
             if (!me.CanReact())
             {
                 yield break;
@@ -248,7 +255,7 @@ public IEnumerator DefenderBeforeAttackHitConfirmed(
 
             attackModifier.damageRollReduction = Int32.MaxValue;
 
-            GameConsoleHelper.LogCharacterUsedPower(me.RulesetCharacter, _featureDefinitionPower);
+            GameConsoleHelper.LogCharacterUsedPower(rulesetMe, _featureDefinitionPower);
         }
     }
 }
diff --git a/SolastaUnfinishedBusiness/Subclasses/SorcerousSorrAkkath.cs b/SolastaUnfinishedBusiness/Subclasses/SorcerousSorrAkkath.cs
@@ -180,23 +180,24 @@ internal SorcerousSorrAkkath()
 
         const string TOUCH_OF_DARKNESS_NAME = $"FeatureSet{Name}{TouchOfDarkness}";
 
+        var effectTouchOfDarkness = EffectDescriptionBuilder
+            .Create()
+            .SetDurationData(DurationType.Instantaneous)
+            .SetParticleEffectParameters(VampiricTouch)
+            .SetTargetingData(Side.Enemy, RangeType.MeleeHit, 1, TargetType.IndividualsUnique)
+            .SetEffectForms(
+                EffectFormBuilder
+                    .Create()
+                    .SetDamageForm(DamageTypeNecrotic, 8, DieType.D8, 0, HealFromInflictedDamage.Half)
+                    .Build())
+            .Build();
+
         var powerTouchOfDarknessFixed = FeatureDefinitionPowerBuilder
             .Create($"Power{Name}{TouchOfDarkness}Fixed")
             .SetGuiPresentation(TOUCH_OF_DARKNESS_NAME, Category.Feature, VampiricTouch)
             .SetUsesFixed(ActivationTime.Action, RechargeRate.LongRest, 1, 3)
             .SetUseSpellAttack()
-            .SetEffectDescription(
-                EffectDescriptionBuilder
-                    .Create()
-                    .SetDurationData(DurationType.Instantaneous)
-                    .SetParticleEffectParameters(VampiricTouch)
-                    .SetTargetingData(Side.Enemy, RangeType.MeleeHit, 1, TargetType.IndividualsUnique)
-                    .SetEffectForms(
-                        EffectFormBuilder
-                            .Create()
-                            .SetDamageForm(DamageTypeNecrotic, 8, DieType.D8, 0, HealFromInflictedDamage.Half)
-                            .Build())
-                    .Build())
+            .SetEffectDescription(effectTouchOfDarkness)
             .AddToDB();
 
         powerTouchOfDarknessFixed.SetCustomSubFeatures(
@@ -207,17 +208,7 @@ internal SorcerousSorrAkkath()
             .SetGuiPresentation(TOUCH_OF_DARKNESS_NAME, Category.Feature, VampiricTouch)
             .SetUsesFixed(ActivationTime.Action, RechargeRate.SorceryPoints, 4, 0)
             .SetUseSpellAttack()
-            .SetEffectDescription(
-                EffectDescriptionBuilder
-                    .Create(VampiricTouch)
-                    .SetDurationData(DurationType.Instantaneous)
-                    .SetTargetingData(Side.Enemy, RangeType.MeleeHit, 1, TargetType.IndividualsUnique)
-                    .SetEffectForms(
-                        EffectFormBuilder
-                            .Create()
-                            .SetDamageForm(DamageTypeNecrotic, 8, DieType.D8, 0, HealFromInflictedDamage.Full)
-                            .Build())
-                    .Build())
+            .SetEffectDescription(effectTouchOfDarkness)
             .AddToDB();
 
         powerTouchOfDarknessPoints.SetCustomSubFeatures(

diff --git a/SolastaUnfinishedBusiness/Subclasses/WayOfTheDiscordance.cs b/SolastaUnfinishedBusiness/Subclasses/WayOfTheDiscordance.cs
@@ -40,7 +40,7 @@ internal WayOfTheDiscordance()
                     .SetEffectForms(
                         EffectFormBuilder
                             .Create()
-                            .SetDamageForm(DamageTypePsychic, 1, DieType.D4)
+                            .SetDamageForm(DamageTypeNecrotic, 1, DieType.D4)
                             .Build())
                     .Build())
             .AddToDB();
@@ -88,7 +88,7 @@ internal WayOfTheDiscordance()
                             EffectFormBuilder
                                 .Create()
                                 .HasSavingThrow(EffectSavingThrowType.HalfDamage)
-                                .SetDamageForm(DamageTypePsychic, 2 + i, DieType.D6)
+                                .SetDamageForm(DamageTypeNecrotic, 2 + i, DieType.D6)
                                 .Build(),
                             EffectFormBuilder
                                 .Create()