Core/Refactor: Part 2

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
+1 -1
View File
@@ -649,7 +649,7 @@ namespace Scripts.Spells.Druid
Unit caster = eventInfo.GetActor();
var costs = spell.GetPowerCost();
var m = costs.First(cost => { return cost.Power == PowerType.Mana; });
var m = costs.First(cost => cost.Power == PowerType.Mana);
if (m == null)
return;
+2 -5
View File
@@ -1462,7 +1462,7 @@ namespace Scripts.Spells.Items
if (spell != null)
{
var costs = spell.GetPowerCost();
var m = costs.FirstOrDefault(cost => { return cost.Power == PowerType.Mana && cost.Amount > 0; });
var m = costs.FirstOrDefault(cost => cost.Power == PowerType.Mana && cost.Amount > 0);
if (m != null)
return true;
}
@@ -3040,10 +3040,7 @@ namespace Scripts.Spells.Items
void FilterTargets(List<WorldObject> targets)
{
targets.RemoveAll(obj =>
{
return !obj.IsTypeId(TypeId.Player) && !obj.IsTypeId(TypeId.Corpse);
});
targets.RemoveAll(obj => !obj.IsTypeId(TypeId.Player) && !obj.IsTypeId(TypeId.Corpse));
if (targets.Empty())
{
+2 -8
View File
@@ -345,10 +345,7 @@ namespace Scripts.Spells.Shaman
{
void SelectTargets(List<WorldObject> targets)
{
targets.RemoveAll(target =>
{
return !target.ToUnit() || target.ToUnit().IsFullHealth();
});
targets.RemoveAll(target => !target.ToUnit() || target.ToUnit().IsFullHealth());
targets.RandomResize(1);
@@ -635,10 +632,7 @@ namespace Scripts.Spells.Shaman
void FilterTargets(List<WorldObject> targets)
{
targets.Remove(GetExplTargetUnit());
targets.RandomResize(target =>
{
return target.IsTypeId(TypeId.Unit) && !target.ToUnit().HasAura(SpellIds.FlameShockMaelstrom, GetCaster().GetGUID());
}, 1);
targets.RandomResize(target => target.IsTypeId(TypeId.Unit) && !target.ToUnit().HasAura(SpellIds.FlameShockMaelstrom, GetCaster().GetGUID()), 1);
}
void HandleScript(uint effIndex)