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

301
Projects/Server/Effects.cs
View file

@ -48,26 +48,44 @@ namespace Server
ParticleSupportType == ParticleSupportType.Full ||
ParticleSupportType == ParticleSupportType.Detect && state.IsUOTDClient;
public static void PlaySound(IPoint3D p, Map map, int soundId)
public static void PlaySound(IPoint3D p, Map map, int soundID)
{
if (soundId <= -1)
if (soundID <= -1)
return;
if (map != null)
{
IPooledEnumerable<NetState> eable = map.GetClientsInRange(p);
Packet playSound = null;
IPooledEnumerable<NetState> eable = map.GetClientsInRange(new Point3D(p));
foreach (NetState state in eable)
{
state.Mobile.ProcessDelta();
Packets.SendPlaySound(state, soundId, p);
if (playSound == null)
playSound = Packet.Acquire(new PlaySound(soundID, p));
state.Send(playSound);
}
Packet.Release(playSound);
eable.Free();
}
}
public static void SendBoltEffect(IEntity e, bool sound = true)
public static void SendBoltEffect(IEntity e)
{
SendBoltEffect(e, true, 0);
}
public static void SendBoltEffect(IEntity e, bool sound)
{
SendBoltEffect(e, sound, 0);
}
public static void SendBoltEffect(IEntity e, bool sound, int hue)
{
Map map = e.Map;
@ -76,35 +94,61 @@ namespace Server
e.ProcessDelta();
Packet preEffect = null, boltEffect = null, playSound = null;
IPooledEnumerable<NetState> eable = map.GetClientsInRange(e.Location);
foreach (NetState state in eable)
if (state.Mobile.CanSee(e))
{
if (SendParticlesTo(state))
Packets.SendTargetParticleEffect(state, e, 0, 10, 5, 0, 0, 5031, 3, 0);
{
if (preEffect == null)
preEffect = Packet.Acquire(new TargetParticleEffect(e, 0, 10, 5, 0, 0, 5031, 3, 0));
Packets.SendBoltEffect(state, e);
state.Send(preEffect);
}
if (boltEffect == null)
boltEffect = Packet.Acquire(new BoltEffect(e, hue));
state.Send(boltEffect);
if (sound)
Packets.SendPlaySound(state, 0x29, e);
{
if (playSound == null)
playSound = Packet.Acquire(new PlaySound(0x29, e));
state.Send(playSound);
}
}
Packet.Release(preEffect);
Packet.Release(boltEffect);
Packet.Release(playSound);
eable.Free();
}
public static void SendLocationEffect(IPoint3D p, Map map, int itemID, int duration, int speed = 10, int hue = 0,
int renderMode = 0)
public static void SendLocationEffect(IPoint3D p, Map map, int itemID, int duration)
{
IPooledEnumerable<NetState> eable = map.GetClientsInRange(p);
SendLocationEffect(p, map, itemID, duration, 10, 0, 0);
}
foreach (NetState state in eable)
{
state.Mobile.ProcessDelta();
Packets.SendLocationHuedEffect(state, p, itemID, speed, duration, hue, renderMode);
}
public static void SendLocationEffect(IPoint3D p, Map map, int itemID, int duration, int speed)
{
SendLocationEffect(p, map, itemID, duration, speed, 0, 0);
}
eable.Free();
public static void SendLocationEffect(IPoint3D p, Map map, int itemID, int duration, int hue, int renderMode)
{
SendLocationEffect(p, map, itemID, duration, 10, hue, renderMode);
}
public static void SendLocationEffect(IPoint3D p, Map map, int itemID, int duration, int speed, int hue,
int renderMode)
{
SendPacket(p, map, new LocationEffect(p, itemID, speed, duration, hue, renderMode));
}
public static void SendLocationParticles(IEntity e, int itemID, int speed, int duration, int effect)
@ -122,39 +166,63 @@ namespace Server
{
Map map = e.Map;
if (map == null)
return;
IPooledEnumerable<NetState> eable = map.GetClientsInRange(e.Location);
foreach (NetState state in eable)
if (map != null)
{
state.Mobile.ProcessDelta();
Packet particles = null, regular = null;
if (SendParticlesTo(state))
Packets.SendLocationParticleEffect(state, e, itemID, speed, duration, hue,
renderMode, effect, unknown);
else if (itemID != 0)
Packets.SendLocationHuedEffect(state, e, itemID, speed, duration, hue, renderMode);
IPooledEnumerable<NetState> eable = map.GetClientsInRange(e.Location);
foreach (NetState state in eable)
{
state.Mobile.ProcessDelta();
if (SendParticlesTo(state))
{
if (particles == null)
particles = Packet.Acquire(new LocationParticleEffect(e, itemID, speed, duration, hue,
renderMode, effect, unknown));
state.Send(particles);
}
else if (itemID != 0)
{
if (regular == null)
regular = Packet.Acquire(new LocationEffect(e, itemID, speed, duration, hue, renderMode));
state.Send(regular);
}
}
Packet.Release(particles);
Packet.Release(regular);
eable.Free();
}
eable.Free();
//SendPacket( e.Location, e.Map, new LocationParticleEffect( e, itemID, speed, duration, hue, renderMode, effect, unknown ) );
}
public static void SendTargetEffect(IEntity target, int itemID, int speed, int duration, int hue = 0, int renderMode = 0)
public static void SendTargetEffect(IEntity target, int itemID, int duration)
{
SendTargetEffect(target, itemID, duration, 0, 0);
}
public static void SendTargetEffect(IEntity target, int itemID, int speed, int duration)
{
SendTargetEffect(target, itemID, speed, duration, 0, 0);
}
public static void SendTargetEffect(IEntity target, int itemID, int duration, int hue, int renderMode)
{
SendTargetEffect(target, itemID, 10, duration, hue, renderMode);
}
public static void SendTargetEffect(IEntity target, int itemID, int speed, int duration, int hue, int renderMode)
{
if (target is Mobile mobile)
mobile.ProcessDelta();
IPooledEnumerable<NetState> eable = target.Map.GetClientsInRange(target.Location);
foreach (NetState state in eable)
{
state.Mobile.ProcessDelta();
Packets.SendTargetHuedEffect(state, target, itemID, speed, duration, hue, renderMode);
}
eable.Free();
SendPacket(target.Location, target.Map, new TargetEffect(target, itemID, speed, duration, hue, renderMode));
}
public static void SendTargetParticles(IEntity target, int itemID, int speed, int duration, int effect,
@ -177,47 +245,44 @@ namespace Server
Map map = target.Map;
if (map == null)
return;
IPooledEnumerable<NetState> eable = map.GetClientsInRange(target.Location);
foreach (NetState state in eable)
if (map != null)
{
state.Mobile.ProcessDelta();
Packet particles = null, regular = null;
if (SendParticlesTo(state))
Packets.SendTargetParticleEffect(state, target, itemID, speed, duration, hue,
renderMode, effect, (int)layer, unknown);
else if (itemID != 0)
Packets.SendTargetHuedEffect(state, target, itemID, speed, duration, hue, renderMode);
IPooledEnumerable<NetState> eable = map.GetClientsInRange(target.Location);
foreach (NetState state in eable)
{
state.Mobile.ProcessDelta();
if (SendParticlesTo(state))
{
if (particles == null)
particles = Packet.Acquire(new TargetParticleEffect(target, itemID, speed, duration, hue,
renderMode, effect, (int)layer, unknown));
state.Send(particles);
}
else if (itemID != 0)
{
if (regular == null)
regular = Packet.Acquire(new TargetEffect(target, itemID, speed, duration, hue, renderMode));
state.Send(regular);
}
}
Packet.Release(particles);
Packet.Release(regular);
eable.Free();
}
eable.Free();
}
public static void SendMovingEffect(IPoint3D from, IPoint3D to, Map map, int itemID, int speed = 0, int duration = 0,
bool fixedDirection = false, bool explodes = false, int hue = 0, int renderMode = 0)
{
SendMovingEffect(from, from, to, map, itemID, speed, duration, fixedDirection, explodes, hue, renderMode);
}
public static void SendMovingEffect(IPoint3D range, IPoint3D from, IPoint3D to, Map map, int itemID, int speed = 0, int duration = 0,
bool fixedDirection = false, bool explodes = false, int hue = 0, int renderMode = 0)
{
IPooledEnumerable<NetState> eable = map.GetClientsInRange(range);
foreach (NetState state in eable)
{
state.Mobile.ProcessDelta();
Packets.SendMovingHuedEffect(state, from, to, itemID, speed, duration, fixedDirection, explodes, hue, renderMode);
}
eable.Free();
//SendPacket( target.Location, target.Map, new TargetParticleEffect( target, itemID, speed, duration, hue, renderMode, effect, (int)layer, unknown ) );
}
public static void SendMovingEffect(IEntity from, IEntity to, int itemID, int speed, int duration,
bool fixedDirection = false, bool explodes = false, int hue = 0, int renderMode = 0)
bool fixedDirection, bool explodes, int hue = 0, int renderMode = 0)
{
if (from is Mobile mobile)
mobile.ProcessDelta();
@ -225,15 +290,8 @@ namespace Server
if (to is Mobile mobile1)
mobile1.ProcessDelta();
IPooledEnumerable<NetState> eable = from.Map.GetClientsInRange(from.Location);
foreach (NetState state in eable)
{
state.Mobile.ProcessDelta();
Packets.SendMovingHuedEffect(state, from, to, itemID, speed, duration, fixedDirection, explodes, hue, renderMode);
}
eable.Free();
SendPacket(from.Location, from.Map,
new MovingEffect(from, to, itemID, speed, duration, fixedDirection, explodes, hue, renderMode));
}
public static void SendMovingParticles(IEntity from, IEntity to, int itemID, int speed, int duration,
@ -270,25 +328,82 @@ namespace Server
Map map = from.Map;
if (map != null)
{
Packet particles = null, regular = null;
IPooledEnumerable<NetState> eable = map.GetClientsInRange(from.Location);
foreach (NetState state in eable)
{
state.Mobile.ProcessDelta();
if (SendParticlesTo(state))
{
if (particles == null)
particles = Packet.Acquire(new MovingParticleEffect(from, to, itemID, speed, duration,
fixedDirection, explodes, hue, renderMode, effect, explodeEffect, explodeSound, layer,
unknown));
state.Send(particles);
}
else if (itemID > 1)
{
if (regular == null)
regular = Packet.Acquire(new MovingEffect(from, to, itemID, speed, duration, fixedDirection,
explodes, hue, renderMode));
state.Send(regular);
}
}
Packet.Release(particles);
Packet.Release(regular);
eable.Free();
}
//SendPacket( from.Location, from.Map, new MovingParticleEffect( from, to, itemID, speed, duration, fixedDirection, explodes, hue, renderMode, effect, explodeEffect, explodeSound, unknown ) );
}
public static void SendPacket(Point3D origin, Map map, Packet p)
{
if (map == null)
return;
IPooledEnumerable<NetState> eable = map.GetClientsInRange(origin);
IPooledEnumerable<NetState> eable = map.GetClientsInRange(from.Location);
p.Acquire();
foreach (NetState state in eable)
{
state.Mobile.ProcessDelta();
if (SendParticlesTo(state))
Packets.SendMovingParticleEffect(state, from, to, itemID, speed, duration,
fixedDirection, explodes, hue, renderMode, effect, explodeEffect, explodeSound, layer,
unknown);
else if (itemID > 1)
Packets.SendMovingHuedEffect(state, from, to, itemID, speed, duration, fixedDirection,
explodes, hue, renderMode);
state.Send(p);
}
p.Release();
eable.Free();
}
public static void SendPacket(IPoint3D origin, Map map, Packet p)
{
if (map == null)
return;
IPooledEnumerable<NetState> eable = map.GetClientsInRange(new Point3D(origin));
p.Acquire();
foreach (NetState state in eable)
{
state.Mobile.ProcessDelta();
state.Send(p);
}
p.Release();
eable.Free();
}
}
}
}