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

20
Projects/Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs
View file

@ -32,10 +32,7 @@ namespace Server.Mobiles
m_SBInfos.Add(new SBAnimalTrainer());
}
public override int GetShoeHue()
{
return 0;
}
public override int GetShoeHue() => 0;
public override void InitOutfit()
{
@ -301,10 +298,7 @@ namespace Server.Mobiles
BeginClaimList(from);
}
public bool CanClaim(Mobile from, BaseCreature pet)
{
return from.Followers + pet.ControlSlots <= from.FollowersMax;
}
public bool CanClaim(Mobile from, BaseCreature pet) => from.Followers + pet.ControlSlots <= from.FollowersMax;
private void DoClaim(Mobile from, BaseCreature pet)
{
@ -325,10 +319,7 @@ namespace Server.Mobiles
pet.Loyalty = MaxLoyalty; // Wonderfully Happy
}
public override bool HandlesOnSpeech(Mobile from)
{
return true;
}
public override bool HandlesOnSpeech(Mobile from) => true;
public override void OnSpeech(SpeechEventArgs e)
{
@ -452,10 +443,7 @@ namespace Server.Mobiles
{
private AnimalTrainer m_Trainer;
public StableTarget(AnimalTrainer trainer) : base(12, false, TargetFlags.None)
{
m_Trainer = trainer;
}
public StableTarget(AnimalTrainer trainer) : base(12, false, TargetFlags.None) => m_Trainer = trainer;
protected override void OnTarget(Mobile from, object targeted)
{

10
Projects/Scripts/Mobiles/Vendors/NPC/Blacksmith.cs
View file

@ -117,15 +117,9 @@ namespace Server.Mobiles
return null;
}
public override bool IsValidBulkOrder(Item item)
{
return item is SmallSmithBOD || item is LargeSmithBOD;
}
public override bool IsValidBulkOrder(Item item) => item is SmallSmithBOD || item is LargeSmithBOD;
public override bool SupportsBulkOrders(Mobile from)
{
return from is PlayerMobile && from.Skills.Blacksmith.Base > 0;
}
public override bool SupportsBulkOrders(Mobile from) => from is PlayerMobile && from.Skills.Blacksmith.Base > 0;
public override TimeSpan GetNextBulkOrder(Mobile from)
{

5
Projects/Scripts/Mobiles/Vendors/NPC/Bowyer.cs
View file

@ -23,10 +23,7 @@ namespace Server.Mobiles
public override VendorShoeType ShoeType => Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots;
public override int GetShoeHue()
{
return 0;
}
public override int GetShoeHue() => 0;
public override void InitOutfit()
{

10
Projects/Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs
View file

@ -50,20 +50,14 @@ namespace Server.Mobiles
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals;
public override bool OnBuyItems(Mobile buyer, List<BuyItemResponse> list)
{
return false;
}
public override bool OnBuyItems(Mobile buyer, List<BuyItemResponse> list) => false;
public override void VendorBuy(Mobile from)
{
from.SendGump(new HairstylistBuyGump(from, this, m_SellList));
}
public override int GetHairHue()
{
return Utility.RandomBrightHue();
}
public override int GetHairHue() => Utility.RandomBrightHue();
public override void InitOutfit()
{

5
Projects/Scripts/Mobiles/Vendors/NPC/Farmer.cs
View file

@ -28,10 +28,7 @@ namespace Server.Mobiles
m_SBInfos.Add(new SBFarmer());
}
public override int GetShoeHue()
{
return 0;
}
public override int GetShoeHue() => 0;
public override void InitOutfit()
{

10
Projects/Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs
View file

@ -7,10 +7,7 @@ namespace Server.Mobiles
{
public abstract class BaseGuildmaster : BaseVendor
{
public BaseGuildmaster(string title) : base(title)
{
Title = $"the {title} {(Female ? "guildmistress" : "guildmaster")}";
}
public BaseGuildmaster(string title) : base(title) => Title = $"the {title} {(Female ? "guildmistress" : "guildmaster")}";
public BaseGuildmaster(Serial serial) : base(serial)
{
@ -33,10 +30,7 @@ namespace Server.Mobiles
{
}
public virtual bool CheckCustomReqs(PlayerMobile pm)
{
return true;
}
public virtual bool CheckCustomReqs(PlayerMobile pm) => true;
public virtual void SayGuildTo(Mobile m)
{

5
Projects/Scripts/Mobiles/Vendors/NPC/GypsyAnimalTrainer.cs
View file

@ -17,10 +17,7 @@ namespace Server.Mobiles
public override VendorShoeType ShoeType => Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots;
public override int GetShoeHue()
{
return 0;
}
public override int GetShoeHue() => 0;
public override void InitOutfit()
{

5
Projects/Scripts/Mobiles/Vendors/NPC/GypsyBanker.cs
View file

@ -5,10 +5,7 @@ namespace Server.Mobiles
public class GypsyBanker : Banker
{
[Constructible]
public GypsyBanker()
{
Title = "the gypsy banker";
}
public GypsyBanker() => Title = "the gypsy banker";
public GypsyBanker(Serial serial) : base(serial)
{

5
Projects/Scripts/Mobiles/Vendors/NPC/GypsyMaiden.cs
View file

@ -18,10 +18,7 @@ namespace Server.Mobiles
protected override List<SBInfo> SBInfos => m_SBInfos;
public override bool GetGender()
{
return true; // always female
}
public override bool GetGender() => true;
public override void InitSBInfo()
{

5
Projects/Scripts/Mobiles/Vendors/NPC/Scribe.cs
View file

@ -41,10 +41,7 @@ namespace Server.Mobiles
AddItem(new Robe(Utility.RandomNeutralHue()));
}
public override bool HandlesOnSpeech(Mobile from)
{
return from.Player;
}
public override bool HandlesOnSpeech(Mobile from) => from.Player;
public override void OnSpeech(SpeechEventArgs e)
{

10
Projects/Scripts/Mobiles/Vendors/NPC/Tailor.cs
View file

@ -67,15 +67,9 @@ namespace Server.Mobiles
return null;
}
public override bool IsValidBulkOrder(Item item)
{
return item is SmallTailorBOD || item is LargeTailorBOD;
}
public override bool IsValidBulkOrder(Item item) => item is SmallTailorBOD || item is LargeTailorBOD;
public override bool SupportsBulkOrders(Mobile from)
{
return from is PlayerMobile && from.Skills.Tailoring.Base > 0;
}
public override bool SupportsBulkOrders(Mobile from) => from is PlayerMobile && from.Skills.Tailoring.Base > 0;
public override TimeSpan GetNextBulkOrder(Mobile from)
{

15
Projects/Scripts/Mobiles/Vendors/NPC/Weaponsmith.cs
View file

@ -36,10 +36,7 @@ namespace Server.Mobiles
m_SBInfos.Add(new SBSEWeapons());
}
public override int GetShoeHue()
{
return 0;
}
public override int GetShoeHue() => 0;
public override void InitOutfit()
{
@ -86,15 +83,9 @@ namespace Server.Mobiles
return null;
}
public override bool IsValidBulkOrder(Item item)
{
return item is SmallSmithBOD || item is LargeSmithBOD;
}
public override bool IsValidBulkOrder(Item item) => item is SmallSmithBOD || item is LargeSmithBOD;
public override bool SupportsBulkOrders(Mobile from)
{
return from is PlayerMobile && Core.AOS && from.Skills.Blacksmith.Base > 0;
}
public override bool SupportsBulkOrders(Mobile from) => from is PlayerMobile && Core.AOS && from.Skills.Blacksmith.Base > 0;
public override TimeSpan GetNextBulkOrder(Mobile from)
{

10
Projects/Scripts/Mobiles/Vendors/NPC/Weaver.cs
View file

@ -67,15 +67,9 @@ namespace Server.Mobiles
return null;
}
public override bool IsValidBulkOrder(Item item)
{
return item is SmallTailorBOD || item is LargeTailorBOD;
}
public override bool IsValidBulkOrder(Item item) => item is SmallTailorBOD || item is LargeTailorBOD;
public override bool SupportsBulkOrders(Mobile from)
{
return from is PlayerMobile && from.Skills.Tailoring.Base > 0;
}
public override bool SupportsBulkOrders(Mobile from) => from is PlayerMobile && from.Skills.Tailoring.Base > 0;
public override TimeSpan GetNextBulkOrder(Mobile from)
{