warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Minor refactor of spells (#795)

Browse source
This commit is contained in:
IAmDanielDinner 2021-09-20 00:45:05 +02:00 • committed by GitHub
parent 77e5d8521f
commit a0c3158675
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Projects/UOContent/Spells/Base/SpellHelper.cs
View file

@ -220,7 +220,7 @@ namespace Server.Spells
}
}
if (Core.Expansion == Expansion.AOS)
if (Core.AOS)
{
for (var i = 0; i < m.Aggressors.Count; ++i)
{
@ -257,6 +257,17 @@ namespace Server.Spells
return false;
}
public static bool GetEastToWest(IPoint3D from,IPoint3D target)
{
var dx = from.X - target.X;
var dy = from.Y - target.Y;
var rx = (dx - dy) * 44;
var ry = (dx + dy) * 44;
return (rx >= 0 && ry < 0) || (ry >= 0 && rx < 0);
}
public static bool CanRevealCaster(Mobile m) => m is BaseCreature { Controlled: false };
public static void GetSurfaceTop(ref IPoint3D p)

7
Projects/UOContent/Spells/Fifth/PoisonField.cs
View file

@ -38,12 +38,7 @@ namespace Server.Spells.Fifth
SpellHelper.GetSurfaceTop(ref p);
var dx = Caster.Location.X - p.X;
var dy = Caster.Location.Y - p.Y;
var rx = (dx - dy) * 44;
var ry = (dx + dy) * 44;
bool eastToWest = rx == 0 && ry >= 0 || rx >= 0 && ry == 0;
var eastToWest = SpellHelper.GetEastToWest(Caster.Location, p);
Effects.PlaySound(new Point3D(p), Caster.Map, 0x20B);

7
Projects/UOContent/Spells/Fourth/FireField.cs
View file

@ -38,12 +38,7 @@ namespace Server.Spells.Fourth
SpellHelper.GetSurfaceTop(ref p);
var dx = Caster.Location.X - p.X;
var dy = Caster.Location.Y - p.Y;
var rx = (dx - dy) * 44;
var ry = (dx + dy) * 44;
bool eastToWest = rx == 0 && ry >= 0 || rx >= 0 && ry == 0;
var eastToWest = SpellHelper.GetEastToWest(Caster.Location, p);
Effects.PlaySound(new Point3D(p), Caster.Map, 0x20C);

8
Projects/UOContent/Spells/Seventh/EnergyField.cs
View file

@ -38,13 +38,7 @@ namespace Server.Spells.Seventh
SpellHelper.GetSurfaceTop(ref p);
var dx = Caster.Location.X - p.X;
var dy = Caster.Location.Y - p.Y;
var rx = (dx - dy) * 44;
var ry = (dx + dy) * 44;
bool eastToWest = rx == 0 && ry >= 0 || rx >= 0 && ry == 0;
var eastToWest = SpellHelper.GetEastToWest(Caster.Location, p);
Effects.PlaySound(new Point3D(p), Caster.Map, 0x20B);

7
Projects/UOContent/Spells/Sixth/ParalyzeField.cs
View file

@ -37,12 +37,7 @@ namespace Server.Spells.Sixth
SpellHelper.GetSurfaceTop(ref p);
var dx = Caster.Location.X - p.X;
var dy = Caster.Location.Y - p.Y;
var rx = (dx - dy) * 44;
var ry = (dx + dy) * 44;
bool eastToWest = rx == 0 && ry >= 0 || rx >= 0 && ry == 0;
var eastToWest = SpellHelper.GetEastToWest(Caster.Location, p);
Effects.PlaySound(new Point3D(p), Caster.Map, 0x20B);

7
Projects/UOContent/Spells/Third/WallOfStone.cs
View file

@ -35,12 +35,7 @@ namespace Server.Spells.Third
SpellHelper.GetSurfaceTop(ref p);
var dx = Caster.Location.X - p.X;
var dy = Caster.Location.Y - p.Y;
var rx = (dx - dy) * 44;
var ry = (dx + dy) * 44;
bool eastToWest = rx == 0 && ry >= 0 || rx >= 0 && ry == 0;
var eastToWest = SpellHelper.GetEastToWest(Caster.Location, p);
Effects.PlaySound(new Point3D(p), Caster.Map, 0x1F6);