Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Spells: Removed outdated mechanic (spell downranking coef penalty)

Browse Source
This commit is contained in:
hondacrx
2018-01-27 17:38:17 -05:00
parent 0a78e8afe3
commit 854ae39aeb
2 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.Spells.cs
+4 -26
View File
@@ -149,7 +149,6 @@ namespace Game.Entities
float coeff = effect.BonusCoefficient; float coeff = effect.BonusCoefficient;
if (DoneAdvertisedBenefit != 0) if (DoneAdvertisedBenefit != 0)
{ {
float factorMod = CalculateLevelPenalty(spellProto) * stack;
Player modOwner = GetSpellModOwner(); Player modOwner = GetSpellModOwner();
if (modOwner) if (modOwner)
{ {
@@ -157,7 +156,7 @@ namespace Game.Entities
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.BonusMultiplier, ref coeff); modOwner.ApplySpellMod(spellProto.Id, SpellModOp.BonusMultiplier, ref coeff);
coeff /= 100.0f; coeff /= 100.0f;
} }
DoneTotal += (int)(DoneAdvertisedBenefit * coeff * factorMod); DoneTotal += (int)(DoneAdvertisedBenefit * coeff * stack);
} }
// Done Percentage for DOT is already calculated, no need to do it again. The percentage mod is applied in Aura.HandleAuraSpecificMods. // Done Percentage for DOT is already calculated, no need to do it again. The percentage mod is applied in Aura.HandleAuraSpecificMods.
@@ -311,7 +310,6 @@ namespace Game.Entities
// Default calculation // Default calculation
if (TakenAdvertisedBenefit != 0) if (TakenAdvertisedBenefit != 0)
{ {
float factorMod = CalculateLevelPenalty(spellProto) * stack;
// level penalty still applied on Taken bonus - is it blizzlike? // level penalty still applied on Taken bonus - is it blizzlike?
Player modOwner = GetSpellModOwner(); Player modOwner = GetSpellModOwner();
if (modOwner) if (modOwner)
@@ -320,7 +318,7 @@ namespace Game.Entities
modOwner.ApplySpellMod(spellProto.Id, SpellModOp.BonusMultiplier, ref coeff); modOwner.ApplySpellMod(spellProto.Id, SpellModOp.BonusMultiplier, ref coeff);
coeff /= 100.0f; coeff /= 100.0f;
} }
TakenTotal += (int)(TakenAdvertisedBenefit * coeff * factorMod); TakenTotal += (int)(TakenAdvertisedBenefit * coeff * stack);
} }
} }
@@ -451,7 +449,6 @@ namespace Game.Entities
// Check for table values // Check for table values
float coeff = effect.BonusCoefficient; float coeff = effect.BonusCoefficient;
float factorMod = 1.0f;
if (effect.BonusCoefficientFromAP > 0.0f) if (effect.BonusCoefficientFromAP > 0.0f)
{ {
DoneTotal += (int)(effect.BonusCoefficientFromAP * stack * GetTotalAttackPowerValue( DoneTotal += (int)(effect.BonusCoefficientFromAP * stack * GetTotalAttackPowerValue(
@@ -467,7 +464,6 @@ namespace Game.Entities
// Default calculation // Default calculation
if (DoneAdvertisedBenefit != 0) if (DoneAdvertisedBenefit != 0)
{ {
factorMod *= CalculateLevelPenalty(spellProto) * stack;
Player modOwner = GetSpellModOwner(); Player modOwner = GetSpellModOwner();
if (modOwner) if (modOwner)
{ {
@@ -476,7 +472,7 @@ namespace Game.Entities
coeff /= 100.0f; coeff /= 100.0f;
} }
DoneTotal += (int)(DoneAdvertisedBenefit * coeff * factorMod); DoneTotal += (int)(DoneAdvertisedBenefit * coeff * stack);
} }
foreach (SpellEffectInfo eff in spellProto.GetEffectsForDifficulty(GetMap().GetDifficultyID())) foreach (SpellEffectInfo eff in spellProto.GetEffectsForDifficulty(GetMap().GetDifficultyID()))
@@ -566,7 +562,6 @@ namespace Game.Entities
// Check for table values // Check for table values
float coeff = effect.BonusCoefficient; float coeff = effect.BonusCoefficient;
float factorMod = 1.0f;
if (coeff <= 0.0f) if (coeff <= 0.0f)
{ {
// No bonus healing for SPELL_DAMAGE_CLASS_NONE class spells by default // No bonus healing for SPELL_DAMAGE_CLASS_NONE class spells by default
@@ -580,7 +575,6 @@ namespace Game.Entities
// Default calculation // Default calculation
if (TakenAdvertisedBenefit != 0) if (TakenAdvertisedBenefit != 0)
{ {
factorMod *= CalculateLevelPenalty(spellProto) * stack;
Player modOwner = GetSpellModOwner(); Player modOwner = GetSpellModOwner();
if (modOwner) if (modOwner)
{ {
@@ -589,7 +583,7 @@ namespace Game.Entities
coeff /= 100.0f; coeff /= 100.0f;
} }
TakenTotal += (int)(TakenAdvertisedBenefit * coeff * factorMod); TakenTotal += (int)(TakenAdvertisedBenefit * coeff * stack);
} }
var mHealingGet = GetAuraEffectsByType(AuraType.ModHealingReceived); var mHealingGet = GetAuraEffectsByType(AuraType.ModHealingReceived);
@@ -1149,22 +1143,6 @@ namespace Game.Entities
spell.finish(ok); spell.finish(ok);
} }
public float CalculateLevelPenalty(SpellInfo spellProto)
{
if (spellProto.SpellLevel <= 0 || spellProto.SpellLevel >= spellProto.MaxLevel)
return 1.0f;
float LvlPenalty = 0.0f;
if (spellProto.SpellLevel < 20)
LvlPenalty = (20.0f - spellProto.SpellLevel) * 3.75f;
float LvlFactor = (spellProto.SpellLevel + 6.0f) / getLevel();
if (LvlFactor > 1.0f)
LvlFactor = 1.0f;
return MathFunctions.AddPct(ref LvlFactor, -LvlPenalty);
}
uint GetCastingTimeForBonus(SpellInfo spellProto, DamageEffectType damagetype, uint CastingTime) uint GetCastingTimeForBonus(SpellInfo spellProto, DamageEffectType damagetype, uint CastingTime)
{ {
// Not apply this to creature casted spells with casttime == 0 // Not apply this to creature casted spells with casttime == 0
Source/Scripts/Spells/Warlock.cs
-1
View File
@@ -768,7 +768,6 @@ namespace Scripts.Spells.Warlock
float bonus = 0.8068f; float bonus = 0.8068f;
bonus *= caster.SpellBaseHealingBonusDone(GetSpellInfo().GetSchoolMask()); bonus *= caster.SpellBaseHealingBonusDone(GetSpellInfo().GetSchoolMask());
bonus *= caster.CalculateLevelPenalty(GetSpellInfo());
amount += (int)bonus; amount += (int)bonus;
} }