Add dark horse options & major dmg calcs refactoring #586

ze-dom · 2025-02-13T22:04:50Z

To do:

Add Update Plugins

Dev changes:

Refactored attack damage and defense calculations 😌.
Extended Attribute/PowerUp entities to include a Stage property to allow for more flexibility and better mimic original calculations. The idea is to group elements by stages within the same ComposableAttribute, thereby allowing sum and multiplication on different levels, whereas before, all sum/multiplication values were bundled together (a single stage). See here and here.
Added InputOperator.Min and InputOperator.Max for AttributeRelationshipElement.
Added MasterSkillDefinition.ExtendsDuration to flag master skills which formula applies to a duration increase (there are several such skills, like Soul Barrier Proficiency).
Added Stats.AttackSpeedAny as a bucket to feed both Stats.AttackSpeed and Stats.MagicSpeed for simplification.
Added Force/Force Wave logic.

Features:

Added Dark Horse options.
Added some transformation jewelry and some pet options (but not to chat /item command).
Added double item option (physical and wizardry) for MG swords.
Added Summoner skill Berserk.
Added Weakness magic effect (RF's Killing Blow, and (in the future) Summoner's Weakness).
Added missing initial CS skills and items for DL and MG.
Added ammo (bolts/arrows) damage increase according to item level.

Fixes:

Item options (physical/wizardry damage apply to both min and max dmg).
Some character base stats and base stats-related attributes.
Sometimes it was not possible to add a MST point due to one of the lower rank skills not meeting level threshold (while another did).
Shield item option.

ze-dom · 2025-02-25T17:42:33Z

