Merge pull request #9 from PoESkillTree/poe3.10-gems

PoE 3.10.0 update

Author: brather1ng

PoESkillTree.Engine.Computation.Builders/Stats/GemStatBuilders.cs

@@ -22,6 +22,14 @@ public GemStatBuilders(IStatFactory statFactory) : base(statFactory)
         private IStatBuilder AdditionalLevels(string identityInfix, IGemTagBuilder gemTag) =>
             AdditionalLevels(identityInfix, gemTag, (_, i) => i);
 
+        public IStatBuilder AdditionalLevels(ISkillBuilder skill)
+        {
+            var coreBuilder = new CoreStatBuilderFromCoreBuilder<string>(
+                CoreBuilder.Proxy(skill, (ps, b) => b.Build(ps).Id),
+                (e, t) => StatFactory.FromIdentity($"Gem.AdditionalLevels.{t}", e, typeof(int)));
+            return new StatBuilder(StatFactory, coreBuilder);
+        }
+
         public IStatBuilder AdditionalLevelsForModifierSourceItemSlot() =>
             AdditionalLevels("", GetItemSlot);
 

PoESkillTree.Engine.Computation.Common/Builders/Stats/IGemStatBuilders.cs

@@ -12,6 +12,8 @@ public interface IGemStatBuilders
         IStatBuilder AdditionalActiveLevels(IGemTagBuilder gemTag);
         IStatBuilder AdditionalActiveSpellLevels(IGemTagBuilder gemTag);
 
+        IStatBuilder AdditionalLevels(ISkillBuilder skill);
+
         IStatBuilder AdditionalLevelsForModifierSourceItemSlot();
         IStatBuilder AdditionalLevelsForModifierSourceItemSlot(IGemTagBuilder gemTag);
         IStatBuilder AdditionalActiveLevelsForModifierSourceItemSlot();

PoESkillTree.Engine.Computation.Console/Program.cs

@@ -94,15 +94,15 @@ private async Task<bool> HandleDataUpdateCommandAsync(string command)
                     _dataUpdater.Value.UpdateSkillTreeStatLines(
                         command.Substring("update SkillTreeStatLines ".Length));
                     return true;
+                case "update RePoE":
+                    await _dataUpdater.Value.UpdateRePoEAsync();
+                    return true;
                 case "update ParseableBaseItems":
                     await _dataUpdater.Value.UpdateParseableBaseItemsAsync();
                     return true;
                 case "update ItemAffixes":
                     await _dataUpdater.Value.UpdateItemAffixesAsync();
                     return true;
-                case "update RePoE":
-                    await _dataUpdater.Value.UpdateRePoEAsync();
-                    return true;
                 case "update Uniques":
                     await _dataUpdater.Value.UpdateUniquesAsync();
                     return true;

PoESkillTree.Engine.Computation.Data/Collections/ValueConversionMatcherCollection.cs

@@ -23,9 +23,9 @@ public void Add([RegexPattern] string regex, Func<ValueBuilder, ValueBuilder> fu
             Add(regex, ModifierBuilder.WithValueConverter(func.ToValueConverter()), substitution);
         }
 
