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

25
Projects/Scripts/Mobiles/Animals/Birds/Crane.cs
View file

@ -42,30 +42,15 @@ namespace Server.Mobiles
public override int Feathers => 25;
public override int GetAngerSound()
{
return 0x4D9;
}
public override int GetAngerSound() => 0x4D9;
public override int GetIdleSound()
{
return 0x4D8;
}
public override int GetIdleSound() => 0x4D8;
public override int GetAttackSound()
{
return 0x4D7;
}
public override int GetAttackSound() => 0x4D7;
public override int GetHurtSound()
{
return 0x4DA;
}
public override int GetHurtSound() => 0x4DA;
public override int GetDeathSound()
{
return 0x4D6;
}
public override int GetDeathSound() => 0x4D6;
public override void Serialize(GenericWriter writer)
{

25
Projects/Scripts/Mobiles/Animals/Misc/Gaman.cs
View file

@ -49,30 +49,15 @@ namespace Server.Mobiles
public override int Hides => 15;
public override FoodType FavoriteFood => FoodType.GrainsAndHay;
public override int GetAngerSound()
{
return 0x4F8;
}
public override int GetAngerSound() => 0x4F8;
public override int GetIdleSound()
{
return 0x4F7;
}
public override int GetIdleSound() => 0x4F7;
public override int GetAttackSound()
{
return 0x4F6;
}
public override int GetAttackSound() => 0x4F6;
public override int GetHurtSound()
{
return 0x4F9;
}
public override int GetHurtSound() => 0x4F9;
public override int GetDeathSound()
{
return 0x4F5;
}
public override int GetDeathSound() => 0x4F5;
public override void OnDeath(Container c)
{

15
Projects/Scripts/Mobiles/Animals/Misc/GreatHart.cs
View file

@ -47,20 +47,11 @@ namespace Server.Mobiles
public override int Hides => 15;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override int GetAttackSound()
{
return 0x82;
}
public override int GetAttackSound() => 0x82;
public override int GetHurtSound()
{
return 0x83;
}
public override int GetHurtSound() => 0x83;
public override int GetDeathSound()
{
return 0x84;
}
public override int GetDeathSound() => 0x84;
public override void Serialize(GenericWriter writer)
{

15
Projects/Scripts/Mobiles/Animals/Misc/Hind.cs
View file

@ -46,20 +46,11 @@ namespace Server.Mobiles
public override int Hides => 8;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override int GetAttackSound()
{
return 0x82;
}
public override int GetAttackSound() => 0x82;
public override int GetHurtSound()
{
return 0x83;
}
public override int GetHurtSound() => 0x83;
public override int GetDeathSound()
{
return 0x84;
}
public override int GetDeathSound() => 0x84;
public override void Serialize(GenericWriter writer)
{

15
Projects/Scripts/Mobiles/Animals/Misc/PackHorse.cs
View file

@ -90,10 +90,7 @@ namespace Server.Mobiles
return true;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item)
{
return DeathMoveResult.MoveToCorpse;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item) => DeathMoveResult.MoveToCorpse;
public override bool IsSnoop(Mobile from)
{
@ -117,15 +114,9 @@ namespace Server.Mobiles
return base.OnDragDrop(from, item);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target) => PackAnimal.CheckAccess(this, from);
public override bool CheckNonlocalLift(Mobile from, Item item)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalLift(Mobile from, Item item) => PackAnimal.CheckAccess(this, from);
public override void OnDoubleClick(Mobile from)
{

15
Projects/Scripts/Mobiles/Animals/Misc/PackLlama.cs
View file

@ -89,10 +89,7 @@ namespace Server.Mobiles
return true;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item)
{
return DeathMoveResult.MoveToCorpse;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item) => DeathMoveResult.MoveToCorpse;
public override bool IsSnoop(Mobile from)
{
@ -116,15 +113,9 @@ namespace Server.Mobiles
return base.OnDragDrop(from, item);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target) => PackAnimal.CheckAccess(this, from);
public override bool CheckNonlocalLift(Mobile from, Item item)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalLift(Mobile from, Item item) => PackAnimal.CheckAccess(this, from);
public override void OnDoubleClick(Mobile from)
{

5
Projects/Scripts/Mobiles/Animals/Mounts/BaseMount.cs
View file

@ -277,10 +277,7 @@ namespace Server.Mobiles
return result;
}
public virtual bool DoMountAbility(int damage, Mobile attacker)
{
return false;
}
public virtual bool DoMountAbility(int damage, Mobile attacker) => false;
}
public class MountItem : Item, IMountItem

40
Projects/Scripts/Mobiles/Animals/Mounts/Beetle.cs
View file

@ -59,30 +59,15 @@ namespace Server.Mobiles
public override FoodType FavoriteFood => FoodType.Meat;
public override int GetAngerSound()
{
return 0x21D;
}
public override int GetAngerSound() => 0x21D;
public override int GetIdleSound()
{
return 0x21D;
}
public override int GetIdleSound() => 0x21D;
public override int GetAttackSound()
{
return 0x162;
}
public override int GetAttackSound() => 0x162;
public override int GetHurtSound()
{
return 0x163;
}
public override int GetHurtSound() => 0x163;
public override int GetDeathSound()
{
return 0x21D;
}
public override int GetDeathSound() => 0x21D;
public override void OnHarmfulSpell(Mobile from)
{
@ -122,10 +107,7 @@ namespace Server.Mobiles
return true;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item)
{
return DeathMoveResult.MoveToCorpse;
}
public override DeathMoveResult GetInventoryMoveResultFor(Item item) => DeathMoveResult.MoveToCorpse;
public override bool IsSnoop(Mobile from)
{
@ -149,15 +131,9 @@ namespace Server.Mobiles
return base.OnDragDrop(from, item);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalDrop(Mobile from, Item item, Item target) => PackAnimal.CheckAccess(this, from);
public override bool CheckNonlocalLift(Mobile from, Item item)
{
return PackAnimal.CheckAccess(this, from);
}
public override bool CheckNonlocalLift(Mobile from, Item item) => PackAnimal.CheckAccess(this, from);
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{

20
Projects/Scripts/Mobiles/Animals/Mounts/Ethereals.cs
View file

@ -350,25 +350,13 @@ namespace Server.Mobiles
m_Mount.IsDonationItem && RewardSystem.GetRewardLevel(m_Rider) < 3 ? 7.5 + (Core.AOS ? 3.0 : 2.0) :
Core.AOS ? 3.0 : 2.0);
public override TimeSpan GetCastRecovery()
{
return TimeSpan.Zero;
}
public override TimeSpan GetCastRecovery() => TimeSpan.Zero;
public override int GetMana()
{
return 0;
}
public override int GetMana() => 0;
public override bool ConsumeReagents()
{
return true;
}
public override bool ConsumeReagents() => true;
public override bool CheckFizzle()
{
return true;
}
public override bool CheckFizzle() => true;
public void Stop()
{

30
Projects/Scripts/Mobiles/Animals/Mounts/Hiryu.cs
View file

@ -67,10 +67,7 @@ namespace Server.Mobiles
public override FoodType FavoriteFood => FoodType.Meat;
public override bool CanAngerOnTame => true;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
private static int GetHue()
{
@ -131,30 +128,15 @@ namespace Server.Mobiles
}
public override int GetAngerSound()
{
return 0x4FE;
}
public override int GetAngerSound() => 0x4FE;
public override int GetIdleSound()
{
return 0x4FD;
}
public override int GetIdleSound() => 0x4FD;
public override int GetAttackSound()
{
return 0x4FC;
}
public override int GetAttackSound() => 0x4FC;
public override int GetHurtSound()
{
return 0x4FF;
}
public override int GetHurtSound() => 0x4FF;
public override int GetDeathSound()
{
return 0x4FB;
}
public override int GetDeathSound() => 0x4FB;
public override void GenerateLoot()
{

30
Projects/Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs
View file

@ -64,10 +64,7 @@ namespace Server.Mobiles
public override FoodType FavoriteFood => FoodType.Meat;
public override bool CanAngerOnTame => true;
public override WeaponAbility GetWeaponAbility()
{
return WeaponAbility.Dismount;
}
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
private static int GetHue()
{
@ -107,30 +104,15 @@ namespace Server.Mobiles
return false;
}
public override int GetAngerSound()
{
return 0x4FE;
}
public override int GetAngerSound() => 0x4FE;
public override int GetIdleSound()
{
return 0x4FD;
}
public override int GetIdleSound() => 0x4FD;
public override int GetAttackSound()
{
return 0x4FC;
}
public override int GetAttackSound() => 0x4FC;
public override int GetHurtSound()
{
return 0x4FF;
}
public override int GetHurtSound() => 0x4FF;
public override int GetDeathSound()
{
return 0x4FB;
}
public override int GetDeathSound() => 0x4FB;
public override void GenerateLoot()
{

10
Projects/Scripts/Mobiles/Animals/Mounts/Ridgeback.cs
View file

@ -48,15 +48,9 @@ namespace Server.Mobiles
public override HideType HideType => HideType.Spined;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override bool OverrideBondingReqs()
{
return true;
}
public override bool OverrideBondingReqs() => true;
public override double GetControlChance(Mobile m, bool useBaseSkill = false)
{
return 1.0;
}
public override double GetControlChance(Mobile m, bool useBaseSkill = false) => 1.0;
public override void Serialize(GenericWriter writer)
{

10
Projects/Scripts/Mobiles/Animals/Mounts/SavageRidgeback.cs
View file

@ -48,15 +48,9 @@ namespace Server.Mobiles
public override HideType HideType => HideType.Spined;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override bool OverrideBondingReqs()
{
return true;
}
public override bool OverrideBondingReqs() => true;
public override double GetControlChance(Mobile m, bool useBaseSkill = false)
{
return 1.0;
}
public override double GetControlChance(Mobile m, bool useBaseSkill = false) => 1.0;
public override void Serialize(GenericWriter writer)
{

10
Projects/Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs
View file

@ -45,15 +45,9 @@ namespace Server.Mobiles
public override bool AutoDispel => !Controlled;
public override FoodType FavoriteFood => FoodType.Meat;
public override bool OverrideBondingReqs()
{
return true;
}
public override bool OverrideBondingReqs() => true;
public override double GetControlChance(Mobile m, bool useBaseSkill = false)
{
return 1.0;
}
public override double GetControlChance(Mobile m, bool useBaseSkill = false) => 1.0;
public override void Serialize(GenericWriter writer)
{

30
Projects/Scripts/Mobiles/Animals/Mounts/SwampDragon.cs
View file

@ -139,35 +139,17 @@ namespace Server.Mobiles
public override ScaleType ScaleType => ScaleType.Green;
public override bool CanAngerOnTame => true;
public override bool OverrideBondingReqs()
{
return true;
}
public override bool OverrideBondingReqs() => true;
public override int GetIdleSound()
{
return 0x2CE;
}
public override int GetIdleSound() => 0x2CE;
public override int GetDeathSound()
{
return 0x2CC;
}
public override int GetDeathSound() => 0x2CC;
public override int GetHurtSound()
{
return 0x2D1;
}
public override int GetHurtSound() => 0x2D1;
public override int GetAttackSound()
{
return 0x2C8;
}
public override int GetAttackSound() => 0x2C8;
public override double GetControlChance(Mobile m, bool useBaseSkill = false)
{
return 1.0;
}
public override double GetControlChance(Mobile m, bool useBaseSkill = false) => 1.0;
public override void GetProperties(ObjectPropertyList list)
{

15
Projects/Scripts/Mobiles/Animals/Rodents/JackRabbit.cs
View file

@ -47,20 +47,11 @@ namespace Server.Mobiles
public override int Hides => 1;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies;
public override int GetAttackSound()
{
return 0xC9;
}
public override int GetAttackSound() => 0xC9;
public override int GetHurtSound()
{
return 0xCA;
}
public override int GetHurtSound() => 0xCA;
public override int GetDeathSound()
{
return 0xCB;
}
public override int GetDeathSound() => 0xCB;
public override void Serialize(GenericWriter writer)
{

15
Projects/Scripts/Mobiles/Animals/Rodents/Rabbit.cs
View file

@ -48,20 +48,11 @@ namespace Server.Mobiles
public override int Hides => 1;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies;
public override int GetAttackSound()
{
return 0xC9;
}
public override int GetAttackSound() => 0xC9;
public override int GetHurtSound()
{
return 0xCA;
}
public override int GetHurtSound() => 0xCA;
public override int GetDeathSound()
{
return 0xCB;
}
public override int GetDeathSound() => 0xCB;
public override void Serialize(GenericWriter writer)
{

25
Projects/Scripts/Mobiles/Animals/Slimes/Jwilson.cs
View file

@ -27,30 +27,15 @@ namespace Server.Mobiles
public override string CorpseName => "a jwilson corpse";
public override string DefaultName => "a jwilson";
public override int GetAngerSound()
{
return 0x1C8;
}
public override int GetAngerSound() => 0x1C8;
public override int GetIdleSound()
{
return 0x1C9;
}
public override int GetIdleSound() => 0x1C9;
public override int GetAttackSound()
{
return 0x1CA;
}
public override int GetAttackSound() => 0x1CA;
public override int GetHurtSound()
{
return 0x1CB;
}
public override int GetHurtSound() => 0x1CB;
public override int GetDeathSound()
{
return 0x1CC;
}
public override int GetDeathSound() => 0x1CC;
public override void Serialize(GenericWriter writer)
{

25
Projects/Scripts/Mobiles/Animals/Town Critters/(UO 3D Only) Parrot.cs
View file

@ -29,30 +29,15 @@ namespace Server.Mobiles
public override string CorpseName => "a parrot corpse";
public override string DefaultName => "a parrot";
public override int GetAngerSound()
{
return 0x1B;
}
public override int GetAngerSound() => 0x1B;
public override int GetIdleSound()
{
return 0x1C;
}
public override int GetIdleSound() => 0x1C;
public override int GetAttackSound()
{
return 0x1D;
}
public override int GetAttackSound() => 0x1D;
public override int GetHurtSound()
{
return 0x1E;
}
public override int GetHurtSound() => 0x1E;
public override int GetDeathSound()
{
return 0x1F;
}
public override int GetDeathSound() => 0x1F;
public override void Serialize(GenericWriter writer)
{