Formatting FIxes (#58)

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

View file

@ -7,10 +7,7 @@ namespace Server.Items
public class Anvil : Item
{
[Constructible]
public Anvil() : base(0xFAF)
{
Movable = false;
}
public Anvil() : base(0xFAF) => Movable = false;
public Anvil(Serial serial) : base(serial)
{
@ -35,10 +32,7 @@ namespace Server.Items
public class Forge : Item
{
[Constructible]
public Forge() : base(0xFB1)
{
Movable = false;
}
public Forge() : base(0xFB1) => Movable = false;
public Forge(Serial serial) : base(serial)
{

View file

@ -9,10 +9,7 @@ namespace Server.Items
public class Bedroll : Item
{
[Constructible]
public Bedroll() : base(0xA57)
{
Weight = 5.0;
}
public Bedroll() : base(0xA57) => Weight = 5.0;
public Bedroll(Serial serial) : base(serial)
{

View file

@ -20,10 +20,7 @@ namespace Server.Items
};
[Constructible]
public TaxidermyKit() : base(0x1EBA)
{
Weight = 1.0;
}
public TaxidermyKit() : base(0x1EBA) => Weight = 1.0;
public TaxidermyKit(Serial serial) : base(serial)
{
@ -86,10 +83,7 @@ namespace Server.Items
{
private TaxidermyKit m_Kit;
public CorpseTarget(TaxidermyKit kit) : base(3, false, TargetFlags.None)
{
m_Kit = kit;
}
public CorpseTarget(TaxidermyKit kit) : base(3, false, TargetFlags.None) => m_Kit = kit;
protected override void OnTarget(Mobile from, object targeted)
{

View file

@ -224,28 +224,6 @@ namespace Server.Items
return water;
}
#if false
private class MessageGump : Gump
{
public MessageGump( MessageEntry entry, Map map, Point3D loc ) : base( (640 - entry.Width) / 2, (480 - entry.Height) / 2 )
{
int xLong = 0, yLat = 0;
int xMins = 0, yMins = 0;
bool xEast = false, ySouth = false;
string fmt;
if ( Sextant.Format( loc, map, ref xLong, ref yLat, ref xMins, ref yMins, ref xEast, ref ySouth ) )
fmt =
String.Format( "{0}°{1}'{2},{3}°{4}'{5}", yLat, yMins, ySouth ? "S" : "N", xLong, xMins, xEast ? "E" : "W" );
else
fmt = "?????";
AddPage( 0 );
AddBackground( 0, 0, entry.Width, entry.Height, 2520 );
AddHtml( 38, 38, entry.Width - 83, entry.Height - 86, String.Format( entry.Message, fmt ), false, false );
}
}
#else
private class MessageGump : Gump
{
public MessageGump(MessageEntry entry, Map map, Point3D loc) : base(150, 50)
@ -277,7 +255,6 @@ namespace Server.Items
AddHtmlLocalized(70, 265, 100, 20, 1011036); // OKAY
}
}
#endif
private class MessageEntry
{

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class Sextant : Item
{
[Constructible]
public Sextant() : base(0x1058)
{
Weight = 2.0;
}
public Sextant() : base(0x1058) => Weight = 2.0;
public Sextant(Serial serial) : base(serial)
{

View file

@ -380,10 +380,7 @@ namespace Server.Items
public class FabledFishingNet : SpecialFishingNet
{
[Constructible]
public FabledFishingNet()
{
Hue = 0x481;
}
public FabledFishingNet() => Hue = 0x481;
public FabledFishingNet(Serial serial) : base(serial)
{
@ -395,10 +392,7 @@ namespace Server.Items
{
}
protected override int GetSpawnCount()
{
return base.GetSpawnCount() + 4;
}
protected override int GetSpawnCount() => base.GetSpawnCount() + 4;
protected override void FinishEffect(Point3D p, Map map, Mobile from)
{

View file

@ -163,10 +163,7 @@ namespace Server.Items
{
private ProspectorsTool m_Tool;
public InternalTarget(ProspectorsTool tool) : base(2, true, TargetFlags.None)
{
m_Tool = tool;
}
public InternalTarget(ProspectorsTool tool) : base(2, true, TargetFlags.None) => m_Tool = tool;
protected override void OnTarget(Mobile from, object targeted)
{

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class Shovel : BaseHarvestTool
{
[Constructible]
public Shovel(int uses = 50) : base(0xF39, uses)
{
Weight = 5.0;
}
public Shovel(int uses = 50) : base(0xF39, uses) => Weight = 5.0;
public Shovel(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class BookOfBushido : Spellbook
{
[Constructible]
public BookOfBushido(ulong content = 0x3F) : base(content, 0x238C)
{
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
}
public BookOfBushido(ulong content = 0x3F) : base(content, 0x238C) => Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
public BookOfBushido(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class BookOfChivalry : Spellbook
{
[Constructible]
public BookOfChivalry(ulong content = 0x3FF) : base(content, 0x2252)
{
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
}
public BookOfChivalry(ulong content = 0x3FF) : base(content, 0x2252) => Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
public BookOfChivalry(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class BookOfNinjitsu : Spellbook
{
[Constructible]
public BookOfNinjitsu(ulong content = 0xFF) : base(content, 0x23A0)
{
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
}
public BookOfNinjitsu(ulong content = 0xFF) : base(content, 0x23A0) => Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
public BookOfNinjitsu(Serial serial) : base(serial)
{

View file

@ -196,10 +196,7 @@ namespace Server.Items
from.SendMessage("This moongate does not seem to go anywhere.");
}
public static bool IsInTown(Point3D p, Map map)
{
return map != null && Region.Find(p, map).GetRegion<GuardedRegion>()?.IsDisabled() == false;
}
public static bool IsInTown(Point3D p, Map map) => map != null && Region.Find(p, map).GetRegion<GuardedRegion>()?.IsDisabled() == false;
private class DelayTimer : Timer
{

View file

@ -290,10 +290,7 @@ namespace Server.Items
{
private RecallRune m_Rune;
public RenamePrompt(RecallRune rune)
{
m_Rune = rune;
}
public RenamePrompt(RecallRune rune) => m_Rune = rune;
public override void OnResponse(Mobile from, string text)
{

View file

@ -1,37 +1,35 @@
namespace Server.Items
{
public class MysticSpellbook : Spellbook
{
[Constructible]
public MysticSpellbook(ulong content = 0)
: base(content, 0x2D9D)
{
Layer = Layer.OneHanded;
}
public MysticSpellbook(Serial serial)
: base(serial)
{
}
public override SpellbookType SpellbookType => SpellbookType.Mystic;
public override int BookOffset => 677;
public override int BookCount => 16;
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
/*int version = */
reader.ReadInt();
}
}
}
namespace Server.Items
{
public class MysticSpellbook : Spellbook
{
[Constructible]
public MysticSpellbook(ulong content = 0)
: base(content, 0x2D9D) =>
Layer = Layer.OneHanded;
public MysticSpellbook(Serial serial)
: base(serial)
{
}
public override SpellbookType SpellbookType => SpellbookType.Mystic;
public override int BookOffset => 677;
public override int BookCount => 16;
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
/*int version = */
reader.ReadInt();
}
}
}

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class NecromancerSpellbook : Spellbook
{
[Constructible]
public NecromancerSpellbook(ulong content = 0) : base(content, 0x2253)
{
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
}
public NecromancerSpellbook(ulong content = 0) : base(content, 0x2253) => Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
public NecromancerSpellbook(Serial serial) : base(serial)
{

View file

@ -254,10 +254,8 @@ namespace Server.Items
return AOS.Scale(v, 100 + EnhancePotions(m));
}
public override bool StackWith(Mobile from, Item dropped, bool playSound)
{
return dropped is BasePotion potion && potion.m_PotionEffect == m_PotionEffect &&
base.StackWith(from, potion, playSound);
}
public override bool StackWith(Mobile from, Item dropped, bool playSound) =>
dropped is BasePotion potion && potion.m_PotionEffect == m_PotionEffect &&
base.StackWith(from, potion, playSound);
}
}

View file

@ -9,10 +9,7 @@ namespace Server.Items
{
private List<Mobile> m_Users = new List<Mobile>();
public BaseConflagrationPotion(PotionEffect effect) : base(0xF06, effect)
{
Hue = 0x489;
}
public BaseConflagrationPotion(PotionEffect effect) : base(0xF06, effect) => Hue = 0x489;
public BaseConflagrationPotion(Serial serial) : base(serial)
{
@ -92,10 +89,7 @@ namespace Server.Items
private class ThrowTarget : Target
{
public ThrowTarget(BaseConflagrationPotion potion) : base(12, true, TargetFlags.None)
{
Potion = potion;
}
public ThrowTarget(BaseConflagrationPotion potion) : base(12, true, TargetFlags.None) => Potion = potion;
public BaseConflagrationPotion Potion{ get; }
@ -164,10 +158,7 @@ namespace Server.Items
m_Timer?.Stop();
}
public int GetDamage()
{
return Utility.RandomMinMax(m_MinDamage, m_MaxDamage);
}
public int GetDamage() => Utility.RandomMinMax(m_MinDamage, m_MaxDamage);
private void SetDamage(int min, int max)
{

View file

@ -11,10 +11,7 @@ namespace Server.Items
{
private List<Mobile> m_Users = new List<Mobile>();
public BaseConfusionBlastPotion(PotionEffect effect) : base(0xF06, effect)
{
Hue = 0x48D;
}
public BaseConfusionBlastPotion(PotionEffect effect) : base(0xF06, effect) => Hue = 0x48D;
public BaseConfusionBlastPotion(Serial serial) : base(serial)
{
@ -97,10 +94,7 @@ namespace Server.Items
private class ThrowTarget : Target
{
public ThrowTarget(BaseConfusionBlastPotion potion) : base(12, true, TargetFlags.None)
{
Potion = potion;
}
public ThrowTarget(BaseConfusionBlastPotion potion) : base(12, true, TargetFlags.None) => Potion = potion;
public BaseConfusionBlastPotion Potion{ get; }

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class DarkglowPotion : BasePoisonPotion
{
[Constructible]
public DarkglowPotion() : base(PotionEffect.Darkglow)
{
Hue = 0x96;
}
public DarkglowPotion() : base(PotionEffect.Darkglow) => Hue = 0x96;
public DarkglowPotion(Serial serial) : base(serial)
{

View file

@ -221,10 +221,7 @@ namespace Server.Items
private class ThrowTarget : Target
{
public ThrowTarget(BaseExplosionPotion potion) : base(12, true, TargetFlags.None)
{
Potion = potion;
}
public ThrowTarget(BaseExplosionPotion potion) : base(12, true, TargetFlags.None) => Potion = potion;
public BaseExplosionPotion Potion{ get; }

View file

@ -8,10 +8,7 @@ namespace Server.Items
private static Dictionary<Mobile, Timer> m_Table = new Dictionary<Mobile, Timer>();
[Constructible]
public InvisibilityPotion() : base(0xF0A, PotionEffect.Invisibility)
{
Hue = 0x48D;
}
public InvisibilityPotion() : base(0xF0A, PotionEffect.Invisibility) => Hue = 0x48D;
public InvisibilityPotion(Serial serial) : base(serial)
{
@ -60,10 +57,7 @@ namespace Server.Items
RemoveTimer(m);
}
public static bool HasTimer(Mobile m)
{
return m_Table.ContainsKey(m);
}
public static bool HasTimer(Mobile m) => m_Table.ContainsKey(m);
public static void RemoveTimer(Mobile m, bool interrupted = false)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class ParasiticPotion : BasePoisonPotion
{
[Constructible]
public ParasiticPotion() : base(PotionEffect.Parasitic)
{
Hue = 0x17C;
}
public ParasiticPotion() : base(PotionEffect.Parasitic) => Hue = 0x17C;
public ParasiticPotion(Serial serial) : base(serial)
{

View file

@ -139,10 +139,7 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public SecureLevel Level{ get; set; }
public override bool AllowEquippedCast(Mobile from)
{
return true;
}
public override bool AllowEquippedCast(Mobile from) => true;
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{

View file

@ -4,10 +4,8 @@ namespace Server.Items
{
[Constructible]
public ArcaneCircleScroll(int amount = 1)
: base(600, 0x2D51, amount)
{
: base(600, 0x2D51, amount) =>
Hue = 0x8FD;
}
public ArcaneCircleScroll(Serial serial)
: base(serial)
@ -33,10 +31,8 @@ namespace Server.Items
{
[Constructible]
public GiftOfRenewalScroll(int amount = 1)
: base(601, 0x2D52, amount)
{
: base(601, 0x2D52, amount) =>
Hue = 0x8FD;
}
public GiftOfRenewalScroll(Serial serial)
: base(serial)
@ -62,10 +58,8 @@ namespace Server.Items
{
[Constructible]
public ImmolatingWeaponScroll(int amount = 1)
: base(602, 0x2D53, amount)
{
: base(602, 0x2D53, amount) =>
Hue = 0x8FD;
}
public ImmolatingWeaponScroll(Serial serial)
: base(serial)
@ -91,10 +85,8 @@ namespace Server.Items
{
[Constructible]
public AttuneWeaponScroll(int amount = 1)
: base(603, 0x2D54, amount)
{
: base(603, 0x2D54, amount) =>
Hue = 0x8FD;
}
public AttuneWeaponScroll(Serial serial)
: base(serial)
@ -120,10 +112,8 @@ namespace Server.Items
{
[Constructible]
public ThunderstormScroll(int amount = 1)
: base(604, 0x2D55, amount)
{
: base(604, 0x2D55, amount) =>
Hue = 0x8FD;
}
public ThunderstormScroll(Serial serial)
: base(serial)
@ -149,10 +139,8 @@ namespace Server.Items
{
[Constructible]
public NatureFuryScroll(int amount = 1)
: base(605, 0x2D56, amount)
{
: base(605, 0x2D56, amount) =>
Hue = 0x8FD;
}
public NatureFuryScroll(Serial serial)
: base(serial)
@ -178,10 +166,8 @@ namespace Server.Items
{
[Constructible]
public SummonFeyScroll(int amount = 1)
: base(606, 0x2D57, amount)
{
: base(606, 0x2D57, amount) =>
Hue = 0x8FD;
}
public SummonFeyScroll(Serial serial)
: base(serial)
@ -207,10 +193,8 @@ namespace Server.Items
{
[Constructible]
public SummonFiendScroll(int amount = 1)
: base(607, 0x2D58, amount)
{
: base(607, 0x2D58, amount) =>
Hue = 0x8FD;
}
public SummonFiendScroll(Serial serial)
: base(serial)
@ -236,10 +220,8 @@ namespace Server.Items
{
[Constructible]
public ReaperFormScroll(int amount = 1)
: base(608, 0x2D59, amount)
{
: base(608, 0x2D59, amount) =>
Hue = 0x8FD;
}
public ReaperFormScroll(Serial serial)
: base(serial)
@ -265,10 +247,8 @@ namespace Server.Items
{
[Constructible]
public WildfireScroll(int amount = 1)
: base(609, 0x2D5A, amount)
{
: base(609, 0x2D5A, amount) =>
Hue = 0x8FD;
}
public WildfireScroll(Serial serial)
: base(serial)
@ -294,10 +274,8 @@ namespace Server.Items
{
[Constructible]
public EssenceOfWindScroll(int amount = 1)
: base(610, 0x2D5B, amount)
{
: base(610, 0x2D5B, amount) =>
Hue = 0x8FD;
}
public EssenceOfWindScroll(Serial serial)
: base(serial)
@ -323,10 +301,8 @@ namespace Server.Items
{
[Constructible]
public DryadAllureScroll(int amount = 1)
: base(611, 0x2D5C, amount)
{
: base(611, 0x2D5C, amount) =>
Hue = 0x8FD;
}
public DryadAllureScroll(Serial serial)
: base(serial)
@ -352,10 +328,8 @@ namespace Server.Items
{
[Constructible]
public EtherealVoyageScroll(int amount = 1)
: base(612, 0x2D5D, amount)
{
: base(612, 0x2D5D, amount) =>
Hue = 0x8FD;
}
public EtherealVoyageScroll(Serial serial)
: base(serial)
@ -381,10 +355,8 @@ namespace Server.Items
{
[Constructible]
public WordOfDeathScroll(int amount = 1)
: base(613, 0x2D5E, amount)
{
: base(613, 0x2D5E, amount) =>
Hue = 0x8FD;
}
public WordOfDeathScroll(Serial serial)
: base(serial)
@ -410,10 +382,8 @@ namespace Server.Items
{
[Constructible]
public GiftOfLifeScroll(int amount = 1)
: base(614, 0x2D5F, amount)
{
: base(614, 0x2D5F, amount) =>
Hue = 0x8FD;
}
public GiftOfLifeScroll(Serial serial)
: base(serial)
@ -439,10 +409,8 @@ namespace Server.Items
{
[Constructible]
public ArcaneEmpowermentScroll(int amount = 1)
: base(615, 0x2D60, amount)
{
: base(615, 0x2D60, amount) =>
Hue = 0x8FD;
}
public ArcaneEmpowermentScroll(Serial serial)
: base(serial)

View file

@ -374,45 +374,21 @@ namespace Server.Items
return SpellbookType.Invalid;
}
public static Spellbook FindRegular(Mobile from)
{
return Find(from, -1, SpellbookType.Regular);
}
public static Spellbook FindRegular(Mobile from) => Find(from, -1, SpellbookType.Regular);
public static Spellbook FindNecromancer(Mobile from)
{
return Find(from, -1, SpellbookType.Necromancer);
}
public static Spellbook FindNecromancer(Mobile from) => Find(from, -1, SpellbookType.Necromancer);
public static Spellbook FindPaladin(Mobile from)
{
return Find(from, -1, SpellbookType.Paladin);
}
public static Spellbook FindPaladin(Mobile from) => Find(from, -1, SpellbookType.Paladin);
public static Spellbook FindSamurai(Mobile from)
{
return Find(from, -1, SpellbookType.Samurai);
}
public static Spellbook FindSamurai(Mobile from) => Find(from, -1, SpellbookType.Samurai);
public static Spellbook FindNinja(Mobile from)
{
return Find(from, -1, SpellbookType.Ninja);
}
public static Spellbook FindNinja(Mobile from) => Find(from, -1, SpellbookType.Ninja);
public static Spellbook FindArcanist(Mobile from)
{
return Find(from, -1, SpellbookType.Arcanist);
}
public static Spellbook FindArcanist(Mobile from) => Find(from, -1, SpellbookType.Arcanist);
public static Spellbook FindMystic(Mobile from)
{
return Find(from, -1, SpellbookType.Mystic);
}
public static Spellbook FindMystic(Mobile from) => Find(from, -1, SpellbookType.Mystic);
public static Spellbook Find(Mobile from, int spellID)
{
return Find(from, spellID, GetTypeForSpell(spellID));
}
public static Spellbook Find(Mobile from, int spellID) => Find(from, spellID, GetTypeForSpell(spellID));
public static Spellbook Find(Mobile from, int spellID, SpellbookType type)
{
@ -485,15 +461,9 @@ namespace Server.Items
return list;
}
public static Spellbook FindEquippedSpellbook(Mobile from)
{
return from.FindItemOnLayer(Layer.OneHanded) as Spellbook;
}
public static Spellbook FindEquippedSpellbook(Mobile from) => from.FindItemOnLayer(Layer.OneHanded) as Spellbook;
public static bool ValidateSpellbook(Spellbook book, int spellID, SpellbookType type)
{
return book.SpellbookType == type && (spellID == -1 || book.HasSpell(spellID));
}
public static bool ValidateSpellbook(Spellbook book, int spellID, SpellbookType type) => book.SpellbookType == type && (spellID == -1 || book.HasSpell(spellID));
public override bool AllowSecureTrade(Mobile from, Mobile to, Mobile newOwner, bool accepted)
{
@ -512,10 +482,7 @@ namespace Server.Items
return base.CanEquip(from);
}
public override bool AllowEquippedCast(Mobile from)
{
return true;
}
public override bool AllowEquippedCast(Mobile from) => true;
public override bool OnDragDrop(Mobile from, Item dropped)
{

View file

@ -100,10 +100,7 @@ namespace Server.Items
{
private Bandage m_Bandage;
public InternalTarget(Bandage bandage) : base(Bandage.Range, false, TargetFlags.Beneficial)
{
m_Bandage = bandage;
}
public InternalTarget(Bandage bandage) : base(Bandage.Range, false, TargetFlags.Beneficial) => m_Bandage = bandage;
protected override void OnTarget(Mobile from, object targeted)
{

View file

@ -196,10 +196,7 @@ namespace Server.Items
{
private FireHorn m_Horn;
public InternalTarget(FireHorn horn) : base(Core.AOS ? 3 : 2, true, TargetFlags.Harmful)
{
m_Horn = horn;
}
public InternalTarget(FireHorn horn) : base(Core.AOS ? 3 : 2, true, TargetFlags.Harmful) => m_Horn = horn;
protected override void OnTarget(Mobile from, object targeted)
{

View file

@ -13,10 +13,7 @@ namespace Server.Items
}
[Constructible]
public RecipeScroll(int recipeID) : base(0x2831)
{
m_RecipeID = recipeID;
}
public RecipeScroll(int recipeID) : base(0x2831) => m_RecipeID = recipeID;
public RecipeScroll(Serial serial)
: base(serial)

View file

@ -156,11 +156,7 @@ namespace Server.Items
return false;
}
public bool VerifyRegion(Mobile m)
{
//TODO: When the entire region system data is in, convert to that instead of a proximity thing.
return m.Region.IsPartOf<TownRegion>() && Faction.IsNearType(m, RepairSkillInfo.GetInfo(m_Skill).NearbyTypes, 6);
}
public bool VerifyRegion(Mobile m) => m.Region.IsPartOf<TownRegion>() && Faction.IsNearType(m, RepairSkillInfo.GetInfo(m_Skill).NearbyTypes, 6);
public override void Serialize(GenericWriter writer)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class BambooFlute : BaseInstrument
{
[Constructible]
public BambooFlute() : base(0x2805, 0x504, 0x503)
{
Weight = 2.0;
}
public BambooFlute() : base(0x2805, 0x504, 0x503) => Weight = 2.0;
public BambooFlute(Serial serial) : base(serial)
{

View file

@ -179,10 +179,7 @@ namespace Server.Items
UsesRemaining = UsesRemaining * 100 / GetUsesScalar();
}
public int GetUsesScalar()
{
return m_Quality == InstrumentQuality.Exceptional ? 200 : 100;
}
public int GetUsesScalar() => m_Quality == InstrumentQuality.Exceptional ? 200 : 100;
public void ConsumeUse(Mobile from)
{
@ -209,10 +206,7 @@ namespace Server.Items
return null;
}
public static int GetBardRange(Mobile bard, SkillName skill)
{
return 8 + (int)(bard.Skills[skill].Value / 15);
}
public static int GetBardRange(Mobile bard, SkillName skill) => 8 + (int)(bard.Skills[skill].Value / 15);
public static void PickInstrument(Mobile from, InstrumentPickedCallback callback)
{
@ -241,25 +235,13 @@ namespace Server.Items
}
}
public static bool IsMageryCreature(BaseCreature bc)
{
return bc?.AI == AIType.AI_Mage && bc.Skills.Magery.Base > 5.0;
}
public static bool IsMageryCreature(BaseCreature bc) => bc?.AI == AIType.AI_Mage && bc.Skills.Magery.Base > 5.0;
public static bool IsFireBreathingCreature(BaseCreature bc)
{
return bc?.HasBreath == true;
}
public static bool IsFireBreathingCreature(BaseCreature bc) => bc?.HasBreath == true;
public static bool IsPoisonImmune(BaseCreature bc)
{
return bc?.PoisonImmune != null;
}
public static bool IsPoisonImmune(BaseCreature bc) => bc?.PoisonImmune != null;
public static int GetPoisonLevel(BaseCreature bc)
{
return (bc?.HitPoison.Level ?? -1) + 1;
}
public static int GetPoisonLevel(BaseCreature bc) => (bc?.HitPoison.Level ?? -1) + 1;
public static double GetBaseDifficulty(Mobile targ)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class Drums : BaseInstrument
{
[Constructible]
public Drums() : base(0xE9C, 0x38, 0x39)
{
Weight = 4.0;
}
public Drums() : base(0xE9C, 0x38, 0x39) => Weight = 4.0;
public Drums(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class Harp : BaseInstrument
{
[Constructible]
public Harp() : base(0xEB1, 0x43, 0x44)
{
Weight = 35.0;
}
public Harp() : base(0xEB1, 0x43, 0x44) => Weight = 35.0;
public Harp(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class LapHarp : BaseInstrument
{
[Constructible]
public LapHarp() : base(0xEB2, 0x45, 0x46)
{
Weight = 10.0;
}
public LapHarp() : base(0xEB2, 0x45, 0x46) => Weight = 10.0;
public LapHarp(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class Lute : BaseInstrument
{
[Constructible]
public Lute() : base(0xEB3, 0x4C, 0x4D)
{
Weight = 5.0;
}
public Lute() : base(0xEB3, 0x4C, 0x4D) => Weight = 5.0;
public Lute(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class Tambourine : BaseInstrument
{
[Constructible]
public Tambourine() : base(0xE9D, 0x52, 0x53)
{
Weight = 1.0;
}
public Tambourine() : base(0xE9D, 0x52, 0x53) => Weight = 1.0;
public Tambourine(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class TambourineTassel : BaseInstrument
{
[Constructible]
public TambourineTassel() : base(0xE9E, 0x52, 0x53)
{
Weight = 1.0;
}
public TambourineTassel() : base(0xE9E, 0x52, 0x53) => Weight = 1.0;
public TambourineTassel(Serial serial) : base(serial)
{

View file

@ -278,10 +278,8 @@ namespace Server.Items
private INinjaWeapon weapon;
public LoadEntry(INinjaWeapon wep, int entry)
: base(entry, 0)
{
: base(entry, 0) =>
weapon = wep;
}
public override void OnClick()
{

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class GlassblowingBook : Item
{
[Constructible]
public GlassblowingBook() : base(0xFF4)
{
Weight = 1.0;
}
public GlassblowingBook() : base(0xFF4) => Weight = 1.0;
public GlassblowingBook(Serial serial) : base(serial)
{

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class MasonryBook : Item
{
[Constructible]
public MasonryBook() : base(0xFBE)
{
Weight = 1.0;
}
public MasonryBook() : base(0xFBE) => Weight = 1.0;
public MasonryBook(Serial serial) : base(serial)
{

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class SandMiningBook : Item
{
[Constructible]
public SandMiningBook() : base(0xFF4)
{
Weight = 1.0;
}
public SandMiningBook() : base(0xFF4) => Weight = 1.0;
public SandMiningBook(Serial serial) : base(serial)
{

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class StoneMiningBook : Item
{
[Constructible]
public StoneMiningBook() : base(0xFBE)
{
Weight = 1.0;
}
public StoneMiningBook() : base(0xFBE) => Weight = 1.0;
public StoneMiningBook(Serial serial) : base(serial)
{

View file

@ -124,10 +124,7 @@ namespace Server.Items
RenderCategories();
}
private int GetRadioID(int group, int index)
{
return index * m_Definition.Groups.Length + group;
}
private int GetRadioID(int group, int index) => index * m_Definition.Groups.Length + group;
private void RenderBackground()
{

View file

@ -129,10 +129,7 @@ namespace Server.Items
{
private DyeTub m_Tub;
public InternalTarget(DyeTub tub) : base(1, false, TargetFlags.None)
{
m_Tub = tub;
}
public InternalTarget(DyeTub tub) : base(1, false, TargetFlags.None) => m_Tub = tub;
protected override void OnTarget(Mobile from, object targeted)
{

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class FurnitureDyeTub : DyeTub, IRewardItem
{
[Constructible]
public FurnitureDyeTub()
{
LootType = LootType.Blessed;
}
public FurnitureDyeTub() => LootType = LootType.Blessed;
public FurnitureDyeTub(Serial serial) : base(serial)
{

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class LeatherDyeTub : DyeTub, IRewardItem
{
[Constructible]
public LeatherDyeTub()
{
LootType = LootType.Blessed;
}
public LeatherDyeTub() => LootType = LootType.Blessed;
public LeatherDyeTub(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class MetallicClothDyetub : DyeTub
{
[Constructible]
public MetallicClothDyetub()
{
LootType = LootType.Blessed;
}
public MetallicClothDyetub() => LootType = LootType.Blessed;
public MetallicClothDyetub(Serial serial)
: base(serial)

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class MetallicLeatherDyeTub : LeatherDyeTub
{
[Constructible]
public MetallicLeatherDyeTub()
{
LootType = LootType.Blessed;
}
public MetallicLeatherDyeTub() => LootType = LootType.Blessed;
public MetallicLeatherDyeTub(Serial serial)
: base(serial)

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class RunebookDyeTub : DyeTub, IRewardItem
{
[Constructible]
public RunebookDyeTub()
{
LootType = LootType.Blessed;
}
public RunebookDyeTub() => LootType = LootType.Blessed;
public RunebookDyeTub(Serial serial) : base(serial)
{

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class SpecialDyeTub : DyeTub, IRewardItem
{
[Constructible]
public SpecialDyeTub()
{
LootType = LootType.Blessed;
}
public SpecialDyeTub() => LootType = LootType.Blessed;
public SpecialDyeTub(Serial serial) : base(serial)
{

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class StatuetteDyeTub : DyeTub, IRewardItem
{
[Constructible]
public StatuetteDyeTub()
{
LootType = LootType.Blessed;
}
public StatuetteDyeTub() => LootType = LootType.Blessed;
public StatuetteDyeTub(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items /* High seas, loot from merchant ship's hold, also a "unc
public class WhiteClothDyeTub : DyeTub
{
[Constructible]
public WhiteClothDyeTub()
{
DyedHue = Hue = 0x9C2;
}
public WhiteClothDyeTub() => DyedHue = Hue = 0x9C2;
public WhiteClothDyeTub(Serial serial)
: base(serial)

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Dressform : Item
{
[Constructible]
public Dressform() : base(0xec6)
{
Weight = 10;
}
public Dressform() : base(0xec6) => Weight = 10;
public Dressform(Serial serial) : base(serial)
{

View file

@ -15,12 +15,7 @@ namespace Server.Items
*/
[Constructible]
public Dyes() : base(0xFA9)
{
Weight = 3.0;
/* m_UsesRemaining = 25; */
}
public Dyes() : base(0xFA9) => Weight = 3.0;
public Dyes(Serial serial) : base(serial)
{
@ -96,10 +91,7 @@ namespace Server.Items
{
private DyeTub m_Tub;
public InternalPicker(DyeTub tub) : base(tub.ItemID)
{
m_Tub = tub;
}
public InternalPicker(DyeTub tub) : base(tub.ItemID) => m_Tub = tub;
public override void OnResponse(int hue)
{

View file

@ -11,10 +11,7 @@ namespace Server.Items
public class Scissors : Item
{
[Constructible]
public Scissors() : base(0xF9F)
{
Weight = 1.0;
}
public Scissors() : base(0xF9F) => Weight = 1.0;
public Scissors(Serial serial) : base(serial)
{
@ -58,10 +55,7 @@ namespace Server.Items
{
private Scissors m_Item;
public InternalTarget(Scissors item) : base(2, false, TargetFlags.None)
{
m_Item = item;
}
public InternalTarget(Scissors item) : base(2, false, TargetFlags.None) => m_Item = item;
protected override void OnTarget(Mobile from, object targeted)
{

View file

@ -14,10 +14,7 @@ namespace Server.Items
public class DisguiseKit : Item
{
[Constructible]
public DisguiseKit() : base(0xE05)
{
Weight = 1.0;
}
public DisguiseKit() : base(0xE05) => Weight = 1.0;
public DisguiseKit(Serial serial) : base(serial)
{
@ -269,10 +266,7 @@ namespace Server.Items
t?.Start();
}
public static bool IsDisguised(Mobile m)
{
return Timers.ContainsKey(m);
}
public static bool IsDisguised(Mobile m) => Timers.ContainsKey(m);
public static void StopTimer(Mobile m)
{
@ -296,10 +290,7 @@ namespace Server.Items
}
}
public static TimeSpan TimeRemaining(Mobile m)
{
return Timers.TryGetValue(m, out Timer t) ? t.Next - DateTime.UtcNow : TimeSpan.Zero;
}
public static TimeSpan TimeRemaining(Mobile m) => Timers.TryGetValue(m, out Timer t) ? t.Next - DateTime.UtcNow : TimeSpan.Zero;
private class InternalTimer : Timer
{

View file

@ -15,10 +15,7 @@ namespace Server.Items
base.Delete();
}
public DisguisePersistance(Serial serial) : base(serial)
{
Instance = this;
}
public DisguisePersistance(Serial serial) : base(serial) => Instance = this;
public static DisguisePersistance Instance{ get; private set; }

View file

@ -56,10 +56,7 @@ namespace Server.Items
{
private Lockpick m_Item;
public InternalTarget(Lockpick item) : base(1, false, TargetFlags.None)
{
m_Item = item;
}
public InternalTarget(Lockpick item) : base(1, false, TargetFlags.None) => m_Item = item;
protected override void OnTarget(Mobile from, object targeted)
{

View file

@ -23,10 +23,7 @@ namespace Server.Items
private static DateTime WorldStart = new DateTime(1997, 9, 1);
[Constructible]
public Clock(int itemID = 0x104B) : base(itemID)
{
Weight = 3.0;
}
public Clock(int itemID = 0x104B) : base(itemID) => Weight = 3.0;
public Clock(Serial serial) : base(serial)
{

View file

@ -4,9 +4,8 @@ namespace Server.Items
{
[Constructible]
public Globe() : base(0x1047) // It isn't flippable
{
Weight = 3.0;
}
=>
Weight = 3.0;
public Globe(Serial serial) : base(serial)
{

View file

@ -9,10 +9,7 @@ namespace Server.Items
public class Spyglass : Item
{
[Constructible]
public Spyglass() : base(0x14F5)
{
Weight = 3.0;
}
public Spyglass() : base(0x14F5) => Weight = 3.0;
public Spyglass(Serial serial) : base(serial)
{

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class Fork : Item
{
[Constructible]
public Fork() : base(0x9F4)
{
Weight = 1.0;
}
public Fork() : base(0x9F4) => Weight = 1.0;
public Fork(Serial serial) : base(serial)
{
@ -31,10 +28,7 @@ namespace Server.Items
public class ForkLeft : Item
{
[Constructible]
public ForkLeft() : base(0x9F4)
{
Weight = 1.0;
}
public ForkLeft() : base(0x9F4) => Weight = 1.0;
public ForkLeft(Serial serial) : base(serial)
{
@ -58,10 +52,7 @@ namespace Server.Items
public class ForkRight : Item
{
[Constructible]
public ForkRight() : base(0x9F5)
{
Weight = 1.0;
}
public ForkRight() : base(0x9F5) => Weight = 1.0;
public ForkRight(Serial serial) : base(serial)
{
@ -86,10 +77,7 @@ namespace Server.Items
public class Spoon : Item
{
[Constructible]
public Spoon() : base(0x9F8)
{
Weight = 1.0;
}
public Spoon() : base(0x9F8) => Weight = 1.0;
public Spoon(Serial serial) : base(serial)
{
@ -113,10 +101,7 @@ namespace Server.Items
public class SpoonLeft : Item
{
[Constructible]
public SpoonLeft() : base(0x9F8)
{
Weight = 1.0;
}
public SpoonLeft() : base(0x9F8) => Weight = 1.0;
public SpoonLeft(Serial serial) : base(serial)
{
@ -140,10 +125,7 @@ namespace Server.Items
public class SpoonRight : Item
{
[Constructible]
public SpoonRight() : base(0x9F9)
{
Weight = 1.0;
}
public SpoonRight() : base(0x9F9) => Weight = 1.0;
public SpoonRight(Serial serial) : base(serial)
{
@ -168,10 +150,7 @@ namespace Server.Items
public class Knife : Item
{
[Constructible]
public Knife() : base(0x9F6)
{
Weight = 1.0;
}
public Knife() : base(0x9F6) => Weight = 1.0;
public Knife(Serial serial) : base(serial)
{
@ -195,10 +174,7 @@ namespace Server.Items
public class KnifeLeft : Item
{
[Constructible]
public KnifeLeft() : base(0x9F6)
{
Weight = 1.0;
}
public KnifeLeft() : base(0x9F6) => Weight = 1.0;
public KnifeLeft(Serial serial) : base(serial)
{
@ -222,10 +198,7 @@ namespace Server.Items
public class KnifeRight : Item
{
[Constructible]
public KnifeRight() : base(0x9F7)
{
Weight = 1.0;
}
public KnifeRight() : base(0x9F7) => Weight = 1.0;
public KnifeRight(Serial serial) : base(serial)
{
@ -249,10 +222,7 @@ namespace Server.Items
public class Plate : Item
{
[Constructible]
public Plate() : base(0x9D7)
{
Weight = 1.0;
}
public Plate() : base(0x9D7) => Weight = 1.0;
public Plate(Serial serial) : base(serial)
{

View file

@ -55,15 +55,9 @@ namespace Server.Items
private static int[] m_Possible = new int[MaxProperties];
private CraftResource m_Resource;
public BaseRunicTool(CraftResource resource, int itemID) : base(itemID)
{
m_Resource = resource;
}
public BaseRunicTool(CraftResource resource, int itemID) : base(itemID) => m_Resource = resource;
public BaseRunicTool(CraftResource resource, int uses, int itemID) : base(uses, itemID)
{
m_Resource = resource;
}
public BaseRunicTool(CraftResource resource, int uses, int itemID) : base(uses, itemID) => m_Resource = resource;
public BaseRunicTool(Serial serial) : base(serial)
{

View file

@ -131,10 +131,7 @@ namespace Server.Items
LabelToAffix(m, 1017323, AffixType.Append, ": " + m_UsesRemaining); // Durability
}
public static bool CheckAccessible(Item tool, Mobile m)
{
return tool.IsChildOf(m) || tool.Parent == m;
}
public static bool CheckAccessible(Item tool, Mobile m) => tool.IsChildOf(m) || tool.Parent == m;
public static bool CheckTool(Item tool, Mobile m)
{

View file

@ -6,16 +6,10 @@ namespace Server.Items
public class DovetailSaw : BaseTool
{
[Constructible]
public DovetailSaw() : base(0x1028)
{
Weight = 2.0;
}
public DovetailSaw() : base(0x1028) => Weight = 2.0;
[Constructible]
public DovetailSaw(int uses) : base(uses, 0x1028)
{
Weight = 2.0;
}
public DovetailSaw(int uses) : base(uses, 0x1028) => Weight = 2.0;
public DovetailSaw(Serial serial) : base(serial)
{

View file

@ -5,16 +5,10 @@ namespace Server.Items
public class DrawKnife : BaseTool
{
[Constructible]
public DrawKnife() : base(0x10E4)
{
Weight = 1.0;
}
public DrawKnife() : base(0x10E4) => Weight = 1.0;
[Constructible]
public DrawKnife(int uses) : base(uses, 0x10E4)
{
Weight = 1.0;
}
public DrawKnife(int uses) : base(uses, 0x10E4) => Weight = 1.0;
public DrawKnife(Serial serial) : base(serial)
{

View file

@ -6,16 +6,10 @@ namespace Server.Items
public class FletcherTools : BaseTool
{
[Constructible]
public FletcherTools() : base(0x1022)
{
Weight = 2.0;
}
public FletcherTools() : base(0x1022) => Weight = 2.0;
[Constructible]
public FletcherTools(int uses) : base(uses, 0x1022)
{
Weight = 2.0;
}
public FletcherTools(int uses) : base(uses, 0x1022) => Weight = 2.0;
public FletcherTools(Serial serial) : base(serial)
{

View file

@ -5,16 +5,10 @@ namespace Server.Items
public class FlourSifter : BaseTool
{
[Constructible]
public FlourSifter() : base(0x103E)
{
Weight = 1.0;
}
public FlourSifter() : base(0x103E) => Weight = 1.0;
[Constructible]
public FlourSifter(int uses) : base(uses, 0x103E)
{
Weight = 1.0;
}
public FlourSifter(int uses) : base(uses, 0x103E) => Weight = 1.0;
public FlourSifter(Serial serial) : base(serial)
{

View file

@ -5,16 +5,10 @@ namespace Server.Items
public class Froe : BaseTool
{
[Constructible]
public Froe() : base(0x10E5)
{
Weight = 1.0;
}
public Froe() : base(0x10E5) => Weight = 1.0;
[Constructible]
public Froe(int uses) : base(uses, 0x10E5)
{
Weight = 1.0;
}
public Froe(int uses) : base(uses, 0x10E5) => Weight = 1.0;
public Froe(Serial serial) : base(serial)
{

View file

@ -5,16 +5,10 @@ namespace Server.Items
public class Hammer : BaseTool
{
[Constructible]
public Hammer() : base(0x102A)
{
Weight = 2.0;
}
public Hammer() : base(0x102A) => Weight = 2.0;
[Constructible]
public Hammer(int uses) : base(uses, 0x102A)
{
Weight = 2.0;
}
public Hammer(int uses) : base(uses, 0x102A) => Weight = 2.0;
public Hammer(Serial serial) : base(serial)
{

View file

@ -5,16 +5,10 @@ namespace Server.Items
public class Inshave : BaseTool
{
[Constructible]
public Inshave() : base(0x10E6)
{
Weight = 1.0;
}
public Inshave() : base(0x10E6) => Weight = 1.0;
[Constructible]
public Inshave(int uses) : base(uses, 0x10E6)
{
Weight = 1.0;
}
public Inshave(int uses) : base(uses, 0x10E6) => Weight = 1.0;
public Inshave(Serial serial) : base(serial)
{

View file

@ -6,16 +6,10 @@ namespace Server.Items
public class JointingPlane : BaseTool
{
[Constructible]
public JointingPlane() : base(0x1030)
{
Weight = 2.0;
}
public JointingPlane() : base(0x1030) => Weight = 2.0;
[Constructible]
public JointingPlane(int uses) : base(uses, 0x1030)
{
Weight = 2.0;
}
public JointingPlane(int uses) : base(uses, 0x1030) => Weight = 2.0;
public JointingPlane(Serial serial) : base(serial)
{

View file

@ -5,16 +5,10 @@ namespace Server.Items
public class MalletAndChisel : BaseTool
{
[Constructible]
public MalletAndChisel() : base(0x12B3)
{
Weight = 1.0;
}
public MalletAndChisel() : base(0x12B3) => Weight = 1.0;
[Constructible]
public MalletAndChisel(int uses) : base(uses, 0x12B3)
{
Weight = 1.0;
}
public MalletAndChisel(int uses) : base(uses, 0x12B3) => Weight = 1.0;
public MalletAndChisel(Serial serial) : base(serial)
{

View file

@ -6,16 +6,10 @@ namespace Server.Items
public class MapmakersPen : BaseTool
{
[Constructible]
public MapmakersPen() : base(0x0FBF)
{
Weight = 1.0;
}
public MapmakersPen() : base(0x0FBF) => Weight = 1.0;
[Constructible]
public MapmakersPen(int uses) : base(uses, 0x0FBF)
{
Weight = 1.0;
}
public MapmakersPen(int uses) : base(uses, 0x0FBF) => Weight = 1.0;
public MapmakersPen(Serial serial) : base(serial)
{

View file

@ -5,16 +5,10 @@ namespace Server.Items
public class MortarPestle : BaseTool
{
[Constructible]
public MortarPestle() : base(0xE9B)
{
Weight = 1.0;
}
public MortarPestle() : base(0xE9B) => Weight = 1.0;
[Constructible]
public MortarPestle(int uses) : base(uses, 0xE9B)
{
Weight = 1.0;
}
public MortarPestle(int uses) : base(uses, 0xE9B) => Weight = 1.0;
public MortarPestle(Serial serial) : base(serial)
{

View file

@ -6,16 +6,10 @@ namespace Server.Items
public class MouldingPlane : BaseTool
{
[Constructible]
public MouldingPlane() : base(0x102C)
{
Weight = 2.0;
}
public MouldingPlane() : base(0x102C) => Weight = 2.0;
[Constructible]
public MouldingPlane(int uses) : base(uses, 0x102C)
{
Weight = 2.0;
}
public MouldingPlane(int uses) : base(uses, 0x102C) => Weight = 2.0;
public MouldingPlane(Serial serial) : base(serial)
{

View file

@ -6,16 +6,10 @@ namespace Server.Items
public class Nails : BaseTool
{
[Constructible]
public Nails() : base(0x102E)
{
Weight = 2.0;
}
public Nails() : base(0x102E) => Weight = 2.0;
[Constructible]
public Nails(int uses) : base(uses, 0x102C)
{
Weight = 2.0;
}
public Nails(int uses) : base(uses, 0x102C) => Weight = 2.0;
public Nails(Serial serial) : base(serial)
{

View file

@ -5,16 +5,10 @@ namespace Server.Items
public class RollingPin : BaseTool
{
[Constructible]
public RollingPin() : base(0x1043)
{
Weight = 1.0;
}
public RollingPin() : base(0x1043) => Weight = 1.0;
[Constructible]
public RollingPin(int uses) : base(uses, 0x1043)
{
Weight = 1.0;
}
public RollingPin(int uses) : base(uses, 0x1043) => Weight = 1.0;
public RollingPin(Serial serial) : base(serial)
{

View file

@ -6,16 +6,10 @@ namespace Server.Items
public class Saw : BaseTool
{
[Constructible]
public Saw() : base(0x1034)
{
Weight = 2.0;
}
public Saw() : base(0x1034) => Weight = 2.0;
[Constructible]
public Saw(int uses) : base(uses, 0x1034)
{
Weight = 2.0;
}
public Saw(int uses) : base(uses, 0x1034) => Weight = 2.0;
public Saw(Serial serial) : base(serial)
{

View file

@ -5,16 +5,10 @@ namespace Server.Items
public class Scorp : BaseTool
{
[Constructible]
public Scorp() : base(0x10E7)
{
Weight = 1.0;
}
public Scorp() : base(0x10E7) => Weight = 1.0;
[Constructible]
public Scorp(int uses) : base(uses, 0x10E7)
{
Weight = 1.0;
}
public Scorp(int uses) : base(uses, 0x10E7) => Weight = 1.0;
public Scorp(Serial serial) : base(serial)
{

View file

@ -6,16 +6,10 @@ namespace Server.Items
public class ScribesPen : BaseTool
{
[Constructible]
public ScribesPen() : base(0x0FBF)
{
Weight = 1.0;
}
public ScribesPen() : base(0x0FBF) => Weight = 1.0;
[Constructible]
public ScribesPen(int uses) : base(uses, 0x0FBF)
{
Weight = 1.0;
}
public ScribesPen(int uses) : base(uses, 0x0FBF) => Weight = 1.0;
public ScribesPen(Serial serial) : base(serial)
{

View file

@ -5,16 +5,10 @@ namespace Server.Items
public class SewingKit : BaseTool
{
[Constructible]
public SewingKit() : base(0xF9D)
{
Weight = 2.0;
}
public SewingKit() : base(0xF9D) => Weight = 2.0;
[Constructible]
public SewingKit(int uses) : base(uses, 0xF9D)
{
Weight = 2.0;
}
public SewingKit(int uses) : base(uses, 0xF9D) => Weight = 2.0;
public SewingKit(Serial serial) : base(serial)
{

View file

@ -5,16 +5,10 @@ namespace Server.Items
public class Skillet : BaseTool
{
[Constructible]
public Skillet() : base(0x97F)
{
Weight = 1.0;
}
public Skillet() : base(0x97F) => Weight = 1.0;
[Constructible]
public Skillet(int uses) : base(uses, 0x97F)
{
Weight = 1.0;
}
public Skillet(int uses) : base(uses, 0x97F) => Weight = 1.0;
public Skillet(Serial serial) : base(serial)
{

View file

@ -6,16 +6,10 @@ namespace Server.Items
public class SledgeHammer : BaseTool
{
[Constructible]
public SledgeHammer() : base(0xFB5)
{
Layer = Layer.OneHanded;
}
public SledgeHammer() : base(0xFB5) => Layer = Layer.OneHanded;
[Constructible]
public SledgeHammer(int uses) : base(uses, 0xFB5)
{
Layer = Layer.OneHanded;
}
public SledgeHammer(int uses) : base(uses, 0xFB5) => Layer = Layer.OneHanded;
public SledgeHammer(Serial serial) : base(serial)
{

View file

@ -6,16 +6,10 @@ namespace Server.Items
public class SmoothingPlane : BaseTool
{
[Constructible]
public SmoothingPlane() : base(0x1032)
{
Weight = 1.0;
}
public SmoothingPlane() : base(0x1032) => Weight = 1.0;
[Constructible]
public SmoothingPlane(int uses) : base(uses, 0x1032)
{
Weight = 1.0;
}
public SmoothingPlane(int uses) : base(uses, 0x1032) => Weight = 1.0;
public SmoothingPlane(Serial serial) : base(serial)
{

View file

@ -6,16 +6,10 @@ namespace Server.Items
public class TinkerTools : BaseTool
{
[Constructible]
public TinkerTools() : base(0x1EB8)
{
Weight = 1.0;
}
public TinkerTools() : base(0x1EB8) => Weight = 1.0;
[Constructible]
public TinkerTools(int uses) : base(uses, 0x1EB8)
{
Weight = 1.0;
}
public TinkerTools(int uses) : base(uses, 0x1EB8) => Weight = 1.0;
public TinkerTools(Serial serial) : base(serial)
{
@ -42,17 +36,13 @@ namespace Server.Items
{
[Constructible]
public TinkersTools()
: base(0x1EBC)
{
: base(0x1EBC) =>
Weight = 1.0;
}
[Constructible]
public TinkersTools(int uses)
: base(uses, 0x1EBC)
{
: base(uses, 0x1EBC) =>
Weight = 1.0;
}
public TinkersTools(Serial serial)
: base(serial)

View file

@ -6,16 +6,10 @@ namespace Server.Items
public class Tongs : BaseTool
{
[Constructible]
public Tongs() : base(0xFBB)
{
Weight = 2.0;
}
public Tongs() : base(0xFBB) => Weight = 2.0;
[Constructible]
public Tongs(int uses) : base(uses, 0xFBB)
{
Weight = 2.0;
}
public Tongs(int uses) : base(uses, 0xFBB) => Weight = 2.0;
public Tongs(Serial serial) : base(serial)
{