Core/Spells: Fixed spell duration scaling with combo points

Port From (https://github.com/TrinityCore/TrinityCore/commit/9e68fd1458551ab0f007b6044c9220da8f7d4199)
This commit is contained in:
hondacrx
2023-09-12 18:00:30 -04:00
parent 543411beec
commit 913cfa0fbd
7 changed files with 43 additions and 43 deletions
+3 -3
View File
@@ -742,10 +742,10 @@ namespace Game.Spells
public int CalcMaxDuration(Unit caster)
{
return CalcMaxDuration(GetSpellInfo(), caster);
return CalcMaxDuration(GetSpellInfo(), caster, null);
}
public static int CalcMaxDuration(SpellInfo spellInfo, WorldObject caster)
public static int CalcMaxDuration(SpellInfo spellInfo, WorldObject caster, List<SpellPowerCost> powerCosts)
{
Player modOwner = null;
int maxDuration;
@@ -753,7 +753,7 @@ namespace Game.Spells
if (caster != null)
{
modOwner = caster.GetSpellModOwner();
maxDuration = caster.CalcSpellDuration(spellInfo);
maxDuration = caster.CalcSpellDuration(spellInfo, powerCosts);
}
else
maxDuration = spellInfo.GetDuration();
+1 -1
View File
@@ -152,7 +152,7 @@ namespace Game.Spells
public static float CalculateEstimatedfTotalPeriodicAmount(Unit caster, Unit target, SpellInfo spellInfo, SpellEffectInfo spellEffectInfo, float amount, byte stack)
{
int maxDuration = Aura.CalcMaxDuration(spellInfo, caster);
int maxDuration = Aura.CalcMaxDuration(spellInfo, caster, null);
if (maxDuration <= 0)
return 0.0f;
+1 -1
View File
@@ -2239,7 +2239,7 @@ namespace Game.Spells
}
}
hitInfo.AuraDuration = Aura.CalcMaxDuration(m_spellInfo, origCaster);
hitInfo.AuraDuration = Aura.CalcMaxDuration(m_spellInfo, origCaster, m_powerCost);
// unit is immune to aura if it was diminished to 0 duration
if (!hitInfo.Positive && !unit.ApplyDiminishingToDuration(m_spellInfo, ref hitInfo.AuraDuration, origCaster, diminishLevel))
+9 -20
View File
@@ -2792,25 +2792,19 @@ namespace Game.Spells
if (power.RequiredAuraSpellID != 0 && !unitCaster.HasAura(power.RequiredAuraSpellID))
return null;
SpellPowerCost cost = new();
// Spell drain all exist power on cast (Only paladin lay of Hands)
if (HasAttribute(SpellAttr1.UseAllMana))
{
if (optionalCost)
return null;
// If power type - health drain all
if (power.PowerType == PowerType.Health)
{
cost.Power = PowerType.Health;
cost.Amount = (int)unitCaster.GetHealth();
return cost;
}
return new SpellPowerCost() { Power = PowerType.Health, Amount = (int)unitCaster.GetHealth() };
// Else drain all power
if (power.PowerType < PowerType.Max)
{
cost.Power = power.PowerType;
cost.Amount = unitCaster.GetPower(cost.Power);
return cost;
}
return new SpellPowerCost() { Power = power.PowerType, Amount = unitCaster.GetPower(power.PowerType) };
Log.outError(LogFilter.Spells, $"SpellInfo.CalcPowerCost: Unknown power type '{power.PowerType}' in spell {Id}");
return default;
@@ -2997,9 +2991,7 @@ namespace Game.Spells
if (initiallyNegative != (powerCost < 0))
powerCost = 0;
cost.Power = power.PowerType;
cost.Amount = powerCost;
return cost;
return new SpellPowerCost() { Power = power.PowerType, Amount = powerCost };
}
public List<SpellPowerCost> CalcPowerCost(WorldObject caster, SpellSchoolMask schoolMask, Spell spell = null)
@@ -3013,11 +3005,8 @@ namespace Game.Spells
if (itr != null)
return itr;
SpellPowerCost cost = new();
cost.Power = powerType;
cost.Amount = 0;
costs.Add(cost);
return costs.Last();
costs.Add(new SpellPowerCost() { Power = powerType, Amount = 0 });
return costs.Last();
}
foreach (SpellPowerRecord power in PowerCosts)