src/GameLogic/Player.cs

                || masterSkillTargetAttribute == powerUpDef.TargetAttribute)
            {
-                var additionalValue = new SimpleElement(skillEntry.CalculateValue(), skillEntry.Skill.MasterDefinition?.Aggregation ?? powerUp.AggregateType);
+                var additionalValue = new SimpleElement(masterSkillEntry.CalculateValue(), masterSkillEntry.Skill.MasterDefinition?.Aggregation ?? powerUp.AggregateType);


Before, it would always calculate the value from the formula of the skillEntry and not of the one associated with the current master skill definition. I believe the idea initially was to traverse the related master skill definitions and apply each formula. I have tested it this way with Soul Barrier Strengthener/Soul Barrier Proficiency and works.

ze-dom · 2025-02-25T17:44:08Z

src/GameLogic/Player.cs

+                    .Append(new PowerUpWrapper(
+                        new SimpleElement(1, AggregateType.AddRaw),
+                        pet.IsDarkRaven() ? Stats.RavenLevel : Stats.HorseLevel,
+                        this.Attributes)).ToList();


To trigger the related attributes upon level up. Before, you had to unequip-equip the item.

ze-dom · 2025-02-25T17:57:53Z

src/GameServer/RemoteView/World/NewPlayersInScopeExtendedPlugIn.cs

@@ -85,7 +85,7 @@ int Write()
            packet.Rotation = newPlayer.Rotation.ToPacketByte();
            packet.HeroState = selectedCharacter.State.Convert();
            packet.AttackSpeed = (ushort)(newPlayer.Attributes?[Stats.AttackSpeed] ?? 0);
-            packet.MagicSpeed = (ushort)(newPlayer.Attributes?[Stats.AttackSpeed] ?? 0); // TODO: Implement MagicSpeed
+            packet.MagicSpeed = (ushort)(newPlayer.Attributes?[Stats.MagicSpeed] ?? 0);


ze-dom · 2025-02-25T18:15:06Z

src/Persistence/Initialization/Items/ExcellentOptions.cs

-        definition.PossibleOptions.Add(this.CreateRelatedExcellentOption(5, Stats.MaximumCurseBaseDmg, Stats.Level, 1f / 20f, ItemOptionDefinitionNumbers.ExcellentCurse));
+        definition.PossibleOptions.Add(this.CreateExcellentOption(3, Stats.AttackSpeedAny, 7, AggregateType.AddRaw, ItemOptionDefinitionNumbers.ExcellentCurse));
+        definition.PossibleOptions.Add(this.CreateExcellentOption(4, Stats.ExcellentWizTwoPercentInc, 1.02f, AggregateType.Multiplicate, ItemOptionDefinitionNumbers.ExcellentCurse));
+        definition.PossibleOptions.Add(this.CreateRelatedExcellentOption(5, Stats.ExcellentWizBaseDmg, Stats.TotalLevel, 1f / 20f, ItemOptionDefinitionNumbers.ExcellentCurse));


This is not used. Just to keep up to date.

ze-dom · 2025-02-25T18:26:45Z

src/Persistence/Initialization/Version095d/Items/Weapons.cs

@@ -253,7 +264,7 @@ protected void CreateWeapon(byte @group, byte number, byte slot, int skillNumber
        item.MaximumItemLevel = isAmmunition ? (byte)0 : Constants.MaximumItemLevel;
        item.DropsFromMonsters = dropsFromMonsters;
        item.SetGuid(item.Group, item.Number);
-        if (slot == 0 && knightClass > 0 && width == 1)
+        if (slot == 0 && (knightClass > 0 || magicGladiatorClass > 0) && width == 1)


MG can wield a staff on RH too! 😃

ze-dom · 2025-02-25T18:27:56Z

src/Persistence/Initialization/Version095d/Items/Weapons.cs

        item.BasePowerUpAttributes.Add(maxDamagePowerUp);

-        var speedPowerUp = this.CreateItemBasePowerUpDefinition(Stats.AttackSpeed, attackSpeed, AggregateType.AddRaw);
+        var speedPowerUp = this.CreateItemBasePowerUpDefinition(Stats.AttackSpeedByWeapon, attackSpeed, AggregateType.AddRaw);


Is this OK for 0.95d?

ze-dom · 2025-02-25T18:43:16Z

src/Persistence/Initialization/VersionSeasonSix/Items/Weapons.cs

        {
-            if (ragefighterClass == 0 || number < 3)
+            if (ragefighterClass == 0 || number < 2)


Not relevant. Just for accuracy (only numbers 0 and 1 can be equipped by RF).

ze-dom · 2025-02-25T18:45:00Z

src/Persistence/Initialization/VersionSeasonSix/SkillsInitializer.cs

@@ -60,12 +60,13 @@ internal class SkillsInitializer : SkillsInitializerBase
        { SkillNumber.Heal, MagicEffectNumber.Heal },
        { SkillNumber.Recovery, MagicEffectNumber.ShieldRecover },
        { SkillNumber.InfinityArrow, MagicEffectNumber.InfiniteArrow },
-        { SkillNumber.InfinityArrowStr, MagicEffectNumber.InfiniteArrow },


I removed because it was unnecessary, as the magic effect is inherited from the replaced skill.

ze-dom · 2025-02-25T18:54:00Z

src/Persistence/Initialization/VersionSeasonSix/SkillsInitializer.cs

@@ -758,24 +762,25 @@ private void InitializeMasterSkillData()
        // DL
        this.AddMasterSkillDefinition(SkillNumber.FireBurstStreng, SkillNumber.FireBurst, SkillNumber.Undefined, 2, 2, SkillNumber.FireBurst, 20, Formula502);
        this.AddMasterSkillDefinition(SkillNumber.ForceWaveStreng, SkillNumber.Force, SkillNumber.Undefined, 2, 2, SkillNumber.Force, 20, Formula632);
+        this.AddMasterSkillDefinition((SkillNumber)5090, SkillNumber.Force, SkillNumber.Undefined, 2, 2, SkillNumber.ForceWave, 20, Formula632);


This one gets the damage from ForceWave. The one above gets it from Force.

ze-dom · 2025-02-25T20:34:28Z

src/GameLogic/AttackableExtensions.cs

-        if (isExcellentHit)
+        if (damageType == DamageType.Physical)
+        {
+            if (isExcellentHit)


For physical damage, an excellent hit is also a critical hit:
https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L3679

ze-dom · 2025-02-25T20:36:43Z

src/GameLogic/AttackableExtensions.cs

+                // double wield => 110% dmg (55% + 55%)
+                dmg += dmg;
+                /* There is an ancient set option critical damage subtraction here*/
+            }


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L3711

ze-dom · 2025-02-25T20:39:13Z

src/GameLogic/AttackableExtensions.cs

+                {
+                    dmg = (int)(dmg / 1.5);
+                }
+            }


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/DarkSpirit.cpp#L875

ze-dom · 2025-02-25T20:41:14Z

src/GameLogic/AttackableExtensions.cs

+                classicPvpDuelDmgDec = 1;
+            }
+
+            if (isExcellentHit)


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L4168

ze-dom · 2025-02-25T20:46:15Z

src/GameLogic/AttackableExtensions.cs

+            if (attacker.Attributes[Stats.IsTwoHandedWeaponEquipped] > 0)
+            {
+                dmg += (int)(dmg * attacker.Attributes[Stats.TwoHandedWeaponDamageIncrease]);
+            }


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L3808

ze-dom · 2025-02-25T20:56:46Z

src/GameLogic/AttackableExtensions.cs

        }
