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

Formatting FIxes (#58)

Browse source
This commit is contained in:
Kamron Batman 2019-10-04 23:08:13 -07:00 • committed by GitHub
parent 57fb9fb525
commit 096d39609e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1318 changed files with 11633 additions and 22129 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Projects/Scripts/Mobiles/Monsters/ML/Animal/CuSidhe.cs
View file

@ -99,35 +99,17 @@ namespace Server.Mobiles
base.OnDoubleClick(from);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.BleedAttack;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack;
public override int GetIdleSound()
{
return 0x577;
}
public override int GetIdleSound() => 0x577;
public override int GetAttackSound()
{
return 0x576;
}
public override int GetAttackSound() => 0x576;
public override int GetAngerSound()
{
return 0x578;
}
public override int GetAngerSound() => 0x578;
public override int GetHurtSound()
{
return 0x576;
}
public override int GetHurtSound() => 0x576;
public override int GetDeathSound()
{
return 0x579;
}
public override int GetDeathSound() => 0x579;
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Bedlam/LadyMarai.cs
View file

@ -66,10 +66,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 3);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.CrushingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.CrushingBlow;
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Bedlam/MasterTheophilus.cs
View file

@ -70,10 +70,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 3);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ParalyzingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow;
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Bedlam/RedDeath.cs
View file

@ -66,10 +66,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 3);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.WhirlwindAttack;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.WhirlwindAttack;
public override void OnDeath(Container c)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Blighted Grove/Coil.cs
View file

@ -61,10 +61,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 3);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.MortalStrike;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.MortalStrike;
public override void OnDeath(Container c)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Blighted Grove/Thrasher.cs
View file

@ -51,10 +51,7 @@ namespace Server.Mobiles
AddLoot(LootPack.FilthyRich, 4);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ArmorIgnore;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ArmorIgnore;
public override void OnDeath(Container c)
{

25
Projects/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/FetidEssence.cs
View file

@ -52,30 +52,15 @@ namespace Server.Mobiles
AddLoot(LootPack.FilthyRich);
}
public override int GetAngerSound()
{
return 0x56d;
}
public override int GetAngerSound() => 0x56d;
public override int GetIdleSound()
{
return 0x56b;
}
public override int GetIdleSound() => 0x56b;
public override int GetAttackSound()
{
return 0x56c;
}
public override int GetAttackSound() => 0x56c;
public override int GetHurtSound()
{
return 0x56c;
}
public override int GetHurtSound() => 0x56c;
public override int GetDeathSound()
{
return 0x56e;
}
public override int GetDeathSound() => 0x56e;
public override void Serialize(GenericWriter writer)
{

35
Projects/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/InterredGrizzle .cs
View file

@ -68,30 +68,15 @@ namespace Server.Mobiles
* Acid last 10 seconds
*/
public override int GetAngerSound()
{
return 0x581;
}
public override int GetAngerSound() => 0x581;
public override int GetIdleSound()
{
return 0x582;
}
public override int GetIdleSound() => 0x582;
public override int GetAttackSound()
{
return 0x580;
}
public override int GetAttackSound() => 0x580;
public override int GetHurtSound()
{
return 0x583;
}
public override int GetHurtSound() => 0x583;
public override int GetDeathSound()
{
return 0x584;
}
public override int GetDeathSound() => 0x584;
public override void OnDamage(int amount, Mobile from, bool willKill)
{
@ -101,15 +86,9 @@ namespace Server.Mobiles
base.OnDamage(amount, from, willKill);
}
private int RandomPoint(int mid)
{
return mid + Utility.RandomMinMax(-2, 2);
}
private int RandomPoint(int mid) => mid + Utility.RandomMinMax(-2, 2);
public virtual Point3D GetSpawnPosition(int range)
{
return GetSpawnPosition(Location, Map, range);
}
public virtual Point3D GetSpawnPosition(int range) => GetSpawnPosition(Location, Map, range);
public virtual Point3D GetSpawnPosition(Point3D from, Map map, int range)
{

8
Projects/Scripts/Mobiles/Monsters/ML/Humanoid/Magic/MLDryad.cs
View file

@ -114,11 +114,9 @@ namespace Server.Mobiles
PlaySound(0x1D3);
}
public bool IsValidTarget(PlayerMobile m)
{
return m?.PeacedUntil < DateTime.UtcNow && !m.Hidden && m.AccessLevel == AccessLevel.Player &&
CanBeHarmful(m);
}
public bool IsValidTarget(PlayerMobile m) =>
m?.PeacedUntil < DateTime.UtcNow && !m.Hidden && m.AccessLevel == AccessLevel.Player &&
CanBeHarmful(m);
#endregion

5
Projects/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/CorruptedSoul.cs
View file

@ -59,10 +59,7 @@ namespace Server.Mobiles
return 0x0;
}*/
public override int GetAttackSound()
{
return 0x233;
}
public override int GetAttackSound() => 0x233;
// TODO: Proper OnDeath Effect

