Merge pull request MUnique#652 from ze-dom/skill_multipliers_addition_and_refactoring

Skill multipliers addition and refactoring

Author: sven-n

src/DataModel/Configuration/Skill.cs

@@ -223,9 +223,9 @@ public partial class Skill
     /// </summary>
     /// <remarks>
     /// For example, horse skill:
-    ///  * new AttributeRelationship(Stats.SkillDamageBonus, 1.0f / 10, Stats.TotalStrength)
-    ///  * new AttributeRelationship(Stats.SkillDamageBonus, 1.0f / 5, Stats.TotalLeadership)
-    ///  * new AttributeRelationship(Stats.SkillDamageBonus, 10, Stats.HorseLevel).
+    ///  * new AttributeRelationship(Stats.SkillBaseDamageBonus, 1.0f / 10, Stats.TotalStrength)
+    ///  * new AttributeRelationship(Stats.SkillBaseDamageBonus, 1.0f / 5, Stats.TotalLeadership)
+    ///  * new AttributeRelationship(Stats.SkillBaseDamageBonus, 10, Stats.HorseLevel).
     /// </remarks>
     [MemberOfAggregate]
     public virtual ICollection<AttributeRelationship> AttributeRelationships { get; protected set; } = null!;

src/GameLogic/AttackableExtensions.cs

