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

11
Projects/Scripts/Spells/Seventh/ChainLightning.cs
View file

@ -59,7 +59,8 @@ namespace Server.Spells.Seventh
!Caster.CanBeHarmful(m, false))
return false;
playerVsPlayer |= m.Player;
if (m.Player)
playerVsPlayer = true;
return true;
}).ToList());
@ -67,7 +68,9 @@ namespace Server.Spells.Seventh
eable.Free();
}
double damage = Core.AOS ? GetNewAosDamage(51, 1, 5, playerVsPlayer)
double damage;
damage = Core.AOS ? GetNewAosDamage(51, 1, 5, playerVsPlayer)
: Utility.Random(27, 22);
if (targets.Count > 0)
@ -93,11 +96,13 @@ namespace Server.Spells.Seventh
Caster.DoHarmful(m);
SpellHelper.Damage(this, m, toDeal, 0, 0, 0, 0, 100);
m.BoltEffect();
m.BoltEffect(0);
}
}
else
{
Caster.PlaySound(0x29);
}
}
FinishSequence();

13
Projects/Scripts/Spells/Seventh/EnergyField.cs
View file

@ -47,7 +47,16 @@ namespace Server.Spells.Seventh
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, 0x20B);
@ -134,7 +143,7 @@ namespace Server.Spells.Seventh
{
if (!(m is PlayerMobile))
return base.OnMoveOver(m);
int noto = Notoriety.Compute(m_Caster, m);
return noto != Notoriety.Enemy && noto != Notoriety.Ally && base.OnMoveOver(m);
}

21
Projects/Scripts/Spells/Seventh/GateTravel.cs
View file

@ -67,9 +67,13 @@ namespace Server.Spells.Seventh
public void Effect(Point3D loc, Map map, bool checkMulti)
{
if (Sigil.ExistsOn(Caster))
{
Caster.SendLocalizedMessage(1061632); // You can't do that while carrying the sigil.
}
else if (map == null || !Core.AOS && Caster.Map != map)
{
Caster.SendLocalizedMessage(1005570); // You can not gate to another facet.
}
else if (!SpellHelper.CheckTravel(Caster, TravelCheckType.GateFrom))
{
}
@ -77,19 +81,34 @@ namespace Server.Spells.Seventh
{
}
else if (map == Map.Felucca && Caster is PlayerMobile mobile && mobile.Young)
{
mobile.SendLocalizedMessage(1049543); // You decide against traveling to Felucca while you are still young.
}
else if (Caster.Kills >= 5 && map != Map.Felucca)
{
Caster.SendLocalizedMessage(1019004); // You are not allowed to travel there.
}
else if (Caster.Criminal)
{
Caster.SendLocalizedMessage(1005561, "", 0x22); // Thou'rt a criminal and cannot escape so easily.
}
else if (SpellHelper.CheckCombat(Caster))
{
Caster.SendLocalizedMessage(1005564, "", 0x22); // Wouldst thou flee during the heat of battle??
}
else if (!map.CanSpawnMobile(loc.X, loc.Y, loc.Z))
{
Caster.SendLocalizedMessage(501942); // That location is blocked.
}
else if (checkMulti && SpellHelper.CheckMulti(loc, map))
{
Caster.SendLocalizedMessage(501942); // That location is blocked.
else if (Core.SE && (GateExistsAt(map, loc) || GateExistsAt(Caster.Map, Caster.Location))) // SE restricted stacking gates
}
else if (Core.SE && (GateExistsAt(map, loc) || GateExistsAt(Caster.Map, Caster.Location))
) // SE restricted stacking gates
{
Caster.SendLocalizedMessage(1071242); // There is already a gate there.
}
else if (CheckSequence())
{
Caster.SendLocalizedMessage(501024); // You open a magical gate to another location

7
Projects/Scripts/Spells/Seventh/MeteorSwarm.cs
View file

@ -59,7 +59,8 @@ namespace Server.Spells.Seventh
Core.AOS && !Caster.InLOS(m))
return false;
playerVsPlayer |= m.Player;
if (m.Player)
playerVsPlayer = true;
return true;
}).ToList();
@ -71,7 +72,9 @@ namespace Server.Spells.Seventh
targets = new List<Mobile>();
}
double damage = Core.AOS ? GetNewAosDamage(51, 1, 5, playerVsPlayer)
double damage;
damage = Core.AOS ? GetNewAosDamage(51, 1, 5, playerVsPlayer)
: Utility.Random(27, 22);
if (targets.Count > 0)

1
Projects/Scripts/Spells/Seventh/Polymorph.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using Server.Factions;
using Server.Gumps;
using Server.Items;
using Server.Mobiles;
using Server.Spells.Fifth;
namespace Server.Spells.Seventh