-        else if (isCriticalHit)
+
+        dmg += (int)attacker.Attributes[Stats.GreaterDamageBonus];


Physical: https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L3814
Wizardry: https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L4202
Summoner: https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L4511

ze-dom · 2025-02-25T20:57:49Z

src/GameLogic/AttackableExtensions.cs

        {
-            dmg = baseMinDamage;
+            dmg -= (int)(dmg * attacker.Attributes[Stats.WeaknessPhysDmgDecrement]); // check if it's a mob attacking
+            dmg += GetMasterSkillTreePhysicalPassiveDamageBonus(attacker, false);


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L3847

ze-dom · 2025-02-25T20:59:07Z

src/GameLogic/AttackableExtensions.cs

+                    bonusDamage = (int)(bonusDamage == 0
+                        ? attacker.Attributes[Stats.MaceBonusDamage]
+                        : (bonusDamage + attacker.Attributes[Stats.MaceBonusDamage]) / 2);
+                }


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L3914

ze-dom · 2025-02-25T21:03:10Z

src/GameLogic/AttackableExtensions.cs

+            if (damageType == DamageType.Fenrir)
+            {
+                classicPvpDuelDmgDec = 1;
+            }


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L526

ze-dom · 2025-02-25T21:03:52Z

src/GameLogic/AttackableExtensions.cs

-            var defenseAttribute = defender.GetDefenseAttribute(attacker);
-            var defense = (int)defender.Attributes[defenseAttribute];
-            dmg -= defense;
+            dmg = (int)(dmg * 0.3);
        }


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L718

ze-dom · 2025-02-25T21:05:01Z

src/GameLogic/AttackableExtensions.cs

        }

-        dmg = Math.Max(dmg, 0);
+        dmg -= (int)(dmg * defender.Attributes[Stats.ShieldSkillReceiveDecrement]);


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L741

ze-dom · 2025-02-26T16:51:09Z

src/Persistence/Initialization/CharacterClasses/ClassRageFighter.cs

-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.AttackRatePvm, 6, Stats.TotalStrength));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.AttackRatePvm, 5, Stats.TotalLevel));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.AttackRatePvm, 1.5f, Stats.TotalAgility));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.AttackRatePvm, 0.25f, Stats.TotalStrength));


https://github.com/MuSeason6FixTeam/zTeamS6.3/blob/565c579e61f150f6019dee60d22443d30ddfaf42/zGameServer/GameServer/ObjBaseAttack.cpp#L534

ze-dom · 2025-02-26T16:57:45Z

src/Persistence/Initialization/CharacterClasses/ClassRageFighter.cs

-
-        result.AttributeCombinations.Add(this.CreateConditionalRelationship(Stats.PhysicalBaseDmg, Stats.IsGloveWeaponEquipped, Stats.GloveWeaponBonusBaseDamage));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.SkillMultiplier, 0.001f, Stats.TotalEnergy));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.VitalitySkillMultiplier, 0.001f, Stats.TotalVitality));


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/Template/zGameServer/Data/Skill/BuffSkillEffect.xml#L143

ze-dom · 2025-02-26T17:10:20Z

src/Persistence/Initialization/CharacterClasses/ClassRageFighter.cs

+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 5, Stats.BaseStrength));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 5, Stats.BaseAgility));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 7, Stats.BaseVitality));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 3, Stats.BaseEnergy));


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L544

ze-dom · 2025-02-26T17:13:35Z

src/Persistence/Initialization/CharacterClasses/ClassRageFighter.cs


        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));


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/Template/zGameServer/Data/Skill/BuffSkillEffect.xml#L165

ze-dom · 2025-02-26T17:14:43Z

src/Persistence/Initialization/CharacterClasses/ClassSummoner.cs

