From 501f280140c843a764e3054dea72a9dde5907a51 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 23 Nov 2021 21:26:01 -0500 Subject: [PATCH] Core/Unit: rename & cleanup GetCreatePowers Port From (https://github.com/TrinityCore/TrinityCore/commit/a8ec1ba9bc2d6d24407670159a765099f2a3004d) --- Source/Game/Entities/Player/Player.cs | 2 +- Source/Game/Entities/StatSystem.cs | 6 +++--- Source/Game/Entities/TemporarySummon.cs | 2 +- Source/Scripts/Spells/Druid.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 1f2e19f25..926507c51 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -5830,7 +5830,7 @@ namespace Game.Entities // save new stats for (var i = PowerType.Mana; i < PowerType.Max; ++i) - SetMaxPower(i, GetCreatePowers(i)); + SetMaxPower(i, GetCreatePowerValue(i)); SetMaxHealth(0); // stamina bonus will applied later diff --git a/Source/Game/Entities/StatSystem.cs b/Source/Game/Entities/StatSystem.cs index 804930cf4..c34c0ad2c 100644 --- a/Source/Game/Entities/StatSystem.cs +++ b/Source/Game/Entities/StatSystem.cs @@ -655,7 +655,7 @@ namespace Game.Entities return (int)(uint)m_unitData.MaxPower[(int)powerIndex]; } - public int GetCreatePowers(PowerType powerType) + public int GetCreatePowerValue(PowerType powerType) { if (powerType == PowerType.Mana) return (int)GetCreateMana(); @@ -1949,7 +1949,7 @@ namespace Game.Entities UnitMods unitMod = UnitMods.PowerStart + (int)power; - float value = GetFlatModifierValue(unitMod, UnitModifierFlatType.Base) + GetCreatePowers(power); + float value = GetFlatModifierValue(unitMod, UnitModifierFlatType.Base) + GetCreatePowerValue(power); value *= GetPctModifierValue(unitMod, UnitModifierPctType.Base); value += GetFlatModifierValue(unitMod, UnitModifierFlatType.Total); value *= GetPctModifierValue(unitMod, UnitModifierPctType.Total); @@ -2067,7 +2067,7 @@ namespace Game.Entities UnitMods unitMod = UnitMods.PowerStart + (int)power; - float value = GetFlatModifierValue(unitMod, UnitModifierFlatType.Base) + GetCreatePowers(power); + float value = GetFlatModifierValue(unitMod, UnitModifierFlatType.Base) + GetCreatePowerValue(power); value *= GetPctModifierValue(unitMod, UnitModifierPctType.Base); value += GetFlatModifierValue(unitMod, UnitModifierFlatType.Total); value *= GetPctModifierValue(unitMod, UnitModifierPctType.Total); diff --git a/Source/Game/Entities/TemporarySummon.cs b/Source/Game/Entities/TemporarySummon.cs index a91e290b0..4cd3d8d65 100644 --- a/Source/Game/Entities/TemporarySummon.cs +++ b/Source/Game/Entities/TemporarySummon.cs @@ -847,7 +847,7 @@ namespace Game.Entities UnitMods unitMod = UnitMods.PowerStart + (int)power; - float value = GetFlatModifierValue(unitMod, UnitModifierFlatType.Base) + GetCreatePowers(power); + float value = GetFlatModifierValue(unitMod, UnitModifierFlatType.Base) + GetCreatePowerValue(power); value *= GetPctModifierValue(unitMod, UnitModifierPctType.Base); value += GetFlatModifierValue(unitMod, UnitModifierFlatType.Total); value *= GetPctModifierValue(unitMod, UnitModifierPctType.Total); diff --git a/Source/Scripts/Spells/Druid.cs b/Source/Scripts/Spells/Druid.cs index e7186e39e..de026dc65 100644 --- a/Source/Scripts/Spells/Druid.cs +++ b/Source/Scripts/Spells/Druid.cs @@ -648,7 +648,7 @@ namespace Scripts.Spells.Druid Unit caster = GetCaster(); if (caster) - amount = MathFunctions.CalculatePct(caster.GetCreatePowers(PowerType.Mana), amount) / (int)aurEff.GetTotalTicks(); + amount = MathFunctions.CalculatePct(caster.GetCreatePowerValue(PowerType.Mana), amount) / (int)aurEff.GetTotalTicks(); else amount = 0; }