20
Projects/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/FerelTreefellow.cs
View file

@ -48,25 +48,13 @@ namespace Server.Mobiles
public override bool BleedImmune => true;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
public override int GetIdleSound()
{
return 443;
}
public override int GetIdleSound() => 443;
public override int GetDeathSound()
{
return 31;
}
public override int GetDeathSound() => 31;
public override int GetAttackSound()
{
return 672;
}
public override int GetAttackSound() => 672;
public override void GenerateLoot()
{

30
Projects/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Minotaur.cs
View file

@ -48,10 +48,7 @@ namespace Server.Mobiles
public override string DefaultName => "a minotaur";
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ParalyzingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow;
public override void GenerateLoot()
{
@ -59,30 +56,15 @@ namespace Server.Mobiles
}
// Using Tormented Minotaur sounds - Need to veryfy
public override int GetAngerSound()
{
return 0x597;
}
public override int GetAngerSound() => 0x597;
public override int GetIdleSound()
{
return 0x596;
}
public override int GetIdleSound() => 0x596;
public override int GetAttackSound()
{
return 0x599;
}
public override int GetAttackSound() => 0x599;
public override int GetHurtSound()
{
return 0x59a;
}
public override int GetHurtSound() => 0x59a;
public override int GetDeathSound()
{
return 0x59c;
}
public override int GetDeathSound() => 0x59c;
public override void Serialize(GenericWriter writer)
{

30
Projects/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurCaptain.cs
View file

@ -48,10 +48,7 @@ namespace Server.Mobiles
public override string DefaultName => "a minotaur captain";
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ParalyzingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow;
public override void GenerateLoot()
{
@ -59,30 +56,15 @@ namespace Server.Mobiles
}
// Using Tormented Minotaur sounds - Need to veryfy
public override int GetAngerSound()
{
return 0x597;
}
public override int GetAngerSound() => 0x597;
public override int GetIdleSound()
{
return 0x596;
}
public override int GetIdleSound() => 0x596;
public override int GetAttackSound()
{
return 0x599;
}
public override int GetAttackSound() => 0x599;
public override int GetHurtSound()
{
return 0x59a;
}
public override int GetHurtSound() => 0x59a;
public override int GetDeathSound()
{
return 0x59c;
}
public override int GetDeathSound() => 0x59c;
public override void Serialize(GenericWriter writer)
{

30
Projects/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/MinotaurScout.cs
View file

@ -48,10 +48,7 @@ namespace Server.Mobiles
public override string DefaultName => "a minotaur scout";
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ParalyzingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow;
public override void GenerateLoot()
{
@ -59,30 +56,15 @@ namespace Server.Mobiles
}
// Using Tormented Minotaur sounds - Need to veryfy
public override int GetAngerSound()
{
return 0x597;
}
public override int GetAngerSound() => 0x597;
public override int GetIdleSound()
{
return 0x596;
}
public override int GetIdleSound() => 0x596;
public override int GetAttackSound()
{
return 0x599;
}
public override int GetAttackSound() => 0x599;
public override int GetHurtSound()
{
return 0x59a;
}
public override int GetHurtSound() => 0x59a;
public override int GetDeathSound()
{
return 0x59c;
}
public override int GetDeathSound() => 0x59c;
public override void Serialize(GenericWriter writer)
{

30
Projects/Scripts/Mobiles/Monsters/ML/Humanoid/Melee/Tormented Minotaur.cs
View file

@ -45,40 +45,22 @@ namespace Server.Mobiles
public override Poison PoisonImmune => Poison.Deadly;
public override int TreasureMapLevel => 3;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
public override void GenerateLoot()
{
AddLoot(LootPack.FilthyRich, 10);
}
public override int GetDeathSound()
{
return 0x596;
}
public override int GetDeathSound() => 0x596;
public override int GetAttackSound()
{
return 0x597;
}
public override int GetAttackSound() => 0x597;
public override int GetIdleSound()
{
return 0x598;
}
public override int GetIdleSound() => 0x598;
public override int GetAngerSound()
{
return 0x599;
}
public override int GetAngerSound() => 0x599;
public override int GetHurtSound()
{
return 0x59A;
}
public override int GetHurtSound() => 0x59A;
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Labyrinth/Miasma.cs
View file

@ -91,10 +91,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 4);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.MortalStrike;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.MortalStrike;
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Misc/Magic/GreaterDragon.cs
View file

@ -74,10 +74,7 @@ namespace Server.Mobiles
AddLoot(LootPack.Gems, 8);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.BleedAttack;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack;
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Misc/Melee/Reptalon.cs
View file

@ -57,10 +57,7 @@ namespace Server.Mobiles
AddLoot(LootPack.AosUltraRich, 3);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ParalyzingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow;
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Painted Caves/Lurg.cs
View file

@ -55,10 +55,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 2);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.CrushingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.CrushingBlow;
public override void Serialize(GenericWriter writer)
{

25
Projects/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalLatticeSeeker.cs
View file

@ -127,30 +127,15 @@ namespace Server.Mobiles
}
}
public override int GetAttackSound()
{
return 0x2F6;
}
public override int GetAttackSound() => 0x2F6;
public override int GetDeathSound()
{
return 0x2F7;
}
public override int GetDeathSound() => 0x2F7;
public override int GetAngerSound()
{
return 0x2F8;
}
public override int GetAngerSound() => 0x2F8;
public override int GetHurtSound()
{
return 0x2F9;
}
public override int GetHurtSound() => 0x2F9;
public override int GetIdleSound()
{
return 0x2FA;
}
public override int GetIdleSound() => 0x2FA;
public override void Serialize(GenericWriter writer)
{

10
Projects/Scripts/Mobiles/Monsters/ML/Prism of Light/CrystalVortex.cs
View file

@ -68,15 +68,9 @@ namespace Server.Mobiles
}
*/
public override int GetAngerSound()
{
return 0x15;
}
public override int GetAngerSound() => 0x15;
public override int GetAttackSound()
{
return 0x28;
}
public override int GetAttackSound() => 0x28;
public override void Serialize(GenericWriter writer)
{

40
Projects/Scripts/Mobiles/Monsters/ML/Special/Ilhenir.cs
View file

@ -189,30 +189,15 @@ namespace Server.Mobiles
base.OnDamage(amount, from, willKill);
}
public override int GetAngerSound()
{
return 0x581;
}
public override int GetAngerSound() => 0x581;
public override int GetIdleSound()
{
return 0x582;
}
public override int GetIdleSound() => 0x582;
public override int GetAttackSound()
{
return 0x580;
}
public override int GetAttackSound() => 0x580;
public override int GetHurtSound()
{
return 0x583;
}
public override int GetHurtSound() => 0x583;
public override int GetDeathSound()
{
return 0x584;
}
public override int GetDeathSound() => 0x584;
public override void Serialize(GenericWriter writer)
{
@ -247,10 +232,7 @@ namespace Server.Mobiles
from.Send(SpeedControl.Disable);
}
public static bool UnderCacophonicAttack(Mobile from)
{
return m_Table.Contains(from);
}
public static bool UnderCacophonicAttack(Mobile from) => m_Table.Contains(from);
public virtual void DropOoze()
{
@ -282,15 +264,9 @@ namespace Server.Mobiles
}
}
private int RandomPoint(int mid)
{
return mid + Utility.RandomMinMax(-2, 2);
}
private int RandomPoint(int mid) => mid + Utility.RandomMinMax(-2, 2);
public virtual Point3D GetSpawnPosition(int range)
{
return GetSpawnPosition(Location, Map, range);
}
public virtual Point3D GetSpawnPosition(int range) => GetSpawnPosition(Location, Map, range);
public virtual Point3D GetSpawnPosition(Point3D from, Map map, int range)
{

30
Projects/Scripts/Mobiles/Monsters/ML/Special/Meraktus.cs
View file

@ -84,10 +84,7 @@ namespace Server.Mobiles
public override bool Unprovokable => true;
public override bool Uncalmable => true;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
public virtual void PackResources(int amount)
{
@ -158,30 +155,15 @@ namespace Server.Mobiles
AddLoot(LootPack.AosSuperBoss, 5); // Need to verify
}
public override int GetAngerSound()
{
return 0x597;
}
public override int GetAngerSound() => 0x597;
public override int GetIdleSound()
{
return 0x596;
}
public override int GetIdleSound() => 0x596;
public override int GetAttackSound()
{
return 0x599;
}
public override int GetAttackSound() => 0x599;
public override int GetHurtSound()
{
return 0x59a;
}
public override int GetHurtSound() => 0x59a;
public override int GetDeathSound()
{
return 0x59c;
}
public override int GetDeathSound() => 0x59c;
public override void OnGaveMeleeAttack(Mobile defender)
{

25
Projects/Scripts/Mobiles/Monsters/ML/Twisted Weald/Changeling.cs
View file

@ -110,30 +110,15 @@ namespace Server.Mobiles
AddLoot(LootPack.AosRich, 3);
}
public override int GetAngerSound()
{
return 0x46E;
}
public override int GetAngerSound() => 0x46E;
public override int GetIdleSound()
{
return 0x470;
}
public override int GetIdleSound() => 0x470;
public override int GetAttackSound()
{
return 0x46D;
}
public override int GetAttackSound() => 0x46D;
public override int GetHurtSound()
{
return 0x471;
}
public override int GetHurtSound() => 0x471;
public override int GetDeathSound()
{
return 0x46F;
}
public override int GetDeathSound() => 0x46F;
public override void OnThink()
{

5
Projects/Scripts/Mobiles/Monsters/ML/Twisted Weald/LadyLissith.cs
View file

@ -70,10 +70,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 2);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.BleedAttack;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack;
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Twisted Weald/LadySabrix.cs
View file

@ -76,10 +76,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 2);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ArmorIgnore;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ArmorIgnore;
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Twisted Weald/Malefic.cs
View file

@ -61,10 +61,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 3);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Twisted Weald/Silk.cs
View file

@ -53,10 +53,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 2);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.ParalyzingBlow;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow;
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Mobiles/Monsters/ML/Twisted Weald/Virulent.cs
View file

@ -75,10 +75,7 @@ namespace Server.Mobiles
AddLoot(LootPack.UltraRich, 3);
}
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.MortalStrike;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.MortalStrike;
public override void Serialize(GenericWriter writer)
{