@@ -44,25 +57,27 @@ private CharacterClass CreateSummoner(CharacterClassNumber number, string name,
        result.StatAttributes.Add(this.CreateStatAttributeDefinition(Stats.BaseVitality, 18, true));
        result.StatAttributes.Add(this.CreateStatAttributeDefinition(Stats.BaseEnergy, 23, true));
        result.StatAttributes.Add(this.CreateStatAttributeDefinition(Stats.CurrentHealth, 70, false));
-        result.StatAttributes.Add(this.CreateStatAttributeDefinition(Stats.CurrentMana, 20, false));
+        result.StatAttributes.Add(this.CreateStatAttributeDefinition(Stats.CurrentMana, 40, false));


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/common/classdef.cpp#L44

ze-dom · 2025-02-26T17:15:38Z

src/Persistence/Initialization/CharacterClasses/ClassSummoner.cs

-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.DefenseBase, 1.0f / 10, Stats.TotalAgility));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.TotalStrengthAndAgility, Stats.TotalAgility, Stats.TotalStrength, InputOperator.Add));
+
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.DefenseBase, 1.0f / 3, Stats.TotalAgility));


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjCalCharacter.cpp#L801

ze-dom · 2025-02-26T17:16:23Z

src/Persistence/Initialization/CharacterClasses/ClassSummoner.cs

        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.DefenseRatePvm, 0.25f, Stats.TotalAgility));
-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.DefenseRatePvp, 0.1f, Stats.TotalAgility));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.DefenseRatePvp, 0.5f, Stats.TotalAgility));


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjBaseAttack.cpp#L795

ze-dom · 2025-02-26T17:29:04Z

src/Persistence/Initialization/CharacterClasses/ClassSummoner.cs

-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.AttackRatePvp, 0.6f, Stats.TotalAgility));
-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.AttackRatePvp, 3, Stats.Level));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.AttackRatePvp, 3.5f, Stats.BaseAgility));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.AttackRatePvp, 3, Stats.TotalLevel));


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjBaseAttack.cpp#L760

ze-dom · 2025-02-26T17:30:03Z

src/Persistence/Initialization/CharacterClasses/ClassSummoner.cs

-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.MinimumWizBaseDmg, 1.0f / 9, Stats.TotalEnergy));
-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.MaximumWizBaseDmg, 1.0f / 4, Stats.TotalEnergy));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.MinimumPhysBaseDmg, 1.0f / 7, Stats.TotalStrengthAndAgility));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.MaximumPhysBaseDmg, 1.0f / 4, Stats.TotalStrengthAndAgility));


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjCalCharacter.cpp#L242

ze-dom · 2025-02-26T17:31:06Z

src/Persistence/Initialization/CharacterClasses/ClassSummoner.cs

+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.MinimumPhysBaseDmg, 1.0f / 7, Stats.TotalStrengthAndAgility));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.MaximumPhysBaseDmg, 1.0f / 4, Stats.TotalStrengthAndAgility));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(statsMinWizAndCurseBaseDmg, 1.0f / 9, Stats.TotalEnergy));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(statsMaxWizAndCurseBaseDmg, 1.0f / 4, Stats.TotalEnergy));


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjCalCharacter.cpp#L365

ze-dom · 2025-02-26T17:32:51Z

src/Persistence/Initialization/CharacterClasses/ClassSummoner.cs

+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(berserkerHealthMultiplierDecrement, -0.1f, Stats.BerserkerHealthMultiplierFactor, InputOperator.Minimum)); // At least -10% HP
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(isBerserkerBuffed, 1, Stats.BerserkerMinPhysDmgBonus, InputOperator.Minimum));
+        result.AttributeCombinations.Add(this.CreateConditionalRelationship(berserkerHealthMultiplier, isBerserkerBuffed, berserkerHealthMultiplierDecrement));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.MaximumHealth, 1, berserkerHealthMultiplier, aggregateType: AggregateType.Multiplicate));


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/BuffEffect.cpp#L88

ze-dom · 2025-02-26T17:39:17Z

src/Persistence/Initialization/CharacterClasses/ClassSummoner.cs

+        result.BaseAttributeValues.Add(this.CreateConstValueAttribute(1, finalBerserkerManaMultiplier));
+        result.BaseAttributeValues.Add(this.CreateConstValueAttribute(1, berserkerHealthMultiplier));
+        result.BaseAttributeValues.Add(this.CreateConstValueAttribute(0, Stats.BerserkerManaMultiplier));
+        result.BaseAttributeValues.Add(this.CreateConstValueAttribute(0, Stats.BerserkerHealthMultiplierFactor));


These 0 values I found were necessary because otherwise the magic effect power ups would conflict and not always update.

ze-dom · 2025-02-26T17:45:41Z

