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

Upgrades code style - First batch (#22)

Browse source
This commit is contained in:
Kamron Batman 2018-08-14 06:16:50 +08:00 • committed by GitHub
parent 8ee42c8ea2
commit 632e8b4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1834 changed files with 10245 additions and 10437 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Scripts/Items/Special/Evil Home Decor Collection/AwesomeDisturbingPortrait.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x2A5D, 0x2A61 )]
public class AwesomeDisturbingPortraitComponent : AddonComponent
{
public override int LabelNumber { get { return 1074479; } } // Disturbing portrait
public override int LabelNumber => 1074479; // Disturbing portrait
public bool FacingSouth { get { return ItemID < 0x2A61; } }
private InternalTimer m_Timer;
@ -129,10 +129,10 @@ namespace Server.Items
public class AwesomeDisturbingPortraitAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new AwesomeDisturbingPortraitDeed(); } }
public override BaseAddonDeed Deed => new AwesomeDisturbingPortraitDeed();
[Constructible]
public AwesomeDisturbingPortraitAddon() : base()
public AwesomeDisturbingPortraitAddon()
{
AddComponent( new AwesomeDisturbingPortraitComponent(), 0, 0, 0 );
}
@ -158,11 +158,11 @@ namespace Server.Items
public class AwesomeDisturbingPortraitDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new AwesomeDisturbingPortraitAddon(); } }
public override int LabelNumber { get { return 1074479; } } // Disturbing portrait
public override BaseAddon Addon => new AwesomeDisturbingPortraitAddon();
public override int LabelNumber => 1074479; // Disturbing portrait
[Constructible]
public AwesomeDisturbingPortraitDeed() : base()
public AwesomeDisturbingPortraitDeed()
{
LootType = LootType.Blessed;
}

12
Scripts/Items/Special/Evil Home Decor Collection/BedOfNails.cs
View file

@ -4,7 +4,7 @@ namespace Server.Items
{
public class BedOfNailsComponent : AddonComponent
{
public override int LabelNumber { get { return 1074801; } } // Bed of Nails
public override int LabelNumber => 1074801; // Bed of Nails
public BedOfNailsComponent( int itemID )
: base( itemID )
@ -44,13 +44,12 @@ namespace Server.Items
[FlippableAddon( Direction.South, Direction.East )]
public class BedOfNailsAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new BedOfNailsDeed(); } }
public override BaseAddonDeed Deed => new BedOfNailsDeed();
private InternalTimer m_Timer;
[Constructible]
public BedOfNailsAddon()
: base()
{
Direction = Direction.South;
@ -163,12 +162,11 @@ namespace Server.Items
public class BedOfNailsDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new BedOfNailsAddon(); } }
public override int LabelNumber { get { return 1074801; } } // Bed of Nails
public override BaseAddon Addon => new BedOfNailsAddon();
public override int LabelNumber => 1074801; // Bed of Nails
[Constructible]
public BedOfNailsDeed()
: base()
{
LootType = LootType.Blessed;
}
@ -192,4 +190,4 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
}
}
}
}

12
Scripts/Items/Special/Evil Home Decor Collection/BoneCouch.cs
View file

@ -4,7 +4,7 @@ namespace Server.Items
{
public class BoneCouchComponent : AddonComponent
{
public override int LabelNumber { get { return 1074477; } } // Bone couch
public override int LabelNumber => 1074477; // Bone couch
public BoneCouchComponent( int itemID ) : base( itemID )
{
@ -42,10 +42,10 @@ namespace Server.Items
[FlippableAddon( Direction.South, Direction.East )]
public class BoneCouchAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new BoneCouchDeed(); } }
public override BaseAddonDeed Deed => new BoneCouchDeed();
[Constructible]
public BoneCouchAddon() : base()
public BoneCouchAddon()
{
Direction = Direction.South;
@ -89,11 +89,11 @@ namespace Server.Items
public class BoneCouchDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new BoneCouchAddon(); } }
public override int LabelNumber { get { return 1074477; } } // Bone couch
public override BaseAddon Addon => new BoneCouchAddon();
public override int LabelNumber => 1074477; // Bone couch
[Constructible]
public BoneCouchDeed() : base()
public BoneCouchDeed()
{
LootType = LootType.Blessed;
}

