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

fix: Updates ArrayPool to STArrayPool for performance. (#968)

Browse source
This commit is contained in:
Kamron Batman 2022-03-22 20:07:32 -07:00 • committed by GitHub
parent 76fddcbccd
commit 14b63ca48e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 3163 additions and 3165 deletions
Download patch file Download diff file Expand all files Collapse all files

199
Projects/UOContent/Mobiles/Monsters/Misc/Melee/BladeSpirits.cs
View file

@ -1,118 +1,117 @@
using System;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Mobiles
namespace Server.Mobiles;
public class BladeSpirits : BaseCreature
{
public class BladeSpirits : BaseCreature
[Constructible]
public BladeSpirits() : base(AIType.AI_Melee)
{
[Constructible]
public BladeSpirits() : base(AIType.AI_Melee)
Body = 574;
SetSpeed(0.5, 1.2);
SetStr(150);
SetDex(150);
SetInt(100);
SetHits(Core.SE ? 160 : 80);
SetStam(250);
SetMana(0);
SetDamage(10, 14);
SetDamageType(ResistanceType.Physical, 60);
SetDamageType(ResistanceType.Poison, 20);
SetDamageType(ResistanceType.Energy, 20);
SetResistance(ResistanceType.Physical, 30, 40);
SetResistance(ResistanceType.Fire, 40, 50);
SetResistance(ResistanceType.Cold, 30, 40);
SetResistance(ResistanceType.Poison, 100);
SetResistance(ResistanceType.Energy, 20, 30);
SetSkill(SkillName.MagicResist, 70.0);
SetSkill(SkillName.Tactics, 90.0);
SetSkill(SkillName.Wrestling, 90.0);
Fame = 0;
Karma = 0;
VirtualArmor = 40;
ControlSlots = Core.SE ? 2 : 1;
}
public BladeSpirits(Serial serial) : base(serial)
{
}
public override string CorpseName => "a blade spirit corpse";
public override bool DeleteCorpseOnDeath => Core.AOS;
public override bool IsHouseSummonable => true;
public override double DispelDifficulty => 0.0;
public override double DispelFocus => 20.0;
public override string DefaultName => "a blade spirit";
public override bool BleedImmune => true;
public override Poison PoisonImmune => Poison.Lethal;
public override double GetFightModeRanking(Mobile m, FightMode acqType, bool bPlayerOnly) =>
(m.Str + m.Skills.Tactics.Value) / Math.Max(GetDistanceToSqrt(m), 1.0);
public override int GetAngerSound() => 0x23A;
public override int GetAttackSound() => 0x3B8;
public override int GetHurtSound() => 0x23A;
public override void OnThink()
{
if (Core.SE && Summoned)
{
Body = 574;
SetSpeed(0.5, 1.2);
SetStr(150);
SetDex(150);
SetInt(100);
SetHits(Core.SE ? 160 : 80);
SetStam(250);
SetMana(0);
SetDamage(10, 14);
SetDamageType(ResistanceType.Physical, 60);
SetDamageType(ResistanceType.Poison, 20);
SetDamageType(ResistanceType.Energy, 20);
SetResistance(ResistanceType.Physical, 30, 40);
SetResistance(ResistanceType.Fire, 40, 50);
SetResistance(ResistanceType.Cold, 30, 40);
SetResistance(ResistanceType.Poison, 100);
SetResistance(ResistanceType.Energy, 20, 30);
SetSkill(SkillName.MagicResist, 70.0);
SetSkill(SkillName.Tactics, 90.0);
SetSkill(SkillName.Wrestling, 90.0);
Fame = 0;
Karma = 0;
VirtualArmor = 40;
ControlSlots = Core.SE ? 2 : 1;
}
public BladeSpirits(Serial serial) : base(serial)
{
}
public override string CorpseName => "a blade spirit corpse";
public override bool DeleteCorpseOnDeath => Core.AOS;
public override bool IsHouseSummonable => true;
public override double DispelDifficulty => 0.0;
public override double DispelFocus => 20.0;
public override string DefaultName => "a blade spirit";
public override bool BleedImmune => true;
public override Poison PoisonImmune => Poison.Lethal;
public override double GetFightModeRanking(Mobile m, FightMode acqType, bool bPlayerOnly) =>
(m.Str + m.Skills.Tactics.Value) / Math.Max(GetDistanceToSqrt(m), 1.0);
public override int GetAngerSound() => 0x23A;
public override int GetAttackSound() => 0x3B8;
public override int GetHurtSound() => 0x23A;
public override void OnThink()
{
if (Core.SE && Summoned)
var eable = GetMobilesInRange(5);
using var queue = PooledRefQueue<Mobile>.Create();
foreach (var m in eable)
{
var eable = GetMobilesInRange(5);
using var queue = PooledRefQueue<Mobile>.Create();
foreach (var m in eable)
if (m is EnergyVortex or BladeSpirits && ((BaseCreature)m).Summoned)
{
if (m is EnergyVortex or BladeSpirits && ((BaseCreature)m).Summoned)
{
queue.Enqueue(m);
}
}
eable.Free();
var amount = queue.Count - 6;
if (amount > 0)
{
var mobs = queue.ToPooledArray();
mobs.Shuffle();
while (amount > 0)
{
Dispel(mobs[amount--]);
}
ArrayPool<Mobile>.Shared.Return(mobs, true);
queue.Enqueue(m);
}
}
eable.Free();
base.OnThink();
var amount = queue.Count - 6;
if (amount > 0)
{
var mobs = queue.ToPooledArray();
mobs.Shuffle();
while (amount > 0)
{
Dispel(mobs[amount--]);
}
STArrayPool<Mobile>.Shared.Return(mobs, true);
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
base.OnThink();
}
writer.Write(0); // version
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
writer.Write(0); // version
}
var version = reader.ReadInt();
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}

219
Projects/UOContent/Mobiles/Monsters/Misc/Melee/EnergyVortex.cs
View file

@ -1,129 +1,128 @@
using System;
using System.Buffers;
using Server.Buffers;
using Server.Collections;
namespace Server.Mobiles
namespace Server.Mobiles;
public class EnergyVortex : BaseCreature
{
public class EnergyVortex : BaseCreature
[Constructible]
public EnergyVortex() : base(AIType.AI_Melee)
{
[Constructible]
public EnergyVortex() : base(AIType.AI_Melee)
if (Core.SE && Utility.Random(500) == 0) // Per OSI FoF, it's a 1/500 chance.
{
if (Core.SE && Utility.RandomDouble() < 0.002) // Per OSI FoF, it's a 1/500 chance.
{
// Llama vortex!
Body = 0xDC;
Hue = 0x76;
}
else
{
Body = 164;
}
SetStr(200);
SetDex(200);
SetInt(100);
SetHits(Core.SE ? 140 : 70);
SetStam(250);
SetMana(0);
SetDamage(14, 17);
SetDamageType(ResistanceType.Physical, 0);
SetDamageType(ResistanceType.Energy, 100);
SetResistance(ResistanceType.Physical, 60, 70);
SetResistance(ResistanceType.Fire, 40, 50);
SetResistance(ResistanceType.Cold, 40, 50);
SetResistance(ResistanceType.Poison, 40, 50);
SetResistance(ResistanceType.Energy, 90, 100);
SetSkill(SkillName.MagicResist, 99.9);
SetSkill(SkillName.Tactics, 100.0);
SetSkill(SkillName.Wrestling, 120.0);
Fame = 0;
Karma = 0;
VirtualArmor = 40;
ControlSlots = Core.SE ? 2 : 1;
// Llama vortex!
Body = 0xDC;
Hue = 0x76;
}
else
{
Body = 164;
}
public EnergyVortex(Serial serial)
: base(serial)
SetStr(200);
SetDex(200);
SetInt(100);
SetHits(Core.SE ? 140 : 70);
SetStam(250);
SetMana(0);
SetDamage(14, 17);
SetDamageType(ResistanceType.Physical, 0);
SetDamageType(ResistanceType.Energy, 100);
SetResistance(ResistanceType.Physical, 60, 70);
SetResistance(ResistanceType.Fire, 40, 50);
SetResistance(ResistanceType.Cold, 40, 50);
SetResistance(ResistanceType.Poison, 40, 50);
SetResistance(ResistanceType.Energy, 90, 100);
SetSkill(SkillName.MagicResist, 99.9);
SetSkill(SkillName.Tactics, 100.0);
SetSkill(SkillName.Wrestling, 120.0);
Fame = 0;
Karma = 0;
VirtualArmor = 40;
ControlSlots = Core.SE ? 2 : 1;
}
public EnergyVortex(Serial serial)
: base(serial)
{
}
public override string CorpseName => "an energy vortex corpse";
public override bool DeleteCorpseOnDeath => Summoned;
public override bool AlwaysMurderer => true; // Or Llama vortices will appear gray.
public override double DispelDifficulty => 80.0;
public override double DispelFocus => 20.0;
public override string DefaultName => "an energy vortex";
public override bool BleedImmune => true;
public override Poison PoisonImmune => Poison.Lethal;
public override double GetFightModeRanking(Mobile m, FightMode acqType, bool bPlayerOnly) =>
(m.Int + m.Skills.Magery.Value) / Math.Max(GetDistanceToSqrt(m), 1.0);
public override int GetAngerSound() => 0x15;
public override int GetAttackSound() => 0x28;
public override void OnThink()
{
if (Core.SE && Summoned)
{
}
public override string CorpseName => "an energy vortex corpse";
public override bool DeleteCorpseOnDeath => Summoned;
public override bool AlwaysMurderer => true; // Or Llama vortices will appear gray.
public override double DispelDifficulty => 80.0;
public override double DispelFocus => 20.0;
public override string DefaultName => "an energy vortex";
public override bool BleedImmune => true;
public override Poison PoisonImmune => Poison.Lethal;
public override double GetFightModeRanking(Mobile m, FightMode acqType, bool bPlayerOnly) =>
(m.Int + m.Skills.Magery.Value) / Math.Max(GetDistanceToSqrt(m), 1.0);
public override int GetAngerSound() => 0x15;
public override int GetAttackSound() => 0x28;
public override void OnThink()
{
if (Core.SE && Summoned)
var eable = GetMobilesInRange(5);
using var queue = PooledRefQueue<Mobile>.Create();
foreach (var m in eable)
{
var eable = GetMobilesInRange(5);
using var queue = PooledRefQueue<Mobile>.Create();
foreach (var m in eable)
if (m is EnergyVortex or BladeSpirits && ((BaseCreature)m).Summoned)
{
if (m is EnergyVortex or BladeSpirits && ((BaseCreature)m).Summoned)
{
queue.Enqueue(m);
}
}
eable.Free();
var amount = queue.Count - 6;
if (amount > 0)
{
var mobs = queue.ToPooledArray();
mobs.Shuffle();
while (amount > 0)
{
Dispel(mobs[amount--]);
}
ArrayPool<Mobile>.Shared.Return(mobs, true);
queue.Enqueue(m);
}
}
eable.Free();
base.OnThink();
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (BaseSoundID == 263)
var amount = queue.Count - 6;
if (amount > 0)
{
BaseSoundID = 0;
var mobs = queue.ToPooledArray();
mobs.Shuffle();
while (amount > 0)
{
Dispel(mobs[amount--]);
}
STArrayPool<Mobile>.Shared.Return(mobs, true);
}
}
base.OnThink();
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (BaseSoundID == 263)
{
BaseSoundID = 0;
}
}
}