src/Persistence/Initialization/CharacterClasses/ClassSummoner.cs


        this.AddCommonBaseAttributeValues(result.BaseAttributeValues, isMaster);
+
        return result;


Here is all this mumbo-jumbo in effect:

ze-dom · 2025-02-26T17:47:44Z

src/Persistence/Initialization/GameConfigurationInitializerBase.cs

-        this.GameConfiguration.ItemOptions.Add(this.CreateOptionDefinition(Stats.MaximumPhysBaseDmg, ItemOptionDefinitionNumbers.PhysicalAttack));
-        this.GameConfiguration.ItemOptions.Add(this.CreateOptionDefinition(Stats.MaximumWizBaseDmg, ItemOptionDefinitionNumbers.WizardryAttack));
+        this.GameConfiguration.ItemOptions.Add(this.CreateOptionDefinition(Stats.PhysicalBaseDmg, ItemOptionDefinitionNumbers.PhysicalAttack));
+        this.GameConfiguration.ItemOptions.Add(this.CreateOptionDefinition(Stats.WizardryBaseDmg, ItemOptionDefinitionNumbers.WizardryAttack));


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjCalCharacter.cpp#L310
https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjCalCharacter.cpp#L403

ze-dom · 2025-02-26T18:01:01Z

src/Persistence/Initialization/PlugIns/CharacterCreated/AddFireBlastForDarkLord.cs

+        : base((byte)CharacterClassNumber.DarkLord, (ushort)SkillNumber.FireBlast)
+    {
+    }
+}


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/user.cpp#L2761

ze-dom · 2025-02-26T18:02:07Z

src/Persistence/Initialization/PlugIns/CharacterCreated/AddManaRaysForMagicGladiator.cs

+        : base((byte)CharacterClassNumber.MagicGladiator, (ushort)SkillNumber.ManaRays)
+    {
+    }
+}


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/user.cpp#L2757

ze-dom · 2025-02-26T18:02:45Z

src/Persistence/Initialization/PlugIns/CharacterCreated/AddShortSwordForDarkLord.cs

+        : base((byte)CharacterClassNumber.DarkLord, (byte)ItemGroups.Swords, 1, 0)
+    {
+    }
+}


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/common/classdef.cpp#L97

ze-dom · 2025-02-26T18:03:05Z

src/Persistence/Initialization/PlugIns/CharacterCreated/AddShortSwordForMagicGladiator.cs

+        : base((byte)CharacterClassNumber.MagicGladiator, (byte)ItemGroups.Swords, 1, 0)
+    {
+    }
+}


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/common/classdef.cpp#L102

ze-dom · 2025-02-26T18:07:33Z

src/Persistence/Initialization/Skills/BerserkerEffectInitializer.cs

+        maxDmgPerStrengthAndAgility.InputAttribute = Stats.TotalStrengthAndAgility.GetPersistent(this.GameConfiguration);
+        maxDmgPerStrengthAndAgility.InputOperator = InputOperator.Multiply;
+        maxDmgPerStrengthAndAgility.InputOperand = 1.0f / 30;
+        maxPhysPowerUpDefinition.Boost.RelatedValues.Add(maxDmgPerStrengthAndAgility);


https://github.com/MuSeason6FixTeam/zTeamS6.3/blob/565c579e61f150f6019dee60d22443d30ddfaf42/zGameServer/GameServer/ObjAttack.cpp#L3858

sven-n

Can you split this into smaller, independent PRs, please? I have only looked at a very small part of the changes and can hardly process them all at once in my head 😂

So far, some changes are very good and some make the code very complicated (damage calc). I'm not sure if that's all neccessary. In the past I tried to keep it all as clean and simple as possible. For example, my goal wasn't to replicate the original code by 100 % if that blows up complexity to another level.
Also, the referenced sources are not original and of a higher season, so we cannot trust on formulas etc. of that alone.

sven-n · 2025-02-26T20:03:46Z

src/AttributeSystem/AttributeRelationship.cs

+    /// <summary>
+    /// Gets or sets the aggregate type with which the relationship should effect the target attribute.
+    /// </summary>
+    public AggregateType AggregateType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the calculation stage at which the relationship should effect the target attribute.
+    /// </summary>
+    public byte Stage { get; set; }
+


Why are these needed? Which use cases do you try to solve with them?

sven-n · 2025-02-26T20:13:28Z

src/DataModel/Configuration/Skill.cs

