Core/Refactor: Part 3

This commit is contained in:
hondacrx
2018-05-16 19:57:48 -04:00
parent 225a5d27f7
commit 5dacd669b5
112 changed files with 564 additions and 561 deletions
+3 -3
View File
@@ -2451,7 +2451,7 @@ namespace Scripts.Spells.Generic
{
Unit owner = GetCaster().GetOwner();
if (owner)
if (owner.IsTypeId(TypeId.Player)) /// @todo this check is maybe wrong
if (owner.IsTypeId(TypeId.Player)) // @todo this check is maybe wrong
owner.ToPlayer().RemovePet(null, PetSaveMode.NotInSlot, true);
}
}
@@ -2757,7 +2757,7 @@ namespace Scripts.Spells.Generic
float factor;
ushort baseItemLevel;
/// @todo Reserach coeffs for different vehicles
// @todo Reserach coeffs for different vehicles
switch (GetId())
{
case SpellIds.GearScaling:
@@ -2772,7 +2772,7 @@ namespace Scripts.Spells.Generic
float avgILvl = caster.ToPlayer().GetAverageItemLevel();
if (avgILvl < baseItemLevel)
return; /// @todo Research possibility of scaling down
return; // @todo Research possibility of scaling down
amount = (int)((avgILvl - baseItemLevel) * factor);
}
+1 -1
View File
@@ -433,7 +433,7 @@ namespace Scripts.Spells.Hunter
{
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(p.Key);
///! If spellId in cooldown map isn't valid, the above will return a null pointer.
//! If spellId in cooldown map isn't valid, the above will return a null pointer.
if (spellInfo.SpellFamilyName == SpellFamilyNames.Hunter &&
spellInfo.Id != SpellIds.Readiness &&
spellInfo.Id != SpellIds.BestialWrath &&
+8 -8
View File
@@ -255,14 +255,14 @@ namespace Scripts.Spells.Priest
void FilterTargets(List<WorldObject> targets)
{
targets.RemoveAll(new Predicate<WorldObject>(obj =>
targets.RemoveAll(obj =>
{
Unit target = obj.ToUnit();
if (target)
return !GetCaster().IsInRaidWith(target);
return true;
}));
});
uint maxTargets = (uint)(GetCaster().HasAura(SpellIds.GlyphOfCircleOfHealing) ? 6 : 5); // Glyph of Circle of Healing
@@ -368,14 +368,14 @@ namespace Scripts.Spells.Priest
{
void FilterTargets(List<WorldObject> targets)
{
targets.RemoveAll(new Predicate<WorldObject>(obj =>
targets.RemoveAll(obj =>
{
Unit target = obj.ToUnit();
if (target)
return !GetCaster().IsInRaidWith(target);
return true;
}));
});
uint maxTargets = 3;
@@ -492,23 +492,23 @@ namespace Scripts.Spells.Priest
{
void FilterTargets(List<WorldObject> targets)
{
targets.RemoveAll(new Predicate<WorldObject>(obj =>
targets.RemoveAll(obj =>
{
Unit target = obj.ToUnit();
if (target)
return target.GetPowerType() != PowerType.Mana;
return true;
}));
});
targets.RemoveAll(new Predicate<WorldObject>(obj =>
targets.RemoveAll(obj =>
{
Unit target = obj.ToUnit();
if (target)
return !GetCaster().IsInRaidWith(target);
return true;
}));
});
uint maxTargets = 3;
+1 -1
View File
@@ -367,7 +367,7 @@ namespace Scripts.Spells.Warrior
}
// 70844 - Item - Warrior T10 Protection 4P Bonus
[Script] /// 7.1.5
[Script] // 7.1.5
class spell_warr_item_t10_prot_4p_bonus : AuraScript
{
public override bool Validate(SpellInfo spellInfo)