Merge pull request #3 from PoESkillTree/poe3.8

Update for PoE 3.8.0

Author: brather1ng

PoESkillTree.Engine.Computation.Builders.Tests/Buffs/BuffBuildersTest.cs

@@ -114,8 +114,8 @@ public void AuraBuildsToCorrectResults()
         [Test]
         public void BuffsWithoutParametersCountBuildsToCorrectValue()
         {
-            // Buff properties + conflux + dummy buff and aura + passed buff skills
-            var expected = 14 + 4 + 2 + 3;
+            // Buff properties + conflux + dummy buffs + passed buff skills
+            var expected = 14 + 4 + 3 + 3;
             // For every source entity
             expected *= Enums.GetMemberCount<Entity>();
             var context = Mock.Of<IValueCalculationContext>(c =>
@@ -130,8 +130,8 @@ public void BuffsWithoutParametersCountBuildsToCorrectValue()
         [Test]
         public void BuffsWithParamtersCountBuildsToCorrectValue()
         {
-            // Buff properties + conflux + dummy buff and aura + passed buff skills
-            var expected = 14 + 4 + 2 + 3;
+            // Buff properties + conflux + dummy buffs + passed buff skills
+            var expected = 14 + 4 + 3 + 3;
             var source = new ModifierSourceEntityBuilder();
             var target = new ModifierSourceEntityBuilder();
             var context = Mock.Of<IValueCalculationContext>(c =>

PoESkillTree.Engine.Computation.Builders/Buffs/BuffBuilders.cs

@@ -39,6 +39,7 @@ public BuffBuilders(IStatFactory statFactory, SkillDefinitions skills)
             Impale = Create("Impale");
             Infusion = Create("Infusion");
             Conflux = new ConfluxBuffBuilders(statFactory);
+            GenericMine = Create("Mine");
             CurseLimit = StatBuilderUtils.FromIdentity(statFactory, "CurseLimit", typeof(uint));
 
             var allBuffs = new List<BuffBuilderWithKeywords>
@@ -65,6 +66,7 @@ public BuffBuilders(IStatFactory statFactory, SkillDefinitions skills)
                 new BuffBuilderWithKeywords(Create("Buff")),
                 // Aura effect increase (used for Aura())
                 new BuffBuilderWithKeywords(Create("Aura"), Keyword.Aura),
+                new BuffBuilderWithKeywords(GenericMine, Keyword.Aura, Keyword.Mine),
             };
             var skillBuffBuilders = skills.Skills
                 .Where(s => !s.IsSupport && s.ActiveSkill.ProvidesBuff)
@@ -90,6 +92,7 @@ private BuffBuilder Create(string buffIdentity) =>
         public IBuffBuilder Innervation { get; }
         public IBuffBuilder Impale { get; }
         public IBuffBuilder Infusion { get; }
+        public IBuffBuilder GenericMine { get; }
         public IConfluxBuffBuilders Conflux { get; }
 
         public IStatBuilder Temporary(IStatBuilder gainedStat)

PoESkillTree.Engine.Computation.Builders/Damage/DamageTypeBuilder.cs

@@ -73,6 +73,14 @@ public IDamageTypeBuilder Except(IDamageTypeBuilder type) =>
             new DamageStatBuilder(_statFactory, CoreStat(_statFactory.Damage));
 
         public IDamageRelatedStatBuilder DamageMultiplier =>
+            DamageRelatedStatBuilder.Create(_statFactory, new CompositeCoreStatBuilder(
+                CoreStat(typeof(int), nameof(DamageMultiplierWithCrits)),
+                CoreStat(typeof(int), nameof(DamageMultiplierWithNonCrits))));
+
+        public IDamageRelatedStatBuilder DamageMultiplierWithCrits =>
+            DamageRelatedStatBuilder.Create(_statFactory, CoreStat(typeof(int)));
+
+        public IDamageRelatedStatBuilder DamageMultiplierWithNonCrits =>
             DamageRelatedStatBuilder.Create(_statFactory, CoreStat(typeof(int)));
 
         public IDamageTakenConversionBuilder DamageTakenFrom(IPoolStatBuilder pool)

PoESkillTree.Engine.Computation.Builders/Entities/EntityBuilders.cs

@@ -19,7 +19,7 @@ public class EntityBuilders : IEntityBuilders
         public IEntityBuilder OpponentOfSelf => new ModifierSourceOpponentEntityBuilder();
         public IEnemyBuilder Enemy => new EnemyBuilder(_statFactory);
         public IEntityBuilder Character => new EntityBuilder(Entity.Character);
-        public IEntityBuilder Ally => new EntityBuilder(Entity.Minion, Entity.Totem);
+        public ICountableEntityBuilder Ally => new AllyBuilder(_statFactory);
         public IEntityBuilder Totem => new EntityBuilder(Entity.Totem);
         public IEntityBuilder Minion => new EntityBuilder(Entity.Minion);
         public IEntityBuilder Any => EntityBuilder.AllEntities;
@@ -39,6 +39,10 @@ public ValueBuilder CountNearby
                 => StatBuilderUtils.FromIdentity(_statFactory, "Enemy.CountNearby", typeof(uint),
                     ExplicitRegistrationTypes.UserSpecifiedValue(0)).Value;
 
+            public ValueBuilder CountRareOrUniqueNearby
+                => StatBuilderUtils.FromIdentity(_statFactory, "Enemy.CountRareOrUniqueNearby", typeof(uint),
+                    ExplicitRegistrationTypes.UserSpecifiedValue(0)).Value;
+
             public IConditionBuilder IsRare => StatBuilderUtils.ConditionFromIdentity(_statFactory, "Enemy.IsRare",
                 ExplicitRegistrationTypes.UserSpecifiedValue(false));
 
@@ -50,5 +54,17 @@ public ValueBuilder CountNearby
             public IConditionBuilder IsMoving => StatBuilderUtils.ConditionFromIdentity(_statFactory, "Enemy.IsMoving",
                 ExplicitRegistrationTypes.UserSpecifiedValue(false));
         }
+
+        private class AllyBuilder : EntityBuilder, ICountableEntityBuilder
+        {
+            private readonly IStatFactory _statFactory;
+
+            public AllyBuilder(IStatFactory statFactory) : base(Entity.Minion, Entity.Totem) =>
+                _statFactory = statFactory;
+
+            public ValueBuilder CountNearby
+                => StatBuilderUtils.FromIdentity(_statFactory, "Ally.CountNearby", typeof(uint),
+                    ExplicitRegistrationTypes.UserSpecifiedValue(0)).Value;
+        }
     }
 }