+
+    /// <summary>
+    /// The electric spike (DL) skill damage type.
+    /// </summary>
+    ElectricSpike = 6,
+
+    /// <summary>
+    /// The dark horse's earthshake skill damage type.
+    /// </summary>
+    Earthshake = 7,
+
+    /// <summary>
+    /// The chaotic diseier (DL) skill damage type.
+    /// </summary>
+    ChaoticDiseier = 8,
+
+    /// <summary>
+    /// The generic dark lord offensive skill damage type.
+    /// </summary>
+    /// <remarks>Any DL skill other than electric spike, chaotic diseier, and earthshake.</remarks>
+    DarkLordGenericSkill = 9,
+
+    /// <summary>
+    /// The multishot (Elf) skill damage type.
+    /// </summary>
+    MultiShot = 10,


No sorry, these are not damage types

sven-n · 2025-02-26T20:31:27Z

src/GameLogic/Attributes/Stats.cs

+    /// <summary>
+    /// Gets the total strength and agility attribute definition.
+    /// </summary>
+    public static AttributeDefinition TotalStrengthAndAgility { get; } = new(new Guid("4DFA4E4A-D185-4BCE-952C-5E78A92DC4AF"), "Total Strength and Agility", string.Empty);


Unneeded Stat. You can add an AttributeRelationship for each Strength and Agility

It is used on the src/Persistence/Initialization/Skills/BerserkerEffectInitializer.cs

sven-n · 2025-02-26T20:46:53Z

src/GameLogic/AttackableExtensions.cs

+
+        // Not all character's skills get multiplied (e.g., elf's TripleShot and MultiShot), so default case should be empty.
+        // Switch cases ordering kept close to source's for reference, with new season (NS) skills included.
+        switch (skill.Skill?.Number)


Sorry, cannot accept that. I tried to prevent references to specific skills in the code as much as possible.

sven-n · 2025-02-26T20:48:48Z

src/GameLogic/AttackableExtensions.cs

        {
-            dmg = (int)(dmg * attacker.Attributes[Stats.TwoHandedWeaponDamageIncrease]);
+            defender.Attributes[Stats.CurrentMana] -= soulBarrierManaToll;


This method shouldn't modify any attributes

sven-n · 2025-02-26T20:59:40Z

src/Persistence/Initialization/CharacterClasses/CharacterClassInitialization.cs

+        attributeRelationships.Add(this.CreateAttributeRelationship(Stats.MinimumPhysBaseDmg, 1, Stats.HarmonyPhysBaseDmg, stage: 2));
+        attributeRelationships.Add(this.CreateAttributeRelationship(Stats.MaximumPhysBaseDmg, 1, Stats.HarmonyPhysBaseDmg, stage: 2));
+        attributeRelationships.Add(this.CreateAttributeRelationship(Stats.MinimumPhysBaseDmg, 1, Stats.SocketBaseMinDmgBonus, stage: 2));
+        attributeRelationships.Add(this.CreateAttributeRelationship(Stats.MaximumPhysBaseDmg, 1, Stats.SocketBaseMaxDmgBonus, stage: 2));
+        attributeRelationships.Add(this.CreateAttributeRelationship(Stats.MinimumPhysBaseDmg, 1, Stats.ExcellentPhysBaseDmg, stage: 2));
+        attributeRelationships.Add(this.CreateAttributeRelationship(Stats.MaximumPhysBaseDmg, 1, Stats.ExcellentPhysBaseDmg, stage: 2));
+        attributeRelationships.Add(this.CreateAttributeRelationship(Stats.MinimumPhysBaseDmg, 1, Stats.ExcellentPhysTwoPercentInc, aggregateType: AggregateType.Multiplicate, stage: 2));
+        attributeRelationships.Add(this.CreateAttributeRelationship(Stats.MaximumPhysBaseDmg, 1, Stats.ExcellentPhysTwoPercentInc, aggregateType: AggregateType.Multiplicate, stage: 2));


Why all these new Stats?

Refer to this comment and the Stat code docs near it. Because originally these are all added and multiplied on different stages.
In other words, (((A + B) * C) + D) * E) will produce a different result than (A + B + D) * (C * E). (For reference, I documented this on src/AttributeSystem/IElement.cs.)

I wanted to emulate the original calculations, so this was the rationale for the introduction of stages. Another approach would be to add Stats add infinitum, but that would be even more confusing 😅. But I understand if this may not be acceptable to you.

sven-n · 2025-02-26T21:00:15Z