10
Scripts/Items/Special/Evil Home Decor Collection/BoneTable.cs
View file

@ -4,10 +4,10 @@ namespace Server.Items
{
public class BoneTableAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new BoneTableDeed(); } }
public override BaseAddonDeed Deed => new BoneTableDeed();
[Constructible]
public BoneTableAddon() : base()
public BoneTableAddon()
{
AddComponent( new LocalizedAddonComponent( 0x2A5C, 1074478 ), 0, 0, 0 );
}
@ -33,11 +33,11 @@ namespace Server.Items
public class BoneTableDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new BoneTableAddon(); } }
public override int LabelNumber { get { return 1074478; } } // Bone table
public override BaseAddon Addon => new BoneTableAddon();
public override int LabelNumber => 1074478; // Bone table
[Constructible]
public BoneTableDeed() : base()
public BoneTableDeed()
{
LootType = LootType.Blessed;
}

12
Scripts/Items/Special/Evil Home Decor Collection/BoneThrone.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
[Flippable( 0x2A58, 0x2A59 )]
public class BoneThroneComponent : AddonComponent
{
public override int LabelNumber { get { return 1074476; } } // Bone throne
public override int LabelNumber => 1074476; // Bone throne
public BoneThroneComponent() : base( 0x2A58 )
{
@ -42,10 +42,10 @@ namespace Server.Items
public class BoneThroneAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new BoneThroneDeed(); } }
public override BaseAddonDeed Deed => new BoneThroneDeed();
[Constructible]
public BoneThroneAddon() : base()
public BoneThroneAddon()
{
AddComponent( new BoneThroneComponent(), 0, 0, 0 );
}
@ -71,11 +71,11 @@ namespace Server.Items
public class BoneThroneDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new BoneThroneAddon(); } }
public override int LabelNumber { get { return 1074476; } } // Bone throne
public override BaseAddon Addon => new BoneThroneAddon();
public override int LabelNumber => 1074476; // Bone throne
[Constructible]
public BoneThroneDeed() : base()
public BoneThroneDeed()
{
LootType = LootType.Blessed;
}

12
Scripts/Items/Special/Evil Home Decor Collection/CreepyPortrait.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x2A69, 0x2A6D )]
public class CreepyPortraitComponent : AddonComponent
{
public override int LabelNumber { get { return 1074481; } } // Creepy portrait
public override int LabelNumber => 1074481; // Creepy portrait
public override bool HandlesOnMovement => true;
public CreepyPortraitComponent() : base( 0x2A69 )
@ -79,10 +79,10 @@ namespace Server.Items
public class CreepyPortraitAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new CreepyPortraitDeed(); } }
public override BaseAddonDeed Deed => new CreepyPortraitDeed();
[Constructible]
public CreepyPortraitAddon() : base()
public CreepyPortraitAddon()
{
AddComponent( new CreepyPortraitComponent(), 0, 0, 0 );
}
@ -108,11 +108,11 @@ namespace Server.Items
public class CreepyPortraitDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new CreepyPortraitAddon(); } }
public override int LabelNumber { get { return 1074481; } } // Creepy portrait
public override BaseAddon Addon => new CreepyPortraitAddon();
public override int LabelNumber => 1074481; // Creepy portrait
[Constructible]
public CreepyPortraitDeed() : base()
public CreepyPortraitDeed()
{
LootType = LootType.Blessed;
}

