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

Adds style cop (#109)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 00:16:02 -07:00 • committed by GitHub
parent 3e715bcb60
commit 556a17aba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1725 changed files with 33831 additions and 38046 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Scripts/Mobiles/Vendors/NPC/Alchemist.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Alchemist : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Alchemist() : base("the alchemist")

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

@ -9,7 +9,7 @@ namespace Server.Mobiles
{
public class AnimalTrainer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public AnimalTrainer() : base("the animal trainer")
@ -195,12 +195,12 @@ namespace Server.Mobiles
{
SayTo(from, 502673); // I can not stable summoned creatures.
}
/*
else if ( pet.Allured )
{
SayTo( from, 1048053 ); // You can't stable that!
}
*/
/*
else if (pet.Allured)
{
SayTo( from, 1048053 ); // You can't stable that!
}
*/
else if ((pet is PackLlama || pet is PackHorse || pet is Beetle) && pet.Backpack?.Items.Count > 0)
{
SayTo(from, 1042563); // You need to unload your pet.
@ -368,8 +368,8 @@ namespace Server.Mobiles
private class StableEntry : ContextMenuEntry
{
private Mobile m_From;
private AnimalTrainer m_Trainer;
private readonly Mobile m_From;
private readonly AnimalTrainer m_Trainer;
public StableEntry(AnimalTrainer trainer, Mobile from) : base(6126, 12)
{
@ -385,9 +385,9 @@ namespace Server.Mobiles
private class ClaimListGump : Gump
{
private Mobile m_From;
private List<BaseCreature> m_List;
private AnimalTrainer m_Trainer;
private readonly Mobile m_From;
private readonly List<BaseCreature> m_List;
private readonly AnimalTrainer m_Trainer;
public ClaimListGump(AnimalTrainer trainer, Mobile from, List<BaseCreature> list) : base(50, 50)
{
@ -427,8 +427,8 @@ namespace Server.Mobiles
private class ClaimAllEntry : ContextMenuEntry
{
private Mobile m_From;
private AnimalTrainer m_Trainer;
private readonly Mobile m_From;
private readonly AnimalTrainer m_Trainer;
public ClaimAllEntry(AnimalTrainer trainer, Mobile from) : base(6127, 12)
{
@ -444,7 +444,7 @@ namespace Server.Mobiles
private class StableTarget : Target
{
private AnimalTrainer m_Trainer;
private readonly AnimalTrainer m_Trainer;
public StableTarget(AnimalTrainer trainer) : base(12, false, TargetFlags.None) => m_Trainer = trainer;

2
Projects/Scripts/Mobiles/Vendors/NPC/Architect.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Architect : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Architect() : base("the architect")

62
Projects/Scripts/Mobiles/Vendors/NPC/Armorer.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Armorer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Armorer() : base("the armorer")
@ -27,39 +27,39 @@ namespace Server.Mobiles
switch (Utility.Random(4))
{
case 0:
{
m_SBInfos.Add(new SBLeatherArmor());
m_SBInfos.Add(new SBStuddedArmor());
m_SBInfos.Add(new SBMetalShields());
m_SBInfos.Add(new SBPlateArmor());
m_SBInfos.Add(new SBHelmetArmor());
m_SBInfos.Add(new SBChainmailArmor());
m_SBInfos.Add(new SBRingmailArmor());
break;
}
{
m_SBInfos.Add(new SBLeatherArmor());
m_SBInfos.Add(new SBStuddedArmor());
m_SBInfos.Add(new SBMetalShields());
m_SBInfos.Add(new SBPlateArmor());
m_SBInfos.Add(new SBHelmetArmor());
m_SBInfos.Add(new SBChainmailArmor());
m_SBInfos.Add(new SBRingmailArmor());
break;
}
case 1:
{
m_SBInfos.Add(new SBStuddedArmor());
m_SBInfos.Add(new SBLeatherArmor());
m_SBInfos.Add(new SBMetalShields());
m_SBInfos.Add(new SBHelmetArmor());
break;
}
{
m_SBInfos.Add(new SBStuddedArmor());
m_SBInfos.Add(new SBLeatherArmor());
m_SBInfos.Add(new SBMetalShields());
m_SBInfos.Add(new SBHelmetArmor());
break;
}
case 2:
{
m_SBInfos.Add(new SBMetalShields());
m_SBInfos.Add(new SBPlateArmor());
m_SBInfos.Add(new SBHelmetArmor());
m_SBInfos.Add(new SBChainmailArmor());
m_SBInfos.Add(new SBRingmailArmor());
break;
}
{
m_SBInfos.Add(new SBMetalShields());
m_SBInfos.Add(new SBPlateArmor());
m_SBInfos.Add(new SBHelmetArmor());
m_SBInfos.Add(new SBChainmailArmor());
m_SBInfos.Add(new SBRingmailArmor());
break;
}
case 3:
{
m_SBInfos.Add(new SBMetalShields());
m_SBInfos.Add(new SBHelmetArmor());
break;
}
{
m_SBInfos.Add(new SBMetalShields());
m_SBInfos.Add(new SBHelmetArmor());
break;
}
}
if (IsTokunoVendor)

2
Projects/Scripts/Mobiles/Vendors/NPC/Baker.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Baker : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Baker() : base("the baker")

2
Projects/Scripts/Mobiles/Vendors/NPC/Bard.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Bard : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Bard() : base("the bard")

2
Projects/Scripts/Mobiles/Vendors/NPC/Barkeeper.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Barkeeper : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Barkeeper() : base("the barkeeper")

2
Projects/Scripts/Mobiles/Vendors/NPC/Beekeeper.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Beekeeper : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Beekeeper() : base("the beekeeper")

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

@ -7,7 +7,7 @@ namespace Server.Mobiles
{
public class Blacksmith : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Blacksmith() : base("the blacksmith")
@ -93,11 +93,9 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
#region Bulk Orders
public override Item CreateBulkOrder(Mobile from, bool fromContextMenu)
{
if (from is PlayerMobile pm && pm.NextSmithBulkOrder == TimeSpan.Zero && (fromContextMenu || 0.2 > Utility.RandomDouble()))
if (from is PlayerMobile pm && pm.NextSmithBulkOrder == TimeSpan.Zero && (fromContextMenu || Utility.RandomDouble() < 0.2))
{
double theirSkill = pm.Skills.Blacksmith.Base;
@ -134,7 +132,5 @@ namespace Server.Mobiles
if (Core.SE && from is PlayerMobile mobile)
mobile.NextSmithBulkOrder = TimeSpan.Zero;
}
#endregion
}
}

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

@ -6,7 +6,7 @@ namespace Server.Mobiles
[TypeAlias("Server.Mobiles.Bower")]
public class Bowyer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Bowyer() : base("the bowyer")

4
Projects/Scripts/Mobiles/Vendors/NPC/Butcher.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Butcher : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Butcher() : base("the butcher")
@ -36,7 +36,7 @@ namespace Server.Mobiles
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)

2
Projects/Scripts/Mobiles/Vendors/NPC/Carpenter.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Carpenter : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Carpenter() : base("the carpenter")

4
Projects/Scripts/Mobiles/Vendors/NPC/Cobbler.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Cobbler : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Cobbler() : base("the cobbler")
@ -29,7 +29,7 @@ namespace Server.Mobiles
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)

2
Projects/Scripts/Mobiles/Vendors/NPC/Cook.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Cook : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Cook() : base("the cook")

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

@ -13,7 +13,7 @@ namespace Server.Mobiles
public static readonly object Vendor = new object();
public static readonly object Price = new object();
private static HairstylistBuyInfo[] m_SellList =
private static readonly HairstylistBuyInfo[] m_SellList =
{
new HairstylistBuyInfo(1018357, 50000, false, typeof(ChangeHairstyleGump), new[]
{ From, Vendor, Price, false, ChangeHairstyleEntry.HairEntries }),
@ -42,7 +42,7 @@ namespace Server.Mobiles
{
}
protected override List<SBInfo> SBInfos{ get; } = new List<SBInfo>();
protected override List<SBInfo> SBInfos { get; } = new List<SBInfo>();
public override bool ClickTitle => false;
@ -106,24 +106,24 @@ namespace Server.Mobiles
GumpArgs = args;
}
public int Title{ get; }
public int Title { get; }
public string TitleString{ get; }
public string TitleString { get; }
public int Price{ get; }
public int Price { get; }
public bool FacialHair{ get; }
public bool FacialHair { get; }
public Type GumpType{ get; }
public Type GumpType { get; }
public object[] GumpArgs{ get; }
public object[] GumpArgs { get; }
}
public class HairstylistBuyGump : Gump
{
private Mobile m_From;
private HairstylistBuyInfo[] m_SellList;
private Mobile m_Vendor;
private readonly Mobile m_From;
private readonly HairstylistBuyInfo[] m_SellList;
private readonly Mobile m_Vendor;
public HairstylistBuyGump(Mobile from, Mobile vendor, HairstylistBuyInfo[] sellList) : base(50, 50)
{
@ -254,19 +254,19 @@ namespace Server.Mobiles
Hues[i] = start + i;
}
public string Name{ get; }
public string Name { get; }
public int[] Hues{ get; }
public int[] Hues { get; }
}
public class ChangeHairHueGump : Gump
{
private ChangeHairHueEntry[] m_Entries;
private bool m_FacialHair;
private Mobile m_From;
private bool m_Hair;
private int m_Price;
private Mobile m_Vendor;
private readonly ChangeHairHueEntry[] m_Entries;
private readonly bool m_FacialHair;
private readonly Mobile m_From;
private readonly bool m_Hair;
private readonly int m_Price;
private readonly Mobile m_Vendor;
public ChangeHairHueGump(Mobile from, Mobile vendor, int price, bool hair, bool facialHair,
ChangeHairHueEntry[] entries) : base(50, 50)
@ -330,7 +330,7 @@ namespace Server.Mobiles
if (index >= 0 && index < m_Entries.Length)
if (offset >= 0 && offset < m_Entries[index].Hues.Length)
{
if (m_Hair && m_From.HairItemID > 0 || m_FacialHair && m_From.FacialHairItemID > 0)
if ((m_Hair && m_From.HairItemID > 0) || (m_FacialHair && m_From.FacialHairItemID > 0))
{
if (!Banker.Withdraw(m_From, m_Price))
{
@ -404,25 +404,24 @@ namespace Server.Mobiles
ItemID = itemID;
}
public int ItemID{ get; }
public int ItemID { get; }
public int GumpID{ get; }
public int GumpID { get; }
public int X{ get; }
public int X { get; }
public int Y{ get; }
public int Y { get; }
}
public class ChangeHairstyleGump : Gump
{
private ChangeHairstyleEntry[] m_Entries;
private bool m_FacialHair;
private Mobile m_From;
private int m_Price;
private Mobile m_Vendor;
private readonly ChangeHairstyleEntry[] m_Entries;
private readonly bool m_FacialHair;
private readonly Mobile m_From;
private readonly int m_Price;
private readonly Mobile m_Vendor;
public ChangeHairstyleGump(Mobile from, Mobile vendor, int price, bool facialHair, ChangeHairstyleEntry[] entries) :
base(50, 50)
public ChangeHairstyleGump(Mobile from, Mobile vendor, int price, bool facialHair, ChangeHairstyleEntry[] entries) : base(50, 50)
{
m_From = from;
m_Vendor = vendor;

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

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Farmer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Farmer() : base("the farmer")

2
Projects/Scripts/Mobiles/Vendors/NPC/Fisherman.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Fisherman : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Fisherman() : base("the fisher")

4
Projects/Scripts/Mobiles/Vendors/NPC/Furtrader.cs
View file

@ -4,13 +4,13 @@ namespace Server.Mobiles
{
public class Furtrader : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Furtrader() : base("the furtrader")
{
SetSkill(SkillName.Camping, 55.0, 78.0);
//SetSkill( SkillName.Alchemy, 60.0, 83.0 );
// SetSkill( SkillName.Alchemy, 60.0, 83.0 );
SetSkill(SkillName.AnimalLore, 85.0, 100.0);
SetSkill(SkillName.Cooking, 45.0, 68.0);
SetSkill(SkillName.Tracking, 36.0, 68.0);

2
Projects/Scripts/Mobiles/Vendors/NPC/Glassblower.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
[TypeAlias("Server.Mobiles.GargoyleAlchemist")]
public class Glassblower : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Glassblower() : base("the alchemist")

2
Projects/Scripts/Mobiles/Vendors/NPC/GolemCrafter.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class GolemCrafter : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public GolemCrafter() : base("the golem crafter")

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

@ -13,7 +13,7 @@ namespace Server.Mobiles
{
}
protected override List<SBInfo> SBInfos{ get; } = new List<SBInfo>();
protected override List<SBInfo> SBInfos { get; } = new List<SBInfo>();
public override bool IsActiveVendor => false;

4
Projects/Scripts/Mobiles/Vendors/NPC/Guildmasters/TinkerGuildmaster.cs
View file

@ -51,8 +51,8 @@ namespace Server.Mobiles
private class RechargeEntry : ContextMenuEntry
{
private Mobile m_From;
private Mobile m_Vendor;
private readonly Mobile m_From;
private readonly Mobile m_Vendor;
public RechargeEntry(Mobile from, Mobile vendor) : base(6271, 6)
{

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

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class GypsyMaiden : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public GypsyMaiden() : base("the gypsy maiden")

4
Projects/Scripts/Mobiles/Vendors/NPC/HairStylist.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class HairStylist : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public HairStylist() : base("the hair stylist")
@ -29,7 +29,7 @@ namespace Server.Mobiles
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)

2
Projects/Scripts/Mobiles/Vendors/NPC/Herbalist.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Herbalist : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Herbalist() : base("the herbalist")

2
Projects/Scripts/Mobiles/Vendors/NPC/HolyMage.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class HolyMage : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public HolyMage() : base("the Holy Mage")

4
Projects/Scripts/Mobiles/Vendors/NPC/InnKeeper.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class InnKeeper : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public InnKeeper() : base("the innkeeper")
@ -31,7 +31,7 @@ namespace Server.Mobiles
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)

2
Projects/Scripts/Mobiles/Vendors/NPC/IronWorker.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class IronWorker : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public IronWorker() : base("the iron worker")

2
Projects/Scripts/Mobiles/Vendors/NPC/Jeweler.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Jeweler : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Jeweler() : base("the jeweler")

2
Projects/Scripts/Mobiles/Vendors/NPC/KeeperOfChivalry.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class KeeperOfChivalry : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public KeeperOfChivalry() : base("the Keeper of Chivalry")

4
Projects/Scripts/Mobiles/Vendors/NPC/LeatherWorker.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class LeatherWorker : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public LeatherWorker() : base("the leather worker")
@ -28,7 +28,7 @@ namespace Server.Mobiles
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)

2
Projects/Scripts/Mobiles/Vendors/NPC/Mage.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Mage : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Mage() : base("the mage")

2
Projects/Scripts/Mobiles/Vendors/NPC/Mapmaker.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Mapmaker : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Mapmaker() : base("the mapmaker")

2
Projects/Scripts/Mobiles/Vendors/NPC/Miller.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Miller : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Miller() : base("the miller")

2
Projects/Scripts/Mobiles/Vendors/NPC/Miner.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Miner : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Miner() : base("the miner")

2
Projects/Scripts/Mobiles/Vendors/NPC/Monk.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Monk : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Monk() : base("the Monk")

2
Projects/Scripts/Mobiles/Vendors/NPC/Provisioner.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Provisioner : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Provisioner() : base("the provisioner")

2
Projects/Scripts/Mobiles/Vendors/NPC/Rancher.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Rancher : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Rancher() : base("the rancher")

2
Projects/Scripts/Mobiles/Vendors/NPC/Ranger.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Ranger : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Ranger() : base("the ranger")

6
Projects/Scripts/Mobiles/Vendors/NPC/RealEstateBroker.cs
View file

@ -10,7 +10,7 @@ namespace Server.Mobiles
public class RealEstateBroker : BaseVendor
{
private DateTime m_NextCheckPack;
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public RealEstateBroker() : base("the real estate broker")
@ -77,7 +77,7 @@ namespace Server.Mobiles
{
if (Banker.Deposit(from, price))
{
// For the deed I have placed gold in your bankbox :
// For the deed I have placed gold in your bankbox :
PublicOverheadMessage(MessageType.Regular, 0x3B2, 1008000, AffixType.Append, price.ToString());
deed.Delete();
@ -103,7 +103,7 @@ namespace Server.Mobiles
if (price > 0)
{
// I will pay you gold for this deed :
// I will pay you gold for this deed :
PublicOverheadMessage(MessageType.Regular, 0x3B2, 1008001, AffixType.Append, price.ToString());
PublicOverheadMessage(MessageType.Regular, 0x3B2,

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

@ -10,7 +10,7 @@ namespace Server.Mobiles
public static readonly TimeSpan ShushDelay = TimeSpan.FromMinutes(1);
private DateTime m_NextShush;
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Scribe() : base("the scribe")

6
Projects/Scripts/Mobiles/Vendors/NPC/Shipwright.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Shipwright : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Shipwright() : base("the shipwright")
@ -36,7 +36,7 @@ namespace Server.Mobiles
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
@ -46,4 +46,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

2
Projects/Scripts/Mobiles/Vendors/NPC/StoneCrafter.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
[TypeAlias("Server.Mobiles.GargoyleStonecrafter")]
public class StoneCrafter : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public StoneCrafter() : base("the stone crafter")

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

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class Tailor : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Tailor() : base("the tailor")
@ -43,11 +43,9 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
#region Bulk Orders
public override Item CreateBulkOrder(Mobile from, bool fromContextMenu)
{
if (from is PlayerMobile pm && pm.NextTailorBulkOrder == TimeSpan.Zero && (fromContextMenu || 0.2 > Utility.RandomDouble()))
if (from is PlayerMobile pm && pm.NextTailorBulkOrder == TimeSpan.Zero && (fromContextMenu || Utility.RandomDouble() < 0.2))
{
double theirSkill = pm.Skills.Tailoring.Base;
@ -84,7 +82,5 @@ namespace Server.Mobiles
if (Core.SE && from is PlayerMobile mobile)
mobile.NextTailorBulkOrder = TimeSpan.Zero;
}
#endregion
}
}

2
Projects/Scripts/Mobiles/Vendors/NPC/Tanner.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Tanner : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Tanner() : base("the tanner")

4
Projects/Scripts/Mobiles/Vendors/NPC/TavernKeeper.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class TavernKeeper : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public TavernKeeper() : base("the tavern keeper")
@ -34,7 +34,7 @@ namespace Server.Mobiles
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)

2
Projects/Scripts/Mobiles/Vendors/NPC/Thief.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Thief : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Thief() : base("the thief")

2
Projects/Scripts/Mobiles/Vendors/NPC/Tinker.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Tinker : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Tinker() : base("the tinker")

3
Projects/Scripts/Mobiles/Vendors/NPC/Vagabond.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Vagabond : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Vagabond() : base("the vagabond")
@ -44,7 +44,6 @@ namespace Server.Mobiles
break;
}
Utility.AssignRandomHair(this);
Utility.AssignRandomFacialHair(this, HairHue);

2
Projects/Scripts/Mobiles/Vendors/NPC/VarietyDealer.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class VarietyDealer : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public VarietyDealer() : base("the variety dealer")

2
Projects/Scripts/Mobiles/Vendors/NPC/Veterinarian.cs
View file

@ -4,7 +4,7 @@ namespace Server.Mobiles
{
public class Veterinarian : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Veterinarian() : base("the vet")

2
Projects/Scripts/Mobiles/Vendors/NPC/Waiter.cs
View file

@ -5,7 +5,7 @@ namespace Server.Mobiles
{
public class Waiter : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Waiter() : base("the waiter")

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

@ -7,7 +7,7 @@ namespace Server.Mobiles
{
public class Weaponsmith : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Weaponsmith() : base("the weaponsmith")
@ -59,11 +59,9 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
#region Bulk Orders
public override Item CreateBulkOrder(Mobile from, bool fromContextMenu)
{
if (from is PlayerMobile pm && pm.NextSmithBulkOrder == TimeSpan.Zero && (fromContextMenu || 0.2 > Utility.RandomDouble()))
if (from is PlayerMobile pm && pm.NextSmithBulkOrder == TimeSpan.Zero && (fromContextMenu || Utility.RandomDouble() < 0.2))
{
double theirSkill = pm.Skills.Blacksmith.Base;
@ -100,7 +98,5 @@ namespace Server.Mobiles
if (Core.SE && from is PlayerMobile mobile)
mobile.NextSmithBulkOrder = TimeSpan.Zero;
}
#endregion
}
}

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

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class Weaver : BaseVendor
{
private List<SBInfo> m_SBInfos = new List<SBInfo>();
private readonly List<SBInfo> m_SBInfos = new List<SBInfo>();
[Constructible]
public Weaver() : base("the weaver")
@ -43,11 +43,9 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
#region Bulk Orders
public override Item CreateBulkOrder(Mobile from, bool fromContextMenu)
{
if (from is PlayerMobile pm && pm.NextTailorBulkOrder == TimeSpan.Zero && (fromContextMenu || 0.2 > Utility.RandomDouble()))
if (from is PlayerMobile pm && pm.NextTailorBulkOrder == TimeSpan.Zero && (fromContextMenu || Utility.RandomDouble() < 0.2))
{
double theirSkill = pm.Skills.Tailoring.Base;
@ -84,7 +82,5 @@ namespace Server.Mobiles
if (Core.SE && from is PlayerMobile mobile)
mobile.NextTailorBulkOrder = TimeSpan.Zero;
}
#endregion
}
}