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

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Projects/Scripts/Spells/Fourth/ArchCure.cs
View file

@ -124,9 +124,23 @@ namespace Server.Spells.Fourth
return true;
}
private bool IsAggressor(Mobile m) => Caster.Aggressors.Any(info => m == info.Attacker && !info.Expired);
private bool IsAggressor(Mobile m)
{
foreach (AggressorInfo info in Caster.Aggressors)
if (m == info.Attacker && !info.Expired)
return true;
private bool IsAggressed(Mobile m) => Caster.Aggressed.Any(info => m == info.Defender && !info.Expired);
return false;
}
private bool IsAggressed(Mobile m)
{
foreach (AggressorInfo info in Caster.Aggressed)
if (m == info.Defender && !info.Expired)
return true;
return false;
}
private static bool IsInnocentTo(Mobile from, Mobile to) => Notoriety.Compute(from, to) == Notoriety.Innocent;

2
Projects/Scripts/Spells/Fourth/Curse.cs
View file

@ -77,7 +77,7 @@ namespace Server.Spells.Fourth
string args = $"{percentage}\t{percentage}\t{percentage}\t{10}\t{10}\t{10}\t{10}";
BuffInfo.AddBuff(m, new BuffInfo(BuffIcon.Curse, 1075835, args, length, m));
BuffInfo.AddBuff(m, new BuffInfo(BuffIcon.Curse, 1075835, 1075836, length, m, args));
HarmfulSpell(m);
}

13
Projects/Scripts/Spells/Fourth/FireField.cs
View file

@ -47,7 +47,16 @@ namespace Server.Spells.Fourth
int rx = (dx - dy) * 44;
int ry = (dx + dy) * 44;
bool eastToWest = (rx < 0 || ry < 0) && (rx >= 0 || ry >= 0);
bool eastToWest;
if (rx >= 0 && ry >= 0)
eastToWest = false;
else if (rx >= 0)
eastToWest = true;
else if (ry >= 0)
eastToWest = true;
else
eastToWest = false;
Effects.PlaySound(p, Caster.Map, 0x20C);
@ -56,7 +65,7 @@ namespace Server.Spells.Fourth
TimeSpan duration;
if (Core.AOS)
duration = TimeSpan.FromSeconds((15 + Caster.Skills.Magery.Fixed / 5.0) / 4.0);
duration = TimeSpan.FromSeconds((15 + Caster.Skills.Magery.Fixed / 5) / 4);
else
duration = TimeSpan.FromSeconds(4.0 + Caster.Skills.Magery.Value * 0.5);

2
Projects/Scripts/Spells/Fourth/Lightning.cs
View file

@ -58,7 +58,7 @@ namespace Server.Spells.Fourth
damage *= GetDamageScalar(m);
}
m.BoltEffect();
m.BoltEffect(0);
SpellHelper.Damage(this, m, damage, 0, 0, 0, 0, 100);
}