src/Persistence/Initialization/CharacterClasses/CharacterClassInitialization.cs

+        attributeRelationships.Add(this.CreateAttributeRelationship(Stats.MinimumPhysBaseDmg, 1, Stats.BaseDamageBonus, stage: 4));
+        attributeRelationships.Add(this.CreateAttributeRelationship(Stats.MaximumPhysBaseDmg, 1, Stats.BaseDamageBonus, stage: 4));


Why stage 4 and not 1?

In the sources, the damage bonus from special item consumables is the last thing added (Stats.BaseDamageBonus here contains JackO'lanternWrath and CherryBlossomFlowerPetal power ups - I left it documented on the Stat docs).

sven-n · 2025-02-26T21:03:23Z

src/Persistence/Initialization/CharacterClasses/ClassDarkLord.cs

-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.AttackRatePvm, 1.0f / 6, Stats.TotalStrength));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.AttackRatePvm, 5, Stats.TotalLevel));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.AttackRatePvm, 3, Stats.TotalAgility));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.AttackRatePvm, 0.25f, Stats.TotalStrength));


I'm not sure if your linked source is using the original formula here...

sven-n · 2025-02-26T21:05:20Z

src/Persistence/Initialization/CharacterClasses/ClassDarkLord.cs

-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 5, Stats.TotalStrength));
-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 5, Stats.TotalAgility));
-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 7, Stats.TotalVitality));
-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 3, Stats.TotalEnergy));
-        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 3, Stats.TotalLeadership));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 5, Stats.BaseStrength));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 5, Stats.BaseAgility));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 7, Stats.BaseVitality));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 3, Stats.BaseEnergy));
+        result.AttributeCombinations.Add(this.CreateAttributeRelationship(Stats.FenrirBaseDmg, 1.0f / 3, Stats.BaseLeadership));


Are you sure this is not based on the total values?

These two sources say so:
https://github.com/MuSeason6FixTeam/zTeamS6.3/blob/565c579e61f150f6019dee60d22443d30ddfaf42/zGameServer/GameServer/ObjAttack.cpp#L490
https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjAttack.cpp#L528

sven-n · 2025-02-26T21:07:44Z

src/Persistence/Initialization/ItemOptionDefinitionNumbers.cs

+    /// <summary>
+    /// Gets the mini robot transformation ring option number.
+    /// </summary>
+    public static short MiniRobotTransformationRing => 0x76;


Never seen this before in season 6

That may very well be so, I only added because there was already code in src/Persistence/Initialization/VersionSeasonSix/Items/Jewelery.cs for these.

ze-dom · 2025-02-26T21:55:15Z

src/Persistence/Initialization/Skills/BerserkerEffectInitializer.cs

+        manaMultiplier.InputAttribute = Stats.BaseEnergy.GetPersistent(this.GameConfiguration); // BaseEnergy and not TotalEnergy
+        manaMultiplier.InputOperator = InputOperator.Multiply;
+        manaMultiplier.InputOperand = 1f / 3000f;
+        manaPowerUpDefinition.Boost.RelatedValues.Add(manaMultiplier);


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/Template/zGameServer/Data/Skill/BuffSkillEffect.xml#L93
https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/BuffEffect.cpp#L84
https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjUseSkill.cpp#L5160

ze-dom · 2025-02-26T22:04:26Z

src/Persistence/Initialization/Skills/BerserkerEffectInitializer.cs

+        healthMultiplier.InputAttribute = Stats.BaseEnergy.GetPersistent(this.GameConfiguration); // BaseEnergy and not TotalEnergy
+        healthMultiplier.InputOperator = InputOperator.Multiply;
+        healthMultiplier.InputOperand = 1f / 6000f;
+        healthPowerUpDefinition.Boost.RelatedValues.Add(healthMultiplier);


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/BuffEffect.cpp#L91
https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjUseSkill.cpp#L5174

ze-dom · 2025-02-26T22:09:22Z

src/Persistence/Initialization/Skills/DefenseEffectInitializer.cs


        // Always a 50 % damage reduction
        powerUpDefinition.Boost = this.Context.CreateNew<PowerUpDefinitionValue>();
        powerUpDefinition.Boost.ConstantValue.Value = 0.50f;
-        powerUpDefinition.Boost.ConstantValue.AggregateType = AggregateType.Multiplicate;
+        powerUpDefinition.Boost.ConstantValue.AggregateType = AggregateType.AddRaw;
    }


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjUseSkill.cpp#L907