PoESkillTree.Engine.Computation.Builders/Skills/SkillBuilders.cs

@@ -24,7 +24,7 @@ public SkillBuilders(IStatFactory statFactory, SkillDefinitions skills)
         private ISkillBuilderCollection CreateCollection(params IKeywordBuilder[] keywords)
             => new SkillBuilderCollection(_statFactory, keywords, _skills.Skills);
 
-        public ISkillBuilder SummonSkeleton => FromId("SummonSkeletons");
+        public ISkillBuilder SummonSkeletons => FromId("SummonSkeletons");
         public ISkillBuilder VaalSummonSkeletons => FromId("VaalSummonSkeletons");
         public ISkillBuilder RaiseSpectre => FromId("RaiseSpectre");
         public ISkillBuilder RaiseZombie => FromId("RaiseZombie");

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

@@ -88,6 +88,9 @@ public IDamageRelatedStatBuilder Range
         public ValueBuilder UniqueAmount(string name)
             => FromIdentity(name, typeof(uint), UserSpecifiedValue(0)).Value;
 
+        public ValueBuilder UniqueEnum<T>(string name) where T : Enum
+            => FromIdentity(name, typeof(T), UserSpecifiedValue(0)).Value;
+
         public IStatBuilder IndependentMultiplier(string identity)
             => FromIdentity(identity, typeof(uint), IndependentResult(NodeType.Increase));
 
@@ -121,7 +124,7 @@ public MineStatBuilders(IStatFactory statFactory) : base(statFactory, "Mine")
         {
         }
 
-        public IStatBuilder Speed => FromIdentity("LayingSpeed", typeof(double));
+        public IStatBuilder Speed => FromIdentity("ThrowingSpeed", typeof(double));
         public IStatBuilder Duration => FromIdentity(typeof(double));
         public IStatBuilder DetonationAoE => FromIdentity(typeof(int));
     }
@@ -250,6 +253,10 @@ public IStatBuilder IncreasesToSourceApplyToTarget(IStatBuilder source, IStatBui
             => new StatBuilder(StatFactory,
                 new ModifiersApplyToOtherStatCoreStatBuilder(source, target, Form.Increase, StatFactory));
 
+        public IStatBuilder BaseAddsToSourceApplyToTarget(IStatBuilder source, IStatBuilder target)
+            => new StatBuilder(StatFactory,
+                new ModifiersApplyToOtherStatCoreStatBuilder(source, target, Form.BaseAdd, StatFactory));
+
         private class ModifiersApplyToOtherStatCoreStatBuilder : ICoreStatBuilder
         {
             private readonly IStatBuilder _target;

PoESkillTree.Engine.Computation.Common/Builders/Buffs/IBuffBuilders.cs

@@ -56,6 +56,8 @@ public interface IBuffBuilders
         IBuffBuilder Impale { get; }
         IBuffBuilder Infusion { get; }
 
+        IBuffBuilder GenericMine { get; }
+
         /// <summary>
         /// Gets a buff factory that creates Conflux buffs.
         /// </summary>

PoESkillTree.Engine.Computation.Common/Builders/Charges/ChargeType.cs

@@ -10,5 +10,6 @@ public enum ChargeType
         Intensity,
         Challenger,
         Blitz,
+        Inspiration,
     }
 }

PoESkillTree.Engine.Computation.Common/Builders/Damage/IDamageTypeBuilder.cs

@@ -51,6 +51,8 @@ public interface IDamageTypeBuilder : IKeywordBuilder
         /// Gets a stat representing the multiplier to damage of this type.
         /// </summary>
         IDamageRelatedStatBuilder DamageMultiplier { get; }
+        IDamageRelatedStatBuilder DamageMultiplierWithCrits { get; }
+        IDamageRelatedStatBuilder DamageMultiplierWithNonCrits { get; }
 
         /// <summary>
         /// Starts constructing a stat representing the percentage of damage of this stat's damage types that is taken

PoESkillTree.Engine.Computation.Common/Builders/Entities/ICountableEntityBuilder.cs

@@ -0,0 +1,10 @@
+using PoESkillTree.Engine.Computation.Common.Builders.Values;
+
+namespace PoESkillTree.Engine.Computation.Common.Builders.Entities
+{
+    public interface ICountableEntityBuilder : IEntityBuilder
+    {
+
+        ValueBuilder CountNearby { get; }
+    }
+}