12
Scripts/Items/Special/Evil Home Decor Collection/DisturbingPortrait.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x2A5D, 0x2A61 )]
public class DisturbingPortraitComponent : AddonComponent
{
public override int LabelNumber { get { return 1074479; } } // Disturbing portrait
public override int LabelNumber => 1074479; // Disturbing portrait
private Timer m_Timer;
@ -63,10 +63,10 @@ namespace Server.Items
public class DisturbingPortraitAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new DisturbingPortraitDeed(); } }
public override BaseAddonDeed Deed => new DisturbingPortraitDeed();
[Constructible]
public DisturbingPortraitAddon() : base()
public DisturbingPortraitAddon()
{
AddComponent( new DisturbingPortraitComponent(), 0, 0, 0 );
}
@ -92,11 +92,11 @@ namespace Server.Items
public class DisturbingPortraitDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new DisturbingPortraitAddon(); } }
public override int LabelNumber { get { return 1074479; } } // Disturbing portrait
public override BaseAddon Addon => new DisturbingPortraitAddon();
public override int LabelNumber => 1074479; // Disturbing portrait
[Constructible]
public DisturbingPortraitDeed() : base()
public DisturbingPortraitDeed()
{
LootType = LootType.Blessed;
}

12
Scripts/Items/Special/Evil Home Decor Collection/HauntedMirror.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
[Flippable( 0x2A7B, 0x2A7D )]
public class HaunterMirrorComponent : AddonComponent
{
public override int LabelNumber { get { return 1074800; } } // Haunted Mirror
public override int LabelNumber => 1074800; // Haunted Mirror
public override bool HandlesOnMovement => true;
public HaunterMirrorComponent() : base( 0x2A7B )
@ -55,10 +55,10 @@ namespace Server.Items
public class HaunterMirrorAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new HaunterMirrorDeed(); } }
public override BaseAddonDeed Deed => new HaunterMirrorDeed();
[Constructible]
public HaunterMirrorAddon() : base()
public HaunterMirrorAddon()
{
AddComponent( new HaunterMirrorComponent(), 0, 0, 0 );
}
@ -84,11 +84,11 @@ namespace Server.Items
public class HaunterMirrorDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new HaunterMirrorAddon(); } }
public override int LabelNumber { get { return 1074800; } } // Haunted Mirror
public override BaseAddon Addon => new HaunterMirrorAddon();
public override int LabelNumber => 1074800; // Haunted Mirror
[Constructible]
public HaunterMirrorDeed() : base()
public HaunterMirrorDeed()
{
LootType = LootType.Blessed;
}

12
Scripts/Items/Special/Evil Home Decor Collection/MountedPixieBlue.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x2A75, 0x2A76 )]
public class MountedPixieBlueComponent : AddonComponent
{
public override int LabelNumber { get { return 1074482; } } // Mounted pixie
public override int LabelNumber => 1074482; // Mounted pixie
public MountedPixieBlueComponent() : base( 0x2A75 )
{
@ -42,9 +42,9 @@ namespace Server.Items
public class MountedPixieBlueAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new MountedPixieBlueDeed(); } }
public override BaseAddonDeed Deed => new MountedPixieBlueDeed();
public MountedPixieBlueAddon() : base()
public MountedPixieBlueAddon()
{
AddComponent( new MountedPixieBlueComponent(), 0, 0, 0 );
}
@ -70,11 +70,11 @@ namespace Server.Items
public class MountedPixieBlueDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new MountedPixieBlueAddon(); } }
public override int LabelNumber { get { return 1074482; } } // Mounted pixie
public override BaseAddon Addon => new MountedPixieBlueAddon();
public override int LabelNumber => 1074482; // Mounted pixie
[Constructible]
public MountedPixieBlueDeed() : base()
public MountedPixieBlueDeed()
{
LootType = LootType.Blessed;
}