@@ -193,7 +193,25 @@ public static async ValueTask<HitInfo> CalculateDamageAsync(this IAttacker attac
 
         if (skill != null)
         {
-            dmg = (int)(dmg * attacker.Attributes[Stats.SkillMultiplier]);
+            var multiplier = attacker.Attributes[Stats.SkillMultiplier];
+
+            if (skill.EnsureSkillAttributes(attacker.Attributes) is { } skillAttributes)
+            {
+                dmg += (int)skillAttributes[Stats.SkillFinalDamageBonus];
+
+                var skillMultiplier = skillAttributes[Stats.SkillFinalMultiplier];
+                if (skillMultiplier > 0)
+                {
+                    multiplier = skillMultiplier;
+
+                    if (skill.Skill!.Number == 265 && !isPvp) // DragonSlasher
+                    {
+                        multiplier *= 3;
+                    }
+                }
+            }
+
+            dmg = (int)(dmg * multiplier * damageFactor);
         }
         else if (attacker.Attributes[Stats.IsDinorantEquipped] > 0)
         {
@@ -663,10 +681,10 @@ private static void GetSkillDmg(this IAttacker attacker, SkillEntry? skillEntry,
 
         if (skillEntry.EnsureSkillAttributes(attackerStats) is { } skillAttributes)
         {
-            skillMinimumDamage += (int)skillAttributes[Stats.SkillDamageBonus];
-            skillMaximumDamage += (int)skillAttributes[Stats.SkillDamageBonus];
+            skillMinimumDamage += (int)skillAttributes[Stats.SkillBaseDamageBonus];
+            skillMaximumDamage += (int)skillAttributes[Stats.SkillBaseDamageBonus];
 
-            var multiplier = skillAttributes[Stats.SkillMultiplier];
+            var multiplier = skillAttributes[Stats.SkillBaseMultiplier];
             if (multiplier > 0)
             {
                 skillMinimumDamage = (int)(skillMinimumDamage * multiplier);

src/GameLogic/Attributes/Stats.cs

@@ -329,16 +329,21 @@ public class Stats
     /// <summary>
     /// Gets the final damage (any type) bonus attribute definition.
     /// </summary>
-    /// <remarks>So far includes the ancient set option.</remarks>
+    /// <remarks>Includes the ancient set option and the panda ring bonus.</remarks>
     public static AttributeDefinition FinalDamageBonus { get; } = new(new Guid("88316AEC-1D82-4103-BF09-CA6A3C0B177A"), "Late Damage Bonus (any type)", "A bonus value which gets added to the final damage value during the damage calculation.");
 
     /// <summary>
-    /// Gets the skill multiplier attribute definition.
+    /// Gets the player's skill multiplier attribute definition.
     /// </summary>
     public static AttributeDefinition SkillMultiplier { get; } = new(new Guid("D9FB3323-6DF5-48F7-8253-FDBB5EF82114"), "Skill Damage Multiplier", string.Empty);
 
     /// <summary>
-    /// Gets the skill damage bonus attribute definition.
+    /// Gets the vitality skill multiplier (RF) attribute definition.
+    /// </summary>
+    public static AttributeDefinition VitalitySkillMultiplier { get; } = new(new Guid("5E987FB1-CECB-4703-B7C7-096AAB915672"), "Vitality Skill Damage Multiplier", string.Empty);
+
+    /// <summary>
+    /// Gets the player's skill damage bonus attribute definition.
     /// </summary>
     /// <remarks>Includes ancient set, harmony, and socket (ice and bonus) options. Does not apply to Fenrir's skill.</remarks>
     public static AttributeDefinition SkillDamageBonus { get; } = new(new Guid("B8B214B1-396B-4CA8-9A77-240AA70A989B"), "Skill Damage Bonus", "A bonus value which gets added to the damage calculation when the damage is calculated with a skill.");
@@ -630,6 +635,21 @@ public class Stats
     /// </summary>
     public static AttributeDefinition StickMasteryBonusDamage { get; } = new(new Guid("E79B2B06-9A32-451F-9B2D-2B91FD79B614"), "Stick Mastery PvP Bonus Damage (MST)", string.Empty);
 
+    /// <summary>
+    /// Gets the explosion skill MST bonus damage, which rises with fire tome strengthener and is added late stage.
+    /// </summary>
+    public static AttributeDefinition ExplosionBonusDmg { get; } = new(new Guid("543E01C2-5C61-4473-ACF9-8A63A987A230"), "Explosion Bonus Damage (MST)", "The explosion skill (book of samut) bonus damage, which rises with fire stome strengthener and is added at a late stage.");
+
+    /// <summary>
+    /// Gets the requiem skill MST bonus damage, which rises with wind tome strengthener and is added late stage.
+    /// </summary>
+    public static AttributeDefinition RequiemBonusDmg { get; } = new(new Guid("9354C6C8-5F85-440B-8649-3E18B7539D92"), "Requiem Bonus Damage (MST)", "The requiem skill (book of neil) bonus damage, which rises with wind tome strengthener and is added at a late stage.");
+
+    /// <summary>
+    /// Gets the pollution skill MST bonus damage, which rises with lightning tome strengthener and is added late stage.
+    /// </summary>
+    public static AttributeDefinition PollutionBonusDmg { get; } = new(new Guid("9B7AF584-DB59-4770-BCE9-1B5131BBDE38"), "Pollution Bonus Damage (MST)", "The pollution skill (book of lagle) bonus damage, which rises with lightning tome strengthener and is added at a late stage.");
+
     /// <summary>
     /// Gets the is a scepter equipped.
     /// </summary>
@@ -1338,6 +1358,26 @@ public class Stats
     /// </summary>
     public static AttributeDefinition PointsPerReset { get; } = new(new Guid("a34f4f57-b364-4cdb-9989-64cedd2cd831"), "Points Per Reset", "The number of points the player will receive for reset, overwrites the default 'PointsPerReset' value of the reset configuration.");
 
+    /// <summary>
+    /// Gets the skill's base multiplier attribute definition.
+    /// </summary>
+    public static AttributeDefinition SkillBaseMultiplier { get; } = new(new Guid("FED72F38-5807-454E-8126-F178E93C80D4"), "Skill Base Damage Multiplier (skill attribute)", string.Empty);
+
+    /// <summary>
+    /// Gets the skill's base damage bonus attribute definition.
+    /// </summary>
+    public static AttributeDefinition SkillBaseDamageBonus { get; } = new(new Guid("89E27E6F-2F84-4B69-9DAA-4EE2A6E3BCCC"), "Skill Base Damage Bonus (skill attribute)", string.Empty);
+
+    /// <summary>
+    /// Gets the skill's final multiplier attribute definition.
+    /// </summary>
+    public static AttributeDefinition SkillFinalMultiplier { get; } = new(new Guid("AC72CAE4-973C-46BB-BE3B-F6260E8DDFA8"), "Skill Final Damage Multiplier (skill attribute)", string.Empty);
+
+    /// <summary>
+    /// Gets the skill's final damage bonus attribute definition.
+    /// </summary>
+    public static AttributeDefinition SkillFinalDamageBonus { get; } = new(new Guid("155D8045-5CD1-4238-BEFC-FCF8C46F94E3"), "Skill Final Damage Bonus (skill attribute)", string.Empty);
+
     /// <summary>
     /// Gets the dictionary which relates the jewelry element resistance attribute to the correspondent DMG bonus attribute.
     /// </summary>

src/Persistence/Initialization/CharacterClasses/ClassRageFighter.cs

@@ -87,6 +87,8 @@ private CharacterClass CreateRageFighter(CharacterClassNumber number, string nam
         result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.MaximumPhysBaseDmg, 1.0f / 5, Stats.TotalStrength));
         result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.MinimumPhysBaseDmg, 1.0f / 15, Stats.TotalVitality));
         result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.MaximumPhysBaseDmg, 1.0f / 12, Stats.TotalVitality));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.SkillMultiplier, 0.001f, Stats.TotalEnergy));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.VitalitySkillMultiplier, 0.001f, Stats.TotalVitality));
 
         result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 5, Stats.TotalStrength));
         result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 5, Stats.TotalAgility));
