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

@ -79,10 +79,7 @@
m_Attribute = (AosElementAttribute)reader.ReadInt();
}
public static AosElementAttribute RandomType()
{
return GetTypes(Utility.Random(5));
}
public static AosElementAttribute RandomType() => GetTypes(Utility.Random(5));
public static AosElementAttribute GetTypes(int value)
{

View file

@ -149,10 +149,7 @@ namespace Server.Items
}
}
public bool HasAccces(Mobile m)
{
return m.AccessLevel >= AccessLevel.GameMaster || BaseHouse.FindHouseAt(this)?.HasAccess(m) == true;
}
public bool HasAccces(Mobile m) => m.AccessLevel >= AccessLevel.GameMaster || BaseHouse.FindHouseAt(this)?.HasAccess(m) == true;
public void PlayMusic(Mobile m, MusicName music)
{

View file

@ -102,10 +102,7 @@ namespace Server.Items
{
private DawnsMusicGear m_Gear;
public InternalTarget(DawnsMusicGear gear) : base(2, false, TargetFlags.None)
{
m_Gear = gear;
}
public InternalTarget(DawnsMusicGear gear) : base(2, false, TargetFlags.None) => m_Gear = gear;
protected override void OnTarget(Mobile from, object targeted)
{

View file

@ -6,10 +6,8 @@ namespace Server.Items
{
[Constructible]
public EnhancedBandage(int amount = 1)
: base(amount)
{
: base(amount) =>
Hue = 0x8A5;
}
public EnhancedBandage(Serial serial)
: base(serial)
@ -20,10 +18,7 @@ namespace Server.Items
public override int LabelNumber => 1152441; // enhanced bandage
public override bool Dye(Mobile from, DyeTub sender)
{
return false;
}
public override bool Dye(Mobile from, DyeTub sender) => false;
public override void AddNameProperties(ObjectPropertyList list)
{
@ -88,10 +83,7 @@ namespace Server.Items
}
}
public override bool OnDragLift(Mobile from)
{
return false;
}
public override bool OnDragLift(Mobile from) => false;
public override bool OnDragDrop(Mobile from, Item dropped)
{

View file

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

View file

@ -50,10 +50,7 @@ namespace Server.Items
private bool m_East;
[Constructible]
public BrokenBedDeed()
{
LootType = LootType.Blessed;
}
public BrokenBedDeed() => LootType = LootType.Blessed;
public BrokenBedDeed(Serial serial) : base(serial)
{

View file

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

View file

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

View file

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

View file

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

View file

@ -46,10 +46,7 @@ namespace Server.Items
private bool m_East;
[Constructible]
public BrokenVanityDeed()
{
LootType = LootType.Blessed;
}
public BrokenVanityDeed() => LootType = LootType.Blessed;
public BrokenVanityDeed(Serial serial) : base(serial)
{

View file

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

View file

@ -4,10 +4,7 @@ namespace Server.Items
public class LeatherGlovesOfMining : BaseGlovesOfMining
{
[Constructible]
public LeatherGlovesOfMining(int bonus) : base(bonus, 0x13C6)
{
Weight = 1;
}
public LeatherGlovesOfMining(int bonus) : base(bonus, 0x13C6) => Weight = 1;
public LeatherGlovesOfMining(Serial serial) : base(serial)
{
@ -51,10 +48,7 @@ namespace Server.Items
public class StuddedGlovesOfMining : BaseGlovesOfMining
{
[Constructible]
public StuddedGlovesOfMining(int bonus) : base(bonus, 0x13D5)
{
Weight = 2;
}
public StuddedGlovesOfMining(int bonus) : base(bonus, 0x13D5) => Weight = 2;
public StuddedGlovesOfMining(Serial serial) : base(serial)
{
@ -96,10 +90,7 @@ namespace Server.Items
public class RingmailGlovesOfMining : BaseGlovesOfMining
{
[Constructible]
public RingmailGlovesOfMining(int bonus) : base(bonus, 0x13EB)
{
Weight = 1;
}
public RingmailGlovesOfMining(int bonus) : base(bonus, 0x13EB) => Weight = 1;
public RingmailGlovesOfMining(Serial serial) : base(serial)
{

View file

@ -93,10 +93,7 @@ namespace Server.Items
{
private PowderOfTemperament m_Powder;
public InternalTarget(PowderOfTemperament powder) : base(2, false, TargetFlags.None)
{
m_Powder = powder;
}
public InternalTarget(PowderOfTemperament powder) : base(2, false, TargetFlags.None) => m_Powder = powder;
protected override void OnTarget(Mobile from, object targeted)
{

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -8,10 +8,7 @@ namespace Server.Items
{
private Timer m_Timer;
public DisturbingPortraitComponent() : base(0x2A5D)
{
m_Timer = Timer.DelayCall(TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(3), Change);
}
public DisturbingPortraitComponent() : base(0x2A5D) => m_Timer = Timer.DelayCall(TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(3), Change);
public DisturbingPortraitComponent(Serial serial) : base(serial)
{
@ -92,10 +89,7 @@ namespace Server.Items
public class DisturbingPortraitDeed : BaseAddonDeed
{
[Constructible]
public DisturbingPortraitDeed()
{
LootType = LootType.Blessed;
}
public DisturbingPortraitDeed() => LootType = LootType.Blessed;
public DisturbingPortraitDeed(Serial serial) : base(serial)
{

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -8,10 +8,7 @@ namespace Server.Items
{
private Timer m_Timer;
public UnsettlingPortraitComponent() : base(0x2A65)
{
m_Timer = Timer.DelayCall(TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(3), ChangeDirection);
}
public UnsettlingPortraitComponent() : base(0x2A65) => m_Timer = Timer.DelayCall(TimeSpan.FromMinutes(3), TimeSpan.FromMinutes(3), ChangeDirection);
public UnsettlingPortraitComponent(Serial serial) : base(serial)
{
@ -95,10 +92,7 @@ namespace Server.Items
public class UnsettlingPortraitDeed : BaseAddonDeed
{
[Constructible]
public UnsettlingPortraitDeed()
{
LootType = LootType.Blessed;
}
public UnsettlingPortraitDeed() => LootType = LootType.Blessed;
public UnsettlingPortraitDeed(Serial serial) : base(serial)
{

View file

@ -53,10 +53,7 @@ namespace Server.Items
private bool m_East;
[Constructible]
public HearthOfHomeFireDeed()
{
LootType = LootType.Blessed;
}
public HearthOfHomeFireDeed() => LootType = LootType.Blessed;
public HearthOfHomeFireDeed(Serial serial) : base(serial)
{

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -5,10 +5,7 @@ namespace Server.Items
{
public class CurtainsComponent : AddonComponent, IDyable
{
public CurtainsComponent(int itemID, int closedID) : base(itemID)
{
ClosedID = closedID;
}
public CurtainsComponent(int itemID, int closedID) : base(itemID) => ClosedID = closedID;
public CurtainsComponent(Serial serial) : base(serial)
{
@ -119,10 +116,7 @@ namespace Server.Items
private bool m_East;
[Constructible]
public CurtainsDeed()
{
LootType = LootType.Blessed;
}
public CurtainsDeed() => LootType = LootType.Blessed;
public CurtainsDeed(Serial serial) : base(serial)
{

View file

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

View file

@ -128,10 +128,7 @@ namespace Server.Items
public class AppleTreeDeed : BaseAddonDeed
{
[Constructible]
public AppleTreeDeed()
{
LootType = LootType.Blessed;
}
public AppleTreeDeed() => LootType = LootType.Blessed;
public AppleTreeDeed(Serial serial) : base(serial)
{
@ -189,10 +186,7 @@ namespace Server.Items
public class PeachTreeDeed : BaseAddonDeed
{
[Constructible]
public PeachTreeDeed()
{
LootType = LootType.Blessed;
}
public PeachTreeDeed() => LootType = LootType.Blessed;
public PeachTreeDeed(Serial serial) : base(serial)
{

View file

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

View file

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

View file

@ -46,10 +46,7 @@ namespace Server.Items
private bool m_East;
[Constructible]
public HangingAxesDeed()
{
LootType = LootType.Blessed;
}
public HangingAxesDeed() => LootType = LootType.Blessed;
public HangingAxesDeed(Serial serial) : base(serial)
{

View file

@ -46,10 +46,7 @@ namespace Server.Items
private bool m_East;
[Constructible]
public HangingSwordsDeed()
{
LootType = LootType.Blessed;
}
public HangingSwordsDeed() => LootType = LootType.Blessed;
public HangingSwordsDeed(Serial serial) : base(serial)
{

View file

@ -71,10 +71,7 @@ namespace Server.Items
private int m_Type;
[Constructible]
public HouseLadderDeed()
{
LootType = LootType.Blessed;
}
public HouseLadderDeed() => LootType = LootType.Blessed;
public HouseLadderDeed(Serial serial) : base(serial)
{

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -48,10 +48,7 @@ namespace Server.Items
private bool m_East;
[Constructible]
public StoneStatueDeed()
{
LootType = LootType.Blessed;
}
public StoneStatueDeed() => LootType = LootType.Blessed;
public StoneStatueDeed(Serial serial) : base(serial)
{

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -50,10 +50,7 @@ namespace Server.Items
private bool m_East;
[Constructible]
public UnmadeBedDeed()
{
LootType = LootType.Blessed;
}
public UnmadeBedDeed() => LootType = LootType.Blessed;
public UnmadeBedDeed(Serial serial) : base(serial)
{

View file

@ -43,10 +43,7 @@ namespace Server.Items
private bool m_East;
[Constructible]
public VanityDeed()
{
LootType = LootType.Blessed;
}
public VanityDeed() => LootType = LootType.Blessed;
public VanityDeed(Serial serial) : base(serial)
{

View file

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

View file

@ -75,10 +75,7 @@ namespace Server.Items
private bool m_East;
[Constructible]
public WoodenCoffinDeed()
{
LootType = LootType.Blessed;
}
public WoodenCoffinDeed() => LootType = LootType.Blessed;
public WoodenCoffinDeed(Serial serial) : base(serial)
{

View file

@ -102,10 +102,7 @@ namespace Server.Items
public override int LabelNumber => 1041117; // a tree for the holidays
public bool CouldFit(IPoint3D p, Map map)
{
return map.CanFit((Point3D)p, 20);
}
public bool CouldFit(IPoint3D p, Map map) => map.CanFit((Point3D)p, 20);
Item IAddon.Deed => new HolidayTreeDeed();
@ -217,10 +214,7 @@ namespace Server.Items
private class Ornament : Item
{
public Ornament(int itemID) : base(itemID)
{
Movable = false;
}
public Ornament(int itemID) : base(itemID) => Movable = false;
public Ornament(Serial serial) : base(serial)
{

View file

@ -32,10 +32,7 @@ namespace Server.Items
return timer;
}
public static int GetToothAche(Mobile from)
{
return m_ToothAches.TryGetValue(from, out CandyCaneTimer timer) ? timer.Eaten : 0;
}
public static int GetToothAche(Mobile from) => m_ToothAches.TryGetValue(from, out CandyCaneTimer timer) ? timer.Eaten : 0;
public static void SetToothAche(Mobile from, int value)
{

View file

@ -47,10 +47,8 @@
{
[Constructible]
public GiftBoxRectangle()
: base(Utility.RandomBool() ? 0x46A5 : 0x46A6)
{
: base(Utility.RandomBool() ? 0x46A5 : 0x46A6) =>
Hue = GiftBoxHues.RandomGiftBoxHue;
}
public GiftBoxRectangle(Serial serial)
: base(serial)
@ -76,10 +74,8 @@
{
[Constructible]
public GiftBoxCube()
: base(0x46A2)
{
: base(0x46A2) =>
Hue = GiftBoxHues.RandomGiftBoxHue;
}
public GiftBoxCube(Serial serial)
: base(serial)
@ -105,10 +101,8 @@
{
[Constructible]
public GiftBoxCylinder()
: base(0x46A3)
{
: base(0x46A3) =>
Hue = GiftBoxHues.RandomGiftBoxHue;
}
public GiftBoxCylinder(Serial serial)
: base(serial)
@ -134,10 +128,8 @@
{
[Constructible]
public GiftBoxOctogon()
: base(0x46A4)
{
: base(0x46A4) =>
Hue = GiftBoxHues.RandomGiftBoxHue;
}
public GiftBoxOctogon(Serial serial)
: base(serial)
@ -163,10 +155,8 @@
{
[Constructible]
public GiftBoxAngel()
: base(0x46A7)
{
: base(0x46A7) =>
Hue = GiftBoxHues.RandomGiftBoxHue;
}
public GiftBoxAngel(Serial serial)
: base(serial)
@ -193,10 +183,8 @@
{
[Constructible]
public GiftBoxNeon()
: base(Utility.RandomBool() ? 0x232A : 0x232B)
{
: base(Utility.RandomBool() ? 0x232A : 0x232B) =>
Hue = GiftBoxHues.RandomNeonBoxHue;
}
public GiftBoxNeon(Serial serial)
: base(serial)

View file

@ -43,10 +43,8 @@ namespace Server.Items
{
[Constructible]
public PottedPlantDeed()
: base(0x14F0)
{
: base(0x14F0) =>
LootType = LootType.Blessed;
}
public PottedPlantDeed(Serial serial)
: base(serial)

View file

@ -15,10 +15,8 @@ namespace Server.Items
}
public IcyPatch(int itemid)
: base(itemid)
{
: base(itemid) =>
Hue = 0x481;
}
public IcyPatch(Serial serial)
: base(serial)

View file

@ -65,10 +65,7 @@ namespace Server.Items
}
[Constructible]
public SnowGlobeOne(SnowGlobeTypeOne type)
{
m_Type = type;
}
public SnowGlobeOne(SnowGlobeTypeOne type) => m_Type = type;
public SnowGlobeOne(Serial serial)
: base(serial)
@ -171,10 +168,7 @@ namespace Server.Items
}
[Constructible]
public SnowGlobeTwo(SnowGlobeTypeTwo type)
{
m_Type = type;
}
public SnowGlobeTwo(SnowGlobeTypeTwo type) => m_Type = type;
public SnowGlobeTwo(Serial serial)
: base(serial)
@ -261,10 +255,7 @@ namespace Server.Items
}
[Constructible]
public SnowGlobeThree(SnowGlobeTypeThree type)
{
m_Type = type;
}
public SnowGlobeThree(SnowGlobeTypeThree type) => m_Type = type;
public SnowGlobeThree(Serial serial)
: base(serial)

View file

@ -12,10 +12,8 @@
[Constructible]
public SnowPileDeco(int itemid)
: base(itemid)
{
: base(itemid) =>
Hue = 0x481;
}
public SnowPileDeco(Serial serial)
: base(serial)

View file

@ -131,10 +131,8 @@ namespace Server.Items
{
[Constructible]
public SnowStatueDeed()
: base(0x14F0)
{
: base(0x14F0) =>
LootType = LootType.Blessed;
}
public SnowStatueDeed(Serial serial)
: base(serial)

View file

@ -82,10 +82,7 @@ namespace Server.Items
public override double DefaultWeight => 1.0;
public bool ValidLocation()
{
return m_PlotLocation != Point3D.Zero && m_Facet != null && m_Facet != Map.Internal;
}
public bool ValidLocation() => m_PlotLocation != Point3D.Zero && m_Facet != null && m_Facet != Map.Internal;
public override void GetProperties(ObjectPropertyList list)
{

View file

@ -144,20 +144,11 @@ namespace Server.Gumps
}
}
public string Right(string text)
{
return $"<DIV ALIGN=RIGHT>{text}</DIV>";
}
public string Right(string text) => $"<DIV ALIGN=RIGHT>{text}</DIV>";
public string Center(string text)
{
return $"<CENTER>{text}</CENTER>";
}
public string Center(string text) => $"<CENTER>{text}</CENTER>";
public string Color(string text, int color)
{
return $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
}
public string Color(string text, int color) => $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
public override void OnResponse(NetState sender, RelayInfo info)
{

View file

@ -10,10 +10,8 @@ namespace Server.Regions
private HouseRaffleStone m_Stone;
public HouseRaffleRegion(HouseRaffleStone stone)
: base(null, stone.PlotFacet, DefaultPriority, stone.PlotBounds)
{
: base(null, stone.PlotFacet, DefaultPriority, stone.PlotBounds) =>
m_Stone = stone;
}
public override bool AllowHousing(Mobile from, Point3D p)
{

View file

@ -271,11 +271,9 @@ namespace Server.Items
Timer.DelayCall(TimeSpan.FromMinutes(1.0), TimeSpan.FromMinutes(1.0), CheckEnd_OnTick);
}
public bool ValidLocation()
{
return m_Bounds.Start != Point2D.Zero && m_Bounds.End != Point2D.Zero && m_Facet != null &&
m_Facet != Map.Internal;
}
public bool ValidLocation() =>
m_Bounds.Start != Point2D.Zero && m_Bounds.End != Point2D.Zero && m_Facet != null &&
m_Facet != Map.Internal;
private void InvalidateRegion()
{
@ -362,10 +360,7 @@ namespace Server.Items
return FormatLocation(GetPlotCenter(), m_Facet, true);
}
public string FormatPrice()
{
return m_TicketPrice == 0 ? "FREE" : $"{m_TicketPrice} gold";
}
public string FormatPrice() => m_TicketPrice == 0 ? "FREE" : $"{m_TicketPrice} gold";
public override void GetProperties(ObjectPropertyList list)
{

View file

@ -6,10 +6,7 @@ namespace Server.Items
public class GrizzledMareStatuette : BaseImprisonedMobile
{
[Constructible]
public GrizzledMareStatuette() : base(0x2617)
{
Weight = 1.0;
}
public GrizzledMareStatuette() : base(0x2617) => Weight = 1.0;
public GrizzledMareStatuette(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class MinotaurHedge : Item
{
[Constructible]
public MinotaurHedge() : base(Utility.Random(3215, 4))
{
Weight = 1.0;
}
public MinotaurHedge() : base(Utility.Random(3215, 4)) => Weight = 1.0;
public MinotaurHedge(Serial serial) : base(serial)
{

View file

@ -3,10 +3,7 @@ namespace Server.Items
public class TormentedChains : Item
{
[Constructible]
public TormentedChains() : base(Utility.Random(6663, 2))
{
Weight = 1.0;
}
public TormentedChains() : base(Utility.Random(6663, 2)) => Weight = 1.0;
public TormentedChains(Serial serial) : base(serial)
{

View file

@ -220,10 +220,7 @@ namespace Server.Items
list.Add(502696); // turned off
}
public bool IsOwner(Mobile mob)
{
return BaseHouse.FindHouseAt(this)?.IsOwner(mob) == true;
}
public bool IsOwner(Mobile mob) => BaseHouse.FindHouseAt(this)?.IsOwner(mob) == true;
public override void OnDoubleClick(Mobile from)
{

View file

@ -16,10 +16,7 @@ namespace Server.Items
0x2B, 0x42, 0x54, 0x60
};
public PlagueBeastBackpack() : base(0x261B)
{
Layer = Layer.Backpack;
}
public PlagueBeastBackpack() : base(0x261B) => Layer = Layer.Backpack;
public PlagueBeastBackpack(Serial serial) : base(serial)
{

View file

@ -7,10 +7,7 @@ namespace Server.Items
{
private Timer m_Timer;
public PlagueBeastBlood() : base(0x122C, 0)
{
m_Timer = Timer.DelayCall(TimeSpan.FromSeconds(1.5), TimeSpan.FromSeconds(1.5), 3, Hemorrhage);
}
public PlagueBeastBlood() : base(0x122C, 0) => m_Timer = Timer.DelayCall(TimeSpan.FromSeconds(1.5), TimeSpan.FromSeconds(1.5), 3, Hemorrhage);
public PlagueBeastBlood(Serial serial) : base(serial)
{

View file

@ -44,10 +44,7 @@ namespace Server.Items
private bool m_Delay;
private PlagueBeastHeart m_Heart;
public InternalTimer(PlagueBeastHeart heart) : base(TimeSpan.FromSeconds(0.5), TimeSpan.FromSeconds(0.5))
{
m_Heart = heart;
}
public InternalTimer(PlagueBeastHeart heart) : base(TimeSpan.FromSeconds(0.5), TimeSpan.FromSeconds(0.5)) => m_Heart = heart;
protected override void OnTick()
{

View file

@ -23,15 +23,9 @@ namespace Server.Items
{
}
public virtual bool Scissor(Mobile from, Scissors scissors)
{
return false;
}
public virtual bool Scissor(Mobile from, Scissors scissors) => false;
public virtual bool OnBandage(Mobile from)
{
return false;
}
public virtual bool OnBandage(Mobile from) => false;
public override bool IsAccessibleTo(Mobile check)
{
@ -76,10 +70,7 @@ namespace Server.Items
public class PlagueBeastComponent : PlagueBeastInnard
{
public PlagueBeastComponent(int itemID, int hue, bool movable = false) : base(itemID, hue)
{
Movable = movable;
}
public PlagueBeastComponent(int itemID, int hue, bool movable = false) : base(itemID, hue) => Movable = movable;
public PlagueBeastComponent(Serial serial) : base(serial)
{
@ -93,25 +84,13 @@ namespace Server.Items
public bool IsReceptacle => ItemID == 0x9DF;
public override bool DropToItem(Mobile from, Item target, Point3D p)
{
return target is PlagueBeastBackpack && base.DropToItem(from, target, p);
}
public override bool DropToItem(Mobile from, Item target, Point3D p) => target is PlagueBeastBackpack && base.DropToItem(from, target, p);
public override bool AllowSecureTrade(Mobile from, Mobile to, Mobile newOwner, bool accepted)
{
return false;
}
public override bool AllowSecureTrade(Mobile from, Mobile to, Mobile newOwner, bool accepted) => false;
public override bool DropToMobile(Mobile from, Mobile target, Point3D p)
{
return false;
}
public override bool DropToMobile(Mobile from, Mobile target, Point3D p) => false;
public override bool DropToWorld(Mobile from, Point3D p)
{
return false;
}
public override bool DropToWorld(Mobile from, Point3D p) => false;
public override bool OnDragDrop(Mobile from, Item dropped)
{

View file

@ -69,15 +69,9 @@ namespace Server.Items
m_Timer.Stop();
}
public virtual bool OnLifted(Mobile from, PlagueBeastComponent c)
{
return c.IsGland || c.IsBrain;
}
public virtual bool OnLifted(Mobile from, PlagueBeastComponent c) => c.IsGland || c.IsBrain;
public virtual bool OnDropped(Mobile from, Item item, PlagueBeastComponent to)
{
return false;
}
public virtual bool OnDropped(Mobile from, Item item, PlagueBeastComponent to) => false;
public virtual void FinishOpening(Mobile from)
{
@ -225,10 +219,7 @@ namespace Server.Items
private int m_Veins;
public PlagueBeastRubbleOrgan()
{
m_Veins = 3;
}
public PlagueBeastRubbleOrgan() => m_Veins = 3;
public PlagueBeastRubbleOrgan(Serial serial) : base(serial)
{
@ -446,10 +437,7 @@ namespace Server.Items
{
private int m_Brains;
public PlagueBeastMainOrgan()
{
m_Brains = 0;
}
public PlagueBeastMainOrgan() => m_Brains = 0;
public PlagueBeastMainOrgan(Serial serial) : base(serial)
{

View file

@ -7,10 +7,7 @@ namespace Server.Items
{
private Timer m_Timer;
public PlagueBeastVein(int itemID, int hue) : base(itemID, hue)
{
Cut = false;
}
public PlagueBeastVein(int itemID, int hue) : base(itemID, hue) => Cut = false;
public PlagueBeastVein(Serial serial) : base(serial)
{

View file

@ -5,10 +5,8 @@
private int m_Quantity;
public BaseWaterContainer(int Item_Id, bool filled)
: base(Item_Id)
{
: base(Item_Id) =>
m_Quantity = filled ? MaxQuantity : 0;
}
public BaseWaterContainer(Serial serial)
: base(serial)

View file

@ -216,10 +216,7 @@ namespace Server.Items
{
private BagOfSending m_Bag;
public SendTarget(BagOfSending bag) : base(-1, false, TargetFlags.None)
{
m_Bag = bag;
}
public SendTarget(BagOfSending bag) : base(-1, false, TargetFlags.None) => m_Bag = bag;
protected override void OnTarget(Mobile from, object targeted)
{

View file

@ -326,10 +326,7 @@ namespace Server.Items
{
private BallCallback m_Callback;
public BallEntry(BallCallback callback, int number) : base(number, 2)
{
m_Callback = callback;
}
public BallEntry(BallCallback callback, int number) : base(number, 2) => m_Callback = callback;
public override void OnClick()
{
@ -344,10 +341,7 @@ namespace Server.Items
{
private BallOfSummoning m_Ball;
public PetLinkTarget(BallOfSummoning ball) : base(-1, false, TargetFlags.None)
{
m_Ball = ball;
}
public PetLinkTarget(BallOfSummoning ball) : base(-1, false, TargetFlags.None) => m_Ball = ball;
protected override void OnTarget(Mobile from, object targeted)
{
@ -415,25 +409,13 @@ namespace Server.Items
public override TimeSpan CastDelayBase => TimeSpan.FromSeconds(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()
{

View file

@ -399,10 +399,7 @@ namespace Server.Items
{
private BraceletOfBinding m_Bracelet;
public BindTarget(BraceletOfBinding bracelet) : base(-1, false, TargetFlags.None)
{
m_Bracelet = bracelet;
}
public BindTarget(BraceletOfBinding bracelet) : base(-1, false, TargetFlags.None) => m_Bracelet = bracelet;
protected override void OnTarget(Mobile from, object targeted)
{
@ -443,10 +440,7 @@ namespace Server.Items
{
private BraceletOfBinding m_Bracelet;
public InscribePrompt(BraceletOfBinding bracelet)
{
m_Bracelet = bracelet;
}
public InscribePrompt(BraceletOfBinding bracelet) => m_Bracelet = bracelet;
public override void OnResponse(Mobile from, string text)
{

View file

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

View file

@ -818,10 +818,8 @@ namespace Server.Items
[Constructible]
public SoulstoneFragment(int usesRemaining = 5, string account = null) :
base(account, Utility.Random(0x2AA1, 9))
{
base(account, Utility.Random(0x2AA1, 9)) =>
m_UsesRemaining = usesRemaining;
}
public SoulstoneFragment(Serial serial) : base(serial)
{

View file

@ -36,10 +36,7 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public double Value{ get; set; }
public virtual string GetNameLocalized()
{
return string.Concat("#", AosSkillBonuses.GetLabel(Skill).ToString());
}
public virtual string GetNameLocalized() => string.Concat("#", AosSkillBonuses.GetLabel(Skill).ToString());
public virtual string GetName()
{

View file

@ -5,10 +5,7 @@ namespace Server.Items
public class StatCapScroll : SpecialScroll
{
[Constructible]
public StatCapScroll(int value = 105) : base(SkillName.Alchemy, value)
{
Hue = 0x481;
}
public StatCapScroll(int value = 105) : base(SkillName.Alchemy, value) => Hue = 0x481;
public StatCapScroll(Serial serial) : base(serial)
{

View file

@ -128,10 +128,7 @@ namespace Server.Items
private bool m_IsRewardItem;
[Constructible]
public BloodyPentagramDeed()
{
LootType = LootType.Blessed;
}
public BloodyPentagramDeed() => LootType = LootType.Blessed;
public BloodyPentagramDeed(Serial serial) : base(serial)
{

View file

@ -9,10 +9,7 @@ namespace Server.Items
{
public class CannonAddonComponent : AddonComponent
{
public CannonAddonComponent(int itemID) : base(itemID)
{
LootType = LootType.Blessed;
}
public CannonAddonComponent(int itemID) : base(itemID) => LootType = LootType.Blessed;
public CannonAddonComponent(Serial serial) : base(serial)
{
@ -254,10 +251,7 @@ namespace Server.Items
{
private CannonAddon m_Cannon;
public InternalTarget(CannonAddon cannon) : base(12, true, TargetFlags.None)
{
m_Cannon = cannon;
}
public InternalTarget(CannonAddon cannon) : base(12, true, TargetFlags.None) => m_Cannon = cannon;
protected override void OnTarget(Mobile from, object targeted)
{
@ -373,10 +367,7 @@ namespace Server.Items
private bool m_IsRewardItem;
[Constructible]
public CannonDeed()
{
LootType = LootType.Blessed;
}
public CannonDeed() => LootType = LootType.Blessed;
public CannonDeed(Serial serial) : base(serial)
{

View file

@ -11,10 +11,7 @@ namespace Server.Items
private bool m_IsRewardItem;
[Constructible]
public DecorativeShield(int itemID = 0x156C) : base(itemID)
{
Movable = false;
}
public DecorativeShield(int itemID = 0x156C) : base(itemID) => Movable = false;
public DecorativeShield(Serial serial) : base(serial)
{
@ -44,12 +41,10 @@ namespace Server.Items
}
}
public bool CouldFit(IPoint3D p, Map map)
{
return map?.CanFit(p.X, p.Y, p.Z, ItemData.Height) == true && (FacingSouth
&& BaseAddon.IsWall(p.X, p.Y - 1, p.Z, map)
|| BaseAddon.IsWall(p.X - 1, p.Y, p.Z, map));
}
public bool CouldFit(IPoint3D p, Map map) =>
map?.CanFit(p.X, p.Y, p.Z, ItemData.Height) == true && (FacingSouth
&& BaseAddon.IsWall(p.X, p.Y - 1, p.Z, map)
|| BaseAddon.IsWall(p.X - 1, p.Y, p.Z, map));
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem

View file

@ -196,10 +196,7 @@ namespace Server.Items
{
private FlamingHeadDeed m_Head;
public InternalTarget(FlamingHeadDeed head) : base(-1, true, TargetFlags.None)
{
m_Head = head;
}
public InternalTarget(FlamingHeadDeed head) : base(-1, true, TargetFlags.None) => m_Head = head;
protected override void OnTarget(Mobile from, object targeted)
{

View file

@ -337,10 +337,7 @@ namespace Server.Items
private bool m_IsRewardItem;
[Constructible]
public MiningCartDeed()
{
LootType = LootType.Blessed;
}
public MiningCartDeed() => LootType = LootType.Blessed;
public MiningCartDeed(Serial serial) : base(serial)
{

View file

@ -94,10 +94,7 @@ namespace Server.Items
private MinotaurStatueType m_StatueType;
[Constructible]
public MinotaurStatueDeed()
{
LootType = LootType.Blessed;
}
public MinotaurStatueDeed() => LootType = LootType.Blessed;
public MinotaurStatueDeed(Serial serial) : base(serial)
{

Some files were not shown because too many files have changed in this diff Show more