12
Scripts/Items/Special/Evil Home Decor Collection/MountedPixieGreen.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x2A71, 0x2A72 )]
public class MountedPixieGreenComponent : AddonComponent
{
public override int LabelNumber { get { return 1074482; } } // Mounted pixie
public override int LabelNumber => 1074482; // Mounted pixie
public MountedPixieGreenComponent() : base( 0x2A71 )
{
@ -42,9 +42,9 @@ namespace Server.Items
public class MountedPixieGreenAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new MountedPixieGreenDeed(); } }
public override BaseAddonDeed Deed => new MountedPixieGreenDeed();
public MountedPixieGreenAddon() : base()
public MountedPixieGreenAddon()
{
AddComponent( new MountedPixieGreenComponent(), 0, 0, 0 );
}
@ -70,11 +70,11 @@ namespace Server.Items
public class MountedPixieGreenDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new MountedPixieGreenAddon(); } }
public override int LabelNumber { get { return 1074482; } } // Mounted pixie
public override BaseAddon Addon => new MountedPixieGreenAddon();
public override int LabelNumber => 1074482; // Mounted pixie
[Constructible]
public MountedPixieGreenDeed() : base()
public MountedPixieGreenDeed()
{
LootType = LootType.Blessed;
}

12
Scripts/Items/Special/Evil Home Decor Collection/MountedPixieLime.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x2A77, 0x2A78 )]
public class MountedPixieLimeComponent : AddonComponent
{
public override int LabelNumber { get { return 1074482; } } // Mounted pixie
public override int LabelNumber => 1074482; // Mounted pixie
public MountedPixieLimeComponent() : base( 0x2A77 )
{
@ -42,9 +42,9 @@ namespace Server.Items
public class MountedPixieLimeAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new MountedPixieLimeDeed(); } }
public override BaseAddonDeed Deed => new MountedPixieLimeDeed();
public MountedPixieLimeAddon() : base()
public MountedPixieLimeAddon()
{
AddComponent( new MountedPixieLimeComponent(), 0, 0, 0 );
}
@ -70,11 +70,11 @@ namespace Server.Items
public class MountedPixieLimeDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new MountedPixieLimeAddon(); } }
public override int LabelNumber { get { return 1074482; } } // Mounted pixie
public override BaseAddon Addon => new MountedPixieLimeAddon();
public override int LabelNumber => 1074482; // Mounted pixie
[Constructible]
public MountedPixieLimeDeed() : base()
public MountedPixieLimeDeed()
{
LootType = LootType.Blessed;
}

12
Scripts/Items/Special/Evil Home Decor Collection/MountedPixieOrange.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x2A73, 0x2A74 )]
public class MountedPixieOrangeComponent : AddonComponent
{
public override int LabelNumber { get { return 1074482; } } // Mounted pixie
public override int LabelNumber => 1074482; // Mounted pixie
public MountedPixieOrangeComponent() : base( 0x2A73 )
{
@ -42,9 +42,9 @@ namespace Server.Items
public class MountedPixieOrangeAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new MountedPixieOrangeDeed(); } }
public override BaseAddonDeed Deed => new MountedPixieOrangeDeed();
public MountedPixieOrangeAddon() : base()
public MountedPixieOrangeAddon()
{
AddComponent( new MountedPixieOrangeComponent(), 0, 0, 0 );
}
@ -70,11 +70,11 @@ namespace Server.Items
public class MountedPixieOrangeDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new MountedPixieOrangeAddon(); } }
public override int LabelNumber { get { return 1074482; } } // Mounted pixie
public override BaseAddon Addon => new MountedPixieOrangeAddon();
public override int LabelNumber => 1074482; // Mounted pixie
[Constructible]
public MountedPixieOrangeDeed() : base()
public MountedPixieOrangeDeed()
{
LootType = LootType.Blessed;
}