@@ -95,7 +97,8 @@ private CharacterClass CreateRageFighter(CharacterClassNumber number, string nam
 
         result.BaseAttributeValues.Add(this.CreateConstValueAttribute(57, Stats.MaximumHealth));
         result.BaseAttributeValues.Add(this.CreateConstValueAttribute(7, Stats.MaximumMana));
-        result.BaseAttributeValues.Add(this.CreateConstValueAttribute(2, Stats.SkillMultiplier));
+        result.BaseAttributeValues.Add(this.CreateConstValueAttribute(0.5f, Stats.SkillMultiplier));
+        result.BaseAttributeValues.Add(this.CreateConstValueAttribute(0.5f, Stats.VitalitySkillMultiplier));
         result.BaseAttributeValues.Add(this.CreateConstValueAttribute(1.0f / 33f, Stats.AbilityRecoveryMultiplier));
 
         this.AddCommonBaseAttributeValues(result.BaseAttributeValues, isMaster);

src/Persistence/Initialization/Skills/IncreaseHealthEffectInitializer.cs

@@ -46,7 +46,7 @@ public override void Initialize()
 
         var powerUpDefinition = this.Context.CreateNew<PowerUpDefinition>();
         magicEffect.PowerUpDefinitions.Add(powerUpDefinition);
-        powerUpDefinition.TargetAttribute = Stats.MaximumHealth.GetPersistent(this.GameConfiguration);
+        powerUpDefinition.TargetAttribute = Stats.TotalVitality.GetPersistent(this.GameConfiguration);
 
         // one per 10 energy
         var boostPerEnergy = this.Context.CreateNew<AttributeRelationship>();

src/Persistence/Initialization/Skills/WeaknessEffectInitializer.cs

@@ -0,0 +1,48 @@
+// <copyright file="WeaknessEffectInitializer.cs" company="MUnique">
+// Licensed under the MIT License. See LICENSE file in the project root for full license information.
+// </copyright>
+
+namespace MUnique.OpenMU.Persistence.Initialization.Skills;
+
+using MUnique.OpenMU.AttributeSystem;
+using MUnique.OpenMU.DataModel.Attributes;
+using MUnique.OpenMU.DataModel.Configuration;
+using MUnique.OpenMU.GameLogic.Attributes;
+
+/// <summary>
+/// Initializer for the weakness effect, which can result from Killing Blow (RF) or Weakness (Sum) skills.
+/// </summary>
+public class WeaknessEffectInitializer : InitializerBase
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WeaknessEffectInitializer"/> class.
+    /// </summary>
+    /// <param name="context">The context.</param>
+    /// <param name="gameConfiguration">The game configuration.</param>
+    public WeaknessEffectInitializer(IContext context, GameConfiguration gameConfiguration)
+        : base(context, gameConfiguration)
+    {
+    }
+
+    /// <inheritdoc />
+    public override void Initialize()
+    {
+        var magicEffect = this.Context.CreateNew<MagicEffectDefinition>();
+        this.GameConfiguration.MagicEffects.Add(magicEffect);
+        magicEffect.Number = (short)MagicEffectNumber.Weakness;
+        magicEffect.Name = "Weakness Effect";
+        magicEffect.InformObservers = true;
+        magicEffect.SendDuration = false;
+        magicEffect.StopByDeath = true;
+        magicEffect.Duration = this.Context.CreateNew<PowerUpDefinitionValue>();
+        magicEffect.Duration.ConstantValue.Value = 10; // 10 seconds
+
+        // Target's physical damage decreases by 5%
+        var decDmgPowerUpDefinition = this.Context.CreateNew<PowerUpDefinition>();
+        magicEffect.PowerUpDefinitions.Add(decDmgPowerUpDefinition);
+        decDmgPowerUpDefinition.TargetAttribute = Stats.WeaknessPhysDmgDecrement.GetPersistent(this.GameConfiguration);
+        decDmgPowerUpDefinition.Boost = this.Context.CreateNew<PowerUpDefinitionValue>();
+        decDmgPowerUpDefinition.Boost.ConstantValue.Value = 0.05f;
+        decDmgPowerUpDefinition.Boost.ConstantValue.AggregateType = AggregateType.AddRaw;
+    }
+}