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

Core/Refactor: Part 2

Browse Source
This commit is contained in:
hondacrx
2018-05-07 22:07:35 -04:00
parent 216db1c23a
commit 9b40067017
93 changed files with 321 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Auras/AuraEffect.cs
+1 -1
View File
@@ -706,7 +706,7 @@ namespace Game.Spells
// Costs Check
var costs = eventInfo.GetProcSpell().GetPowerCost();
var m = costs.Find(cost => { return cost.Amount > 0; });
var m = costs.Find(cost => cost.Amount > 0);
if (m == null)
return false;
break;
Source/Game/Spells/Spell.cs
+2 -2
View File
@@ -4396,7 +4396,7 @@ namespace Game.Spells
Log.outDebug(LogFilter.Spells, "Spell: {0} Effect : {1}", m_spellInfo.Id, eff);
damage = CalculateDamage(i, unitTarget, out variance);
damage = CalculateDamage(i, unitTarget, out _variance);
bool preventDefault = CallScriptEffectHandlers(i, mode);
@@ -7283,7 +7283,7 @@ namespace Game.Spells
public WorldLocation destTarget;
public int damage;
SpellMissInfo targetMissInfo;
float variance;
float _variance;
SpellEffectHandleMode effectHandleMode;
public SpellEffectInfo effectInfo;
// used in effects handlers
Source/Game/Spells/SpellEffects.cs
+7 -10
View File
@@ -156,10 +156,7 @@ namespace Game.Spells
// Meteor like spells (divided damage to targets)
if (m_spellInfo.HasAttribute(SpellCustomAttributes.ShareDamage))
{
int count = m_UniqueTargetInfo.Count(targetInfo =>
{
return Convert.ToBoolean(targetInfo.effectMask & (1 << (int)effIndex));
});
int count = m_UniqueTargetInfo.Count(targetInfo => Convert.ToBoolean(targetInfo.effectMask & (1 << (int)effIndex)));
// divide to all targets
if (count != 0)
@@ -255,7 +252,7 @@ namespace Game.Spells
if (m_originalCaster != null && apply_direct_bonus)
{
uint bonus = m_originalCaster.SpellDamageBonusDone(unitTarget, m_spellInfo, (uint)damage, DamageEffectType.SpellDirect, effectInfo);
damage = (int)(bonus + (bonus * variance));
damage = (int)(bonus + (bonus * _variance));
damage = (int)unitTarget.SpellDamageBonusTaken(m_originalCaster, m_spellInfo, (uint)damage, DamageEffectType.SpellDirect, effectInfo);
}
@@ -827,7 +824,7 @@ namespace Game.Spells
// add spell damage bonus
uint bonus = m_caster.SpellDamageBonusDone(unitTarget, m_spellInfo, (uint)damage, DamageEffectType.SpellDirect, effectInfo);
damage = (int)(bonus + (bonus * variance));
damage = (int)(bonus + (bonus * _variance));
damage = (int)unitTarget.SpellDamageBonusTaken(m_caster, m_spellInfo, (uint)damage, DamageEffectType.SpellDirect, effectInfo);
int newDamage = -(unitTarget.ModifyPower(powerType, -damage));
@@ -963,7 +960,7 @@ namespace Game.Spells
{
addhealth = (int)caster.SpellHealingBonusDone(unitTarget, m_spellInfo, (uint)addhealth, DamageEffectType.Heal, effectInfo);
uint bonus = caster.SpellHealingBonusDone(unitTarget, m_spellInfo, (uint)addhealth, DamageEffectType.Heal, effectInfo);
damage = (int)(bonus + (bonus * variance));
damage = (int)(bonus + (bonus * _variance));
}
addhealth = (int)unitTarget.SpellHealingBonusTaken(caster, m_spellInfo, (uint)addhealth, DamageEffectType.Heal, effectInfo);
@@ -1009,7 +1006,7 @@ namespace Game.Spells
return;
uint heal = m_originalCaster.SpellHealingBonusDone(unitTarget, m_spellInfo, (uint)damage, DamageEffectType.Heal, effectInfo);
heal += (uint)(heal * variance);
heal += (uint)(heal * _variance);
m_healing += (int)unitTarget.SpellHealingBonusTaken(m_originalCaster, m_spellInfo, heal, DamageEffectType.Heal, effectInfo);
}
@@ -1024,7 +1021,7 @@ namespace Game.Spells
return;
uint bonus = m_caster.SpellDamageBonusDone(unitTarget, m_spellInfo, (uint)damage, DamageEffectType.SpellDirect, effectInfo);
damage = (int)(bonus + (bonus * variance));
damage = (int)(bonus + (bonus * _variance));
damage = (int)unitTarget.SpellDamageBonusTaken(m_caster, m_spellInfo, (uint)damage, DamageEffectType.SpellDirect, effectInfo);
Log.outDebug(LogFilter.Spells, "HealthLeech :{0}", damage);
@@ -1908,7 +1905,7 @@ namespace Game.Spells
if (dispelList.Empty())
return;
int remaining = dispelList.Count();
int remaining = dispelList.Count;
// Ok if exist some buffs for dispel try dispel it
uint failCount = 0;
Source/Game/Spells/SpellInfo.cs
+1 -1
View File
@@ -3608,7 +3608,7 @@ namespace Game.Spells
public bool HasAttribute(SpellAttr13 attribute) { return Convert.ToBoolean(AttributesEx13 & attribute); }
public bool HasAttribute(SpellCustomAttributes attribute) { return Convert.ToBoolean(AttributesCu & attribute); }
public bool HasAnyAuraInterruptFlag() { return AuraInterruptFlags.Any(flag => { return flag != 0; }); }
public bool HasAnyAuraInterruptFlag() { return AuraInterruptFlags.Any(flag => flag != 0); }
public bool HasAuraInterruptFlag(SpellAuraInterruptFlags flag) { return (AuraInterruptFlags[0] & (uint)flag) != 0; }
public bool HasAuraInterruptFlag(SpellAuraInterruptFlags2 flag) { return (AuraInterruptFlags[1] & (uint)flag) != 0; }
Source/Game/Spells/SpellManager.cs
+1 -1
View File
@@ -471,7 +471,7 @@ namespace Game.Entities
return false;
var costs = eventInfo.GetProcSpell().GetPowerCost();
var m = costs.Find(cost => { return cost.Amount > 0; });
var m = costs.Find(cost => cost.Amount > 0);
if (m == null)
return false;
}