12
Scripts/Items/Special/Evil Home Decor Collection/MountedPixieWhite.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x2A79, 0x2A7A )]
public class MountedPixieWhiteComponent : AddonComponent
{
public override int LabelNumber { get { return 1074482; } } // Mounted pixie
public override int LabelNumber => 1074482; // Mounted pixie
public MountedPixieWhiteComponent() : base( 0x2A79 )
{
@ -42,9 +42,9 @@ namespace Server.Items
public class MountedPixieWhiteAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new MountedPixieWhiteDeed(); } }
public override BaseAddonDeed Deed => new MountedPixieWhiteDeed();
public MountedPixieWhiteAddon() : base()
public MountedPixieWhiteAddon()
{
AddComponent( new MountedPixieWhiteComponent(), 0, 0, 0 );
}
@ -70,11 +70,11 @@ namespace Server.Items
public class MountedPixieWhiteDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new MountedPixieWhiteAddon(); } }
public override int LabelNumber { get { return 1074482; } } // Mounted pixie
public override BaseAddon Addon => new MountedPixieWhiteAddon();
public override int LabelNumber => 1074482; // Mounted pixie
[Constructible]
public MountedPixieWhiteDeed() : base()
public MountedPixieWhiteDeed()
{
LootType = LootType.Blessed;
}

16
Scripts/Items/Special/Evil Home Decor Collection/SacrificialAltar.cs
View file

@ -5,11 +5,11 @@ namespace Server.Items
[FlippableAddon( Direction.South, Direction.East )]
public class SacrificialAltarAddon : BaseAddonContainer
{
public override BaseAddonContainerDeed Deed { get { return new SacrificialAltarDeed(); } }
public override int LabelNumber { get { return 1074818; } } // Sacrificial Altar
public override int DefaultMaxWeight { get { return 0; } }
public override int DefaultGumpID { get { return 0x107; } }
public override int DefaultDropSound { get { return 0x42; } }
public override BaseAddonContainerDeed Deed => new SacrificialAltarDeed();
public override int LabelNumber => 1074818; // Sacrificial Altar
public override int DefaultMaxWeight => 0;
public override int DefaultGumpID => 0x107;
public override int DefaultDropSound => 0x42;
private Timer m_Timer;
@ -134,11 +134,11 @@ namespace Server.Items
public class SacrificialAltarDeed : BaseAddonContainerDeed
{
public override BaseAddonContainer Addon { get { return new SacrificialAltarAddon(); } }
public override int LabelNumber { get { return 1074818; } } // Sacrificial Altar
public override BaseAddonContainer Addon => new SacrificialAltarAddon();
public override int LabelNumber => 1074818; // Sacrificial Altar
[Constructible]
public SacrificialAltarDeed() : base()
public SacrificialAltarDeed()
{
LootType = LootType.Blessed;
}

12
Scripts/Items/Special/Evil Home Decor Collection/UnsettlingPortrait.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x2A65, 0x2A67 )]
public class UnsettlingPortraitComponent : AddonComponent
{
public override int LabelNumber { get { return 1074480; } } // Unsettling portrait
public override int LabelNumber => 1074480; // Unsettling portrait
private Timer m_Timer;
@ -67,10 +67,10 @@ namespace Server.Items
public class UnsettlingPortraitAddon : BaseAddon
{
public override BaseAddonDeed Deed { get { return new UnsettlingPortraitDeed(); } }
public override BaseAddonDeed Deed => new UnsettlingPortraitDeed();
[Constructible]
public UnsettlingPortraitAddon() : base()
public UnsettlingPortraitAddon()
{
AddComponent( new UnsettlingPortraitComponent(), 0, 0, 0 );
}
@ -96,11 +96,11 @@ namespace Server.Items
public class UnsettlingPortraitDeed : BaseAddonDeed
{
public override BaseAddon Addon { get { return new UnsettlingPortraitAddon(); } }
public override int LabelNumber { get { return 1074480; } } // Unsettling portrait
public override BaseAddon Addon => new UnsettlingPortraitAddon();
public override int LabelNumber => 1074480; // Unsettling portrait
[Constructible]
public UnsettlingPortraitDeed() : base()
public UnsettlingPortraitDeed()
{
LootType = LootType.Blessed;
}