-        public void Add([RegexPattern] string regex, ValueBuilder multiplier)
+        public void Add([RegexPattern] string regex, ValueBuilder multiplier, string substitution = "")
         {
-            Add(regex, v => v * multiplier);
+            Add(regex, v => v * multiplier, substitution);
         }
 
         public void Add(

PoESkillTree.Engine.Computation.Data/ConditionMatchers.cs

@@ -150,7 +150,7 @@ protected override IReadOnlyList<MatcherData> CreateCollection() =>
                 { "with maces", AttackWithSkills(Tags.Mace) },
                 { "to mace attacks", AttackWithSkills(Tags.Mace) },
                 { "with maces (and|or) sceptres", AttackWithSkillsEither(Tags.Mace, Tags.Sceptre) },
-                { "to mace and sceptre attacks", AttackWithSkillsEither(Tags.Mace, Tags.Sceptre) },
+                { "to mace (and|or) sceptre attacks", AttackWithSkillsEither(Tags.Mace, Tags.Sceptre) },
                 { "mace or sceptre attacks deal", AttackWithEither(Tags.Mace, Tags.Sceptre) },
                 {
                     "with (a mace|maces), sceptres? or (staff|staves)",
@@ -408,8 +408,8 @@ protected override IReadOnlyList<MatcherData> CreateCollection() =>
                 { "shard", Stat.MainSkillPart.Value.Eq(1) }, // Spectral Shield Throw
                 { "at maximum charge distance", Stat.MainSkillPart.Value.Eq(1) }, // Shield Charge
                 // - socketed
-                { "socketed gems", Condition.MainSkillHasModifierSourceItemSlot },
-                { "socketed gems (deal|have)", Condition.MainSkillHasModifierSourceItemSlot },
+                { "socketed (skills|gems)", Condition.MainSkillHasModifierSourceItemSlot },
+                { "socketed (skills|gems) (deal|have)", Condition.MainSkillHasModifierSourceItemSlot },
                 { "socketed attacks have", And(Condition.With(DamageSource.Attack), Condition.MainSkillHasModifierSourceItemSlot) },
                 { "socketed spells have", And(Condition.With(DamageSource.Spell), Condition.MainSkillHasModifierSourceItemSlot) },
                 // - other

PoESkillTree.Engine.Computation.Data/FormAndStatMatchers.cs

@@ -116,6 +116,13 @@ protected override IReadOnlyList<MatcherData> CreateCollection() =>
                     PercentMore, Value * ValueFactory.LinearScale(OpponentsOfSelf.Distance, (15, 1), (40, 0)),
                     Damage.With(Keyword.Melee)
                 },
+                {
+                    "#% chance for ({AilmentMatchers}) inflicted with this weapon to deal #% more damage",
+                    (PercentMore, Values[0].AsPercentage * Values[1], Damage.With(Reference.AsAilment),
+                        ModifierSourceIs(ItemSlot.MainHand).And(MainHandAttack)),
+                    (PercentMore, Values[0].AsPercentage * Values[1], Damage.With(Reference.AsAilment),
+                        ModifierSourceIs(ItemSlot.OffHand).And(OffHandAttack))
+                },
                 // - damage taken
                 {
                     "cold damage taken increased by chill effect",
@@ -219,12 +226,10 @@ protected override IReadOnlyList<MatcherData> CreateCollection() =>
                 // - projectiles
                 { "fires? # additional projectiles", BaseAdd, Value, Projectile.Count },
                 { "fires? # additional arrows", BaseAdd, Value, Projectile.Count, With(Keyword.Attack) },
+                { "bow attacks fire # additional arrows", BaseAdd, Value, Projectile.Count, And(With(Keyword.Attack), With(Keyword.Bow)) },
                 { "fires? an additional projectile", BaseAdd, 1, Projectile.Count },
                 { "fires? an additional arrow", BaseAdd, 1, Projectile.Count, With(Keyword.Attack) },
-                {
-                    "bow attacks fire an additional arrow",
-                    BaseAdd, 1, Projectile.Count, And(With(Keyword.Attack), MainHand.Has(Tags.Bow))
-                },
+                { "bow attacks fire an additional arrow", BaseAdd, 1, Projectile.Count, And(With(Keyword.Attack), MainHand.Has(Tags.Bow)) },
                 { "skills fire an additional projectile", BaseAdd, 1, Projectile.Count },
                 { "attack skills fire an additional projectile", BaseAdd, 1, Projectile.Count, With(Keyword.Attack) },
                 { "skills fire # additional projectiles", BaseAdd, Value, Projectile.Count },
@@ -285,6 +290,10 @@ protected override IReadOnlyList<MatcherData> CreateCollection() =>
                 { "converts all evasion rating to armour", TotalOverride, 100, Evasion.ConvertTo(Armour) },
                 { "cannot evade enemy attacks", TotalOverride, 0, Evasion.Chance },
                 { @"\+# evasion rating", BaseAdd, Value, Evasion },
+                {
+                    "#% increased energy shield from body armour",
+                    PercentIncrease, Value, EnergyShield, Condition.BaseValueComesFrom(ItemSlot.BodyArmour)
+                },
                 // - resistances
                 { "immune to ({DamageTypeMatchers}) damage", TotalOverride, 100, Reference.AsDamageType.Resistance },
                 { @"\+#% elemental resistances", BaseAdd, Value, Elemental.Resistance },
@@ -402,6 +411,7 @@ protected override IReadOnlyList<MatcherData> CreateCollection() =>
                     BaseAdd, Values[0].AsPercentage * Values[1].PercentOf(Reference.AsStat), Reference.AsPoolStat.Gain
                 },
                 // charges
+                { "maximum # ({ChargeTypeMatchers})", TotalOverride, Value, Reference.AsChargeType.Amount.Maximum },
                 {
                     "#% chance to gain a power, frenzy or endurance charge",
                     BaseAdd, Value / 3,

PoESkillTree.Engine.Computation.Data/GeneralStatMatchers.cs

@@ -519,6 +519,7 @@ protected override IReadOnlyList<MatcherData> CreateCollection() =>
                 // gem level
                 { "level of all ({GemTagMatchers}) skill gems", Gem.AdditionalActiveLevels(Reference.AsGemTag) },
                 { "level of all ({GemTagMatchers}) spell skill gems", Gem.AdditionalActiveSpellLevels(Reference.AsGemTag) },
+                { "level of all ({SkillMatchers}) gems", Gem.AdditionalLevels(Reference.AsSkill) },
                 { "level of socketed gems", Gem.AdditionalLevelsForModifierSourceItemSlot() },
                 { "level of socketed active skill gems", Gem.AdditionalActiveLevelsForModifierSourceItemSlot() },
                 { "level of socketed ({GemTagMatchers}) gems", Gem.AdditionalLevelsForModifierSourceItemSlot(Reference.AsGemTag) },
@@ -531,8 +532,11 @@ protected override IReadOnlyList<MatcherData> CreateCollection() =>
                 { "quality of socketed support gems", Gem.AdditionalSupportQualityForModifierSourceItemSlot },
                 // other
                 { "reflected damage taken", AnyDamageType.ReflectedDamageTaken },
+                { "take reflected damage", AnyDamageType.ReflectedDamageTaken },
                 { "reflected elemental damage taken", Elemental.ReflectedDamageTaken },
+                { "take reflected elemental damage", Elemental.ReflectedDamageTaken },
                 { "reflected physical damage taken", Physical.ReflectedDamageTaken },
+                { "take reflected physical damage", Physical.ReflectedDamageTaken },
                 { "damage taken gained as mana over 4 seconds when hit", Stat.DamageTakenGainedAsMana },
                 { "character size", Stat.IndependentMultiplier("CharacterSize") },
                 { "light radius", Stat.IndependentMultiplier("LightRadius") },

PoESkillTree.Engine.Computation.Data/GivenStats/CharacterGivenStats.cs

@@ -96,7 +96,7 @@ private GivenStatCollection CreateCollection() => Expand(new GivenStatCollection
             { BaseSet, Totems.CombinedInstances.Maximum, 1 },
             { BaseSet, Stat.Totem.BaseTime, 0.6 },
             { BaseSet, Stat.Trap.BaseTime, 0.5 },
-            { BaseSet, Stat.Mine.BaseTime, 0.5 },
+            { BaseSet, Stat.Mine.BaseTime, 0.3 },
             // rage
             { BaseSet, Charge.Rage.Amount.Maximum, 50 },
             { BaseSet, Charge.RageEffect, 1 },

PoESkillTree.Engine.Computation.Data/GivenStats/CommonGivenStats.cs

@@ -84,7 +84,6 @@ public CommonGivenStats(IBuilderFactories builderFactories, IModifierBuilder mod
             { BaseSet, Charge.Frenzy.Amount.Maximum, 3 },
             { BaseSet, Charge.Power.Amount.Maximum, 3 },
             { BaseSet, Charge.From(ChargeType.GhostShroud).Amount.Maximum, 3 },
-            { BaseSet, Charge.From(ChargeType.Intensity).Amount.Maximum, 4 },
             { BaseSet, Charge.From(ChargeType.Inspiration).Amount.Maximum, 5 },
             { BaseSet, Charge.Endurance.Amount.Minimum, 0 },
             { BaseSet, Charge.Frenzy.Amount.Minimum, 0 },

PoESkillTree.Engine.Computation.Data/GivenStats/EffectStats.cs

@@ -66,9 +66,9 @@ public EffectStats(IBuilderFactories builderFactories, IModifierBuilder modifier
             { Buff.Rampage, PercentIncrease, Stat.MovementSpeed.For(Entity.Minion), (Buff.Rampage.StackCount.Value / 10).Floor() },
             { Buff.Rampage, PercentIncrease, Damage.For(Entity.Minion), (2 * Buff.Rampage.StackCount.Value / 10).Floor() },
             { Buff.Withered, PercentIncrease, Chaos.Damage.Taken, 6 * Buff.Withered.StackCount.Value },
-            { Buff.Elusive, BaseAdd, Stat.Dodge.AttackChance, 20 },
-            { Buff.Elusive, BaseAdd, Stat.Dodge.SpellChance, 20 },
-            { Buff.Elusive, PercentIncrease, Stat.MovementSpeed, 40 },
+            { Buff.Elusive, BaseAdd, Stat.Dodge.AttackChance, 15 },
+            { Buff.Elusive, BaseAdd, Stat.Dodge.SpellChance, 15 },
+            { Buff.Elusive, PercentIncrease, Stat.MovementSpeed, 30 },
         };
     }
 }