ze-dom · 2025-02-26T22:10:49Z

src/Persistence/Initialization/Skills/GreaterDefenseEffectInitializer.cs

        powerUpDefinition.Boost = this.Context.CreateNew<PowerUpDefinitionValue>();
-        powerUpDefinition.Boost.ConstantValue.Value = 2f;
+        powerUpDefinition.Boost.ConstantValue.Value = 1f;


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/Template/zGameServer/Data/Skill/BuffSkillEffect.xml#L37

ze-dom · 2025-02-26T22:12:57Z

src/Persistence/Initialization/Skills/InfiniteArrowEffectInitializer.cs

@@ -35,7 +35,7 @@ public override void Initialize()
        magicEffect.SendDuration = true;
        magicEffect.StopByDeath = true;
        magicEffect.Duration = this.Context.CreateNew<PowerUpDefinitionValue>();
-        magicEffect.Duration.ConstantValue.Value = (float)TimeSpan.FromHours(8).TotalSeconds;
+        magicEffect.Duration.ConstantValue.Value = 600;


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/Template/zGameServer/Data/Skill/SkillAdditionInfo.dat#L15

ze-dom · 2025-02-26T22:20:12Z

src/Persistence/Initialization/Skills/KillingBlowEffectInitializer.cs

+        decDmgPowerUpDefinition.Boost.ConstantValue.Value = 0.05f;
+        decDmgPowerUpDefinition.Boost.ConstantValue.AggregateType = AggregateType.AddRaw;
+    }
+}


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/ObjUseSkill.cpp#L6214
However, this depends on a chance (10%). I have noticed more RF and Summoner skills also have effects that depend on a chance rate. To be addressed later!

ze-dom · 2025-02-26T22:30:30Z

src/Persistence/Initialization/Skills/MagicEffectNumber.cs

+    /// The weakness effect, which decreases inflicted damage.
+    /// </summary>
+    Weakness = 0x4C,
+


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/BuffEffectSlot.h#L85

ze-dom · 2025-02-26T22:30:53Z

src/Persistence/Initialization/Skills/MagicEffectNumber.cs

+    /// The berserker buff effect.
+    /// </summary>
+    Berserker = 0x51,
+


https://github.com/kyleruss/emu-server/blob/202856a74c905c203b9b2795fd161f564ca8b257/GameServer/Source/BuffEffectSlot.h#L90

ze-dom added 7 commits January 10, 2025 10:27

WIP

ea718f4

Merge branch 'master' into bugfix/dark_horse_options

b942e22

wip

8998a86

Merge branch 'master' into bugfix/dark_horse_options

6d12656

WIP

389251c

fixed starting items

0a087cf

Added RH slot for staffs and added CS starting skills

6737e94

ze-dom mentioned this pull request Feb 23, 2025

Added item drop configuration page #587

Draft

Added mastr skill iteration calc corrections

a8720a9

ze-dom commented Feb 25, 2025

View reviewed changes

Cleared code

a3e6402

ze-dom commented Feb 25, 2025

View reviewed changes

ze-dom commented Feb 26, 2025

View reviewed changes

Fixes

feb5497

ze-dom commented Feb 26, 2025

View reviewed changes

Fix PvP attack and defense rates

97e3a2b

ze-dom commented Feb 26, 2025

View reviewed changes

sven-n requested changes Feb 26, 2025

View reviewed changes

ze-dom commented Feb 26, 2025

View reviewed changes


		this.AddCommonBaseAttributeValues(result.BaseAttributeValues, isMaster);

		return result;

		attributeRelationships.Add(this.CreateAttributeRelationship(Stats.MinimumPhysBaseDmg, 1, Stats.BaseDamageBonus, stage: 4));
		attributeRelationships.Add(this.CreateAttributeRelationship(Stats.MaximumPhysBaseDmg, 1, Stats.BaseDamageBonus, stage: 4));

Add dark horse options & major dmg calcs refactoring #586

Are you sure you want to change the base?

Add dark horse options & major dmg calcs refactoring #586

Conversation

ze-dom commented Feb 13, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ze-dom Feb 25, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sven-n left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ze-dom Feb 27, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ze-dom Feb 27, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ze-dom commented Feb 13, 2025 •

edited

Loading

ze-dom Feb 25, 2025 •

edited

Loading

ze-dom Feb 27, 2025 •

edited

Loading

ze-dom Feb 27, 2025 •

edited

Loading