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

2
Scripts/Items/Misc/AcidSlime.cs
View file

@ -21,7 +21,7 @@ namespace Server.Items
{
}
public override string DefaultName { get { return "slime"; } }
public override string DefaultName => "slime";
[Constructible]
public AcidSlime( TimeSpan duration, int minDamage, int maxDamage )

2
Scripts/Items/Misc/BankCheck.cs
View file

@ -64,7 +64,7 @@ namespace Server.Items
public override bool DisplayLootType => Core.AOS;
public override int LabelNumber{ get{ return 1041361; } } // A bank check
public override int LabelNumber => 1041361; // A bank check
public override void GetProperties( ObjectPropertyList list )
{

2
Scripts/Items/Misc/Bedlam/GlobOfMonstreousInterredGrizzle.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class GlobOfMonstreousInterredGrizzle : Item
{
public override int LabelNumber{ get{ return 1072117; } } // Glob of Monsterous Interred Grizzle
public override int LabelNumber => 1072117; // Glob of Monsterous Interred Grizzle
[Constructible]
public GlobOfMonstreousInterredGrizzle() : base( 0x2F3 )

2
Scripts/Items/Misc/Bedlam/GrizzledSkullCollection.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class GrizzledSkullCollection : Item
{
public override int LabelNumber{ get{ return 1072116; } } // Grizzled Skull collection
public override int LabelNumber => 1072116; // Grizzled Skull collection
[Constructible]
public GrizzledSkullCollection() : base( 0x21FC )

2
Scripts/Items/Misc/Bedlam/MonsterousInterredGrizzleMaggots.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class MonsterousInterredGrizzleMaggots : Item
{
public override int LabelNumber{ get{ return 1075090; } } // Monsterous Interred Grizzle Maggots
public override int LabelNumber => 1075090; // Monsterous Interred Grizzle Maggots
[Constructible]
public MonsterousInterredGrizzleMaggots() : base( 0x2633 )

2
Scripts/Items/Misc/Bedlam/ResolvesBridle.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class ResolvesBridle : Item
{
public override int LabelNumber{ get{ return 1074761; } } // Resolve's Bridle
public override int LabelNumber => 1074761; // Resolve's Bridle
[Constructible]
public ResolvesBridle() : base( 0x1374 )

2
Scripts/Items/Misc/Bedlam/TombstoneOfTheDamned.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class TombstoneOfTheDamned : Item
{
public override int LabelNumber{ get{ return 1072123; } } // Tombstone of the Damned
public override int LabelNumber => 1072123; // Tombstone of the Damned
[Constructible]
public TombstoneOfTheDamned() : base( Utility.RandomMinMax( 0xED7, 0xEDE ) )

2
Scripts/Items/Misc/Blighted Grove/AbscessTail.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class AbscessTail : Item
{
public override int LabelNumber{ get{ return 1074231; } } // Abscess' Tail
public override int LabelNumber => 1074231; // Abscess' Tail
[Constructible]
public AbscessTail() : base( 0x1A9D )

2
Scripts/Items/Misc/Blighted Grove/CoilsFang.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class CoilsFang : Item
{
public override int LabelNumber{ get{ return 1074229; } } // Coil's Fang
public override int LabelNumber => 1074229; // Coil's Fang
[Constructible]
public CoilsFang() : base( 0x10E8 )

2
Scripts/Items/Misc/Blighted Grove/EternallyCorruptTree.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class EternallyCorruptTree : Item
{
public override int LabelNumber{ get{ return 1072093; } } // Eternally Corrupt Tree
public override int LabelNumber => 1072093; // Eternally Corrupt Tree
[Constructible]
public EternallyCorruptTree() : base( 0x20FA )

2
Scripts/Items/Misc/Blighted Grove/HydraScale.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class HydraScale : Item
{
public override int LabelNumber{ get{ return 1074760; } } // A hydra scale.
public override int LabelNumber => 1074760; // A hydra scale.
[Constructible]
public HydraScale() : base( 0x26B4 )

2
Scripts/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class MelisandesFermentedWine : GreaterExplosionPotion
{
public override int LabelNumber{ get{ return 1072114; } } // Melisande's Fermented Wine
public override int LabelNumber => 1072114; // Melisande's Fermented Wine
[Constructible]
public MelisandesFermentedWine()

8
Scripts/Items/Misc/Blighted Grove/MelisandesHairDye.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class MelisandesHairDye : Item
{
public override int LabelNumber{ get{ return 1041088; } } // Hair Dye
public override int LabelNumber => 1041088; // Hair Dye
[Constructible]
public MelisandesHairDye() : base( 0xEFF )
@ -52,12 +52,12 @@ namespace Server.Items
private class ConfirmGump : BaseConfirmGump
{
public override int TitleNumber{ get{ return 1074395; } } // <div align=right>Use Permanent Hair Dye</div>
public override int LabelNumber{ get{ return 1074396; } } // This special hair dye is made of a unique mixture of leaves, permanently changing one's hair color until another dye is used.
public override int TitleNumber => 1074395; // <div align=right>Use Permanent Hair Dye</div>
public override int LabelNumber => 1074396; // This special hair dye is made of a unique mixture of leaves, permanently changing one's hair color until another dye is used.
private Item m_Item;
public ConfirmGump( Item item ) : base()
public ConfirmGump( Item item )
{
m_Item = item;
}

2
Scripts/Items/Misc/Blighted Grove/SalivasFeather.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class SalivasFeather : Item
{
public override int LabelNumber{ get{ return 1074234; } } // Saliva's Feather
public override int LabelNumber => 1074234; // Saliva's Feather
[Constructible]
public SalivasFeather() : base( 0x1020 )

2
Scripts/Items/Misc/Blighted Grove/SamplesOfCorruptedWater.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class SamplesOfCorruptedWater : Item
{
public override int LabelNumber{ get{ return 1074999; } } // samples of corrupted water
public override int LabelNumber => 1074999; // samples of corrupted water
[Constructible]
public SamplesOfCorruptedWater() : base( 0xEFE )

2
Scripts/Items/Misc/Blighted Grove/TaintedSeeds.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class TaintedSeeds : Item
{
public override int LabelNumber{ get{ return 1074233; } } // Tainted Seeds
public override int LabelNumber => 1074233; // Tainted Seeds
[Constructible]
public TaintedSeeds() : base( 0xDFA )

2
Scripts/Items/Misc/Blighted Grove/ThorvaldsMedallion.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class ThorvaldsMedallion : Item
{
public override int LabelNumber{ get{ return 1074232; } } // Thorvald's Medallion
public override int LabelNumber => 1074232; // Thorvald's Medallion
[Constructible]
public ThorvaldsMedallion() : base( 0x2AAA )

2
Scripts/Items/Misc/Blighted Grove/ThrashersTail.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class ThrashersTail : Item
{
public override int LabelNumber{ get{ return 1074230; } } // Thrasher's Tail
public override int LabelNumber => 1074230; // Thrasher's Tail
[Constructible]
public ThrashersTail() : base( 0x1A9D )

4
Scripts/Items/Misc/Blocker.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class Blocker : Item
{
public override int LabelNumber{ get{ return 503057; } } // Impassable!
public override int LabelNumber => 503057; // Impassable!
[Constructible]
public Blocker() : base( 0x21A4 )
@ -103,4 +103,4 @@ namespace Server.Items
}
}
}
}
}

6
Scripts/Items/Misc/CommunicationCrystals.cs
View file

@ -49,7 +49,7 @@ namespace Server.Items
{
public static readonly int MaxCharges = 2000;
public override int LabelNumber{ get{ return 1060740; } } // communication crystal
public override int LabelNumber => 1060740; // communication crystal
private int m_Charges;
private List<ReceiverCrystal> m_Receivers;
@ -303,7 +303,7 @@ namespace Server.Items
public class ReceiverCrystal : Item
{
public override int LabelNumber{ get{ return 1060740; } } // communication crystal
public override int LabelNumber => 1060740; // communication crystal
private BroadcastCrystal m_Sender;
@ -481,4 +481,4 @@ namespace Server.Items
m_Sender = reader.ReadItem<BroadcastCrystal>();
}
}
}
}

8
Scripts/Items/Misc/Corpses/Corpse.cs
View file

@ -148,9 +148,7 @@ namespace Server.Items
if ( m_InstancedItems != null )
{
InstancedItemInfo info;
if ( m_InstancedItems.TryGetValue( child, out info ) && (InstancedCorpse || info.Perpetual) )
if ( m_InstancedItems.TryGetValue( child, out InstancedItemInfo info ) && (InstancedCorpse || info.Perpetual) )
{
return info.IsOwner( m ); //IsOwner checks Party stuff.
}
@ -267,8 +265,8 @@ namespace Server.Items
public override bool DisplayWeight => false;
public HairInfo Hair { get { return m_Hair; } }
public FacialHairInfo FacialHair { get { return m_FacialHair; } }
public HairInfo Hair => m_Hair;
public FacialHairInfo FacialHair => m_FacialHair;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsBones

6
Scripts/Items/Misc/DeceitBrazier.cs
View file

@ -68,7 +68,7 @@ namespace Server.Items
#endregion
};
public static Type[] Creatures { get { return m_Creatures; } }
public static Type[] Creatures => m_Creatures;
private Timer m_Timer;
private DateTime m_NextSpawn;
@ -76,7 +76,7 @@ namespace Server.Items
private TimeSpan m_NextSpawnDelay;
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NextSpawn { get { return m_NextSpawn; } }
public DateTime NextSpawn => m_NextSpawn;
[CommandProperty( AccessLevel.GameMaster )]
public int SpawnRange { get { return m_SpawnRange; } set { m_SpawnRange = value; } }
@ -84,7 +84,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan NextSpawnDelay { get { return m_NextSpawnDelay; } set { m_NextSpawnDelay = value; } }
public override int LabelNumber { get { return 1023633; } } // Brazier
public override int LabelNumber => 1023633; // Brazier
[Constructible]
public DeceitBrazier() : base( 0xE31 )

10
Scripts/Items/Misc/HairDye.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
{
public class HairDye : Item
{
public override int LabelNumber{ get{ return 1041060; } } // Hair Dye
public override int LabelNumber => 1041060; // Hair Dye
[Constructible]
public HairDye() : base( 0xEFF )
@ -18,7 +18,7 @@ namespace Server.Items
public HairDye( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
@ -43,7 +43,7 @@ namespace Server.Items
else
{
from.LocalOverheadMessage( MessageType.Regular, 906, 1019045 ); // I can't reach that.
}
}
}
}
@ -147,7 +147,7 @@ namespace Server.Items
Mobile m = from.Mobile;
int[] switches = info.Switches;
if ( !m_HairDye.IsChildOf( m.Backpack ) )
if ( !m_HairDye.IsChildOf( m.Backpack ) )
{
m.SendLocalizedMessage( 1042010 ); //You must have the objectin your backpack to use it.
return;
@ -190,4 +190,4 @@ namespace Server.Items
}
}
}
}
}

2
Scripts/Items/Misc/HoveringWisp.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class HoveringWisp : Item
{
public override int LabelNumber{ get{ return 1072881; } } // hovering wisp
public override int LabelNumber => 1072881; // hovering wisp
[Constructible]
public HoveringWisp() : base( 0x2100 )

12
Scripts/Items/Misc/InteriorDecorator.cs
View file

@ -30,7 +30,7 @@ namespace Server.Items
LootType = LootType.Blessed;
}
public override int LabelNumber{ get{ return 1041280; } } // an interior decorator
public override int LabelNumber => 1041280; // an interior decorator
public InteriorDecorator( Serial serial ) : base( serial )
{
@ -62,7 +62,7 @@ namespace Server.Items
{
if ( !CheckUse( this, from ) )
return;
if ( from.FindGump( typeof( InteriorDecorator.InternalGump ) ) == null )
from.SendGump( new InternalGump( this ) );
@ -154,7 +154,7 @@ namespace Server.Items
{
BaseHouse house = BaseHouse.FindHouseAt( from );
Item item = (Item)targeted;
bool isDecorableComponent = false;
if ( item is AddonComponent || item is AddonContainerComponent || item is BaseAddonContainer )
@ -228,10 +228,10 @@ namespace Server.Items
}
}
}
from.Target = new InternalTarget( m_Decorator );
}
protected override void OnTargetCancel( Mobile from, TargetCancelType cancelType )
{
if ( cancelType == TargetCancelType.Canceled )
@ -314,4 +314,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Misc/KeyRing.cs
View file

@ -12,7 +12,7 @@ namespace Server.Items
private List<Key> m_Keys;
public List<Key> Keys { get { return m_Keys; } }
public List<Key> Keys => m_Keys;
[Constructible]
public KeyRing() : base( 0x1011 )
@ -204,4 +204,4 @@ namespace Server.Items
m_Keys = reader.ReadStrongItemList<Key>();
}
}
}
}

4
Scripts/Items/Misc/Labyrinth/MinotaurArtifact.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class MinotaurArtifact : Item
{
public override int LabelNumber{ get{ return 1074826; } } // Minotaur Artifact
public override double DefaultWeight{ get{ return 5.0; } }
public override int LabelNumber => 1074826; // Minotaur Artifact
public override double DefaultWeight => 5.0;
[Constructible]
public MinotaurArtifact() : base( Utility.RandomList( 0xB46, 0xB48, 0x9ED ) )

4
Scripts/Items/Misc/Moonstone.cs
View file

@ -28,7 +28,7 @@ namespace Server.Items
}
}
public override int LabelNumber{ get{ return 1041490 + (int)m_Type; } }
public override int LabelNumber => 1041490 + (int)m_Type;
[Constructible]
public Moonstone( MoonstoneType type ) : base( 0xF8B )
@ -200,4 +200,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Misc/OilCloth.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
{
public class OilCloth : Item, IScissorable, IDyable
{
public override int LabelNumber{ get{ return 1041498; } } // oil cloth
public override int LabelNumber => 1041498; // oil cloth
public override double DefaultWeight
{
@ -151,4 +151,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

26
Scripts/Items/Misc/Origami.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class OrigamiPaper : Item
{
public override int LabelNumber{ get{ return 1030288; } } // origami paper
public override int LabelNumber => 1030288; // origami paper
[Constructible]
public OrigamiPaper() : base( 0x2830 )
@ -63,7 +63,7 @@ namespace Server.Items
public class OrigamiButterfly : Item
{
public override int LabelNumber{ get{ return 1030296; } } // a delicate origami butterfly
public override int LabelNumber => 1030296; // a delicate origami butterfly
[Constructible]
public OrigamiButterfly() : base( 0x2838 )
@ -92,14 +92,14 @@ namespace Server.Items
public class OrigamiSwan : Item
{
public override int LabelNumber{ get{ return 1030297; } } // a delicate origami swan
public override int LabelNumber => 1030297; // a delicate origami swan
[Constructible]
public OrigamiSwan() : base( 0x2839 )
{
LootType = LootType.Blessed;
}
public OrigamiSwan( Serial serial ) : base( serial )
@ -123,14 +123,14 @@ namespace Server.Items
public class OrigamiFrog : Item
{
public override int LabelNumber{ get{ return 1030298; } } // a delicate origami frog
public override int LabelNumber => 1030298; // a delicate origami frog
[Constructible]
public OrigamiFrog() : base( 0x283A )
{
LootType = LootType.Blessed;
}
public OrigamiFrog( Serial serial ) : base( serial )
@ -154,14 +154,14 @@ namespace Server.Items
public class OrigamiShape : Item
{
public override int LabelNumber{ get{ return 1030299; } } // an intricate geometric origami shape
public override int LabelNumber => 1030299; // an intricate geometric origami shape
[Constructible]
public OrigamiShape() : base( 0x283B )
{
LootType = LootType.Blessed;
}
public OrigamiShape( Serial serial ) : base( serial )
@ -185,14 +185,14 @@ namespace Server.Items
public class OrigamiSongbird : Item
{
public override int LabelNumber{ get{ return 1030300; } } // a delicate origami songbird
public override int LabelNumber => 1030300; // a delicate origami songbird
[Constructible]
public OrigamiSongbird() : base( 0x283C )
{
LootType = LootType.Blessed;
}
public OrigamiSongbird( Serial serial ) : base( serial )
@ -216,14 +216,14 @@ namespace Server.Items
public class OrigamiFish : Item
{
public override int LabelNumber{ get{ return 1030301; } } // a delicate origami fish
public override int LabelNumber => 1030301; // a delicate origami fish
[Constructible]
public OrigamiFish() : base( 0x283D )
{
LootType = LootType.Blessed;
}
public OrigamiFish( Serial serial ) : base( serial )
@ -244,4 +244,4 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
}
}
}
}

2
Scripts/Items/Misc/Painted Caves/GrobusFur.cs
View file

@ -4,7 +4,7 @@ namespace Server.Items
{
public class GrobusFur : Item
{
public override int LabelNumber{ get{ return 1074676; } } // Grobu's Fur
public override int LabelNumber => 1074676; // Grobu's Fur
[Constructible]
public GrobusFur() : base( 0x11F4 )

2
Scripts/Items/Misc/Painted Caves/PrimitiveFetish.cs
View file

@ -4,7 +4,7 @@ namespace Server.Items
{
public class PrimitiveFetish : Item
{
public override int LabelNumber{ get{ return 1074675; } } // Primitive Fetish
public override int LabelNumber => 1074675; // Primitive Fetish
[Constructible]
public PrimitiveFetish() : base( 0x23F )

2
Scripts/Items/Misc/Palace of Paroxysmus/AcidProofRope.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class AcidProofRope : Item
{
public override int LabelNumber{ get{ return 1074886; } } // Acid Proof Rope
public override int LabelNumber => 1074886; // Acid Proof Rope
[Constructible]
public AcidProofRope() : base( 0x20D )

2
Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusCorrodedStein.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class ParoxysmusCorrodedStein : Item
{
public override int LabelNumber{ get{ return 1072083; } } // Paroxysmus' Corroded Stein
public override int LabelNumber => 1072083; // Paroxysmus' Corroded Stein
[Constructible]
public ParoxysmusCorrodedStein() : base( 0x9D6 )

2
Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusDinner.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class ParoxysmusDinner : Item
{
public override int LabelNumber{ get{ return 1072086; } } // Paroxysmus' Dinner
public override int LabelNumber => 1072086; // Paroxysmus' Dinner
[Constructible]
public ParoxysmusDinner() : base( 0x1E95 )

2
Scripts/Items/Misc/Palace of Paroxysmus/StringOfPartsOfParoxysmusVictims.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class StringOfPartsOfParoxysmusVictims : Item
{
public override int LabelNumber{ get{ return 1072082; } } // String of Parts of Paroxysmus' Victims
public override int LabelNumber => 1072082; // String of Parts of Paroxysmus' Victims
[Constructible]
public StringOfPartsOfParoxysmusVictims() : base( 0xFD2 )

2
Scripts/Items/Misc/Palace of Paroxysmus/SweatOfParoxysmus.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class SweatOfParoxysmus : Item
{
public override int LabelNumber{ get{ return 1072081; } } // Sweat of Paroxysmus
public override int LabelNumber => 1072081; // Sweat of Paroxysmus
[Constructible]
public SweatOfParoxysmus() : base( 0xF01 )

6
Scripts/Items/Misc/PlayerBulletinBoards.cs
View file

@ -13,7 +13,7 @@ namespace Server.Items
{
public class PlayerBBSouth : BasePlayerBB
{
public override int LabelNumber{ get{ return 1062421; } } // bulletin board (south)
public override int LabelNumber => 1062421; // bulletin board (south)
[Constructible]
public PlayerBBSouth() : base( 0x2311 )
@ -42,7 +42,7 @@ namespace Server.Items
public class PlayerBBEast : BasePlayerBB
{
public override int LabelNumber{ get{ return 1062420; } } // bulletin board (east)
public override int LabelNumber => 1062420; // bulletin board (east)
[Constructible]
public PlayerBBEast() : base( 0x2312 )
@ -637,4 +637,4 @@ namespace Server.Items
}
}
}
}
}

8
Scripts/Items/Misc/PlayerVendorDeed.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
{
public class ContractOfEmployment : Item
{
public override int LabelNumber{ get{ return 1041243; } } // a contract of employment
public override int LabelNumber => 1041243; // a contract of employment
[Constructible]
public ContractOfEmployment() : base( 0x14F0 )
@ -59,7 +59,7 @@ namespace Server.Items
if ( house == null )
{
from.SendLocalizedMessage( 503240 ); // Vendors can only be placed in houses.
from.SendLocalizedMessage( 503240 ); // Vendors can only be placed in houses.
}
else if ( !BaseHouse.NewVendorSystem && !house.IsFriend( from ) )
{
@ -69,7 +69,7 @@ namespace Server.Items
{
from.SendLocalizedMessage( 1062423 ); // Only the house owner can directly place vendors. Please ask the house owner to offer you a vendor contract so that you may place a vendor in this house.
}
else if ( !house.Public || !house.CanPlaceNewVendor() )
else if ( !house.Public || !house.CanPlaceNewVendor() )
{
from.SendLocalizedMessage( 503241 ); // You cannot place this vendor or barkeep. Make sure the house is public and has sufficient storage available.
}
@ -101,4 +101,4 @@ namespace Server.Items
}
}
}
}
}

2
Scripts/Items/Misc/PoolOfAcid.cs
View file

@ -21,7 +21,7 @@ namespace Server.Items
{
}
public override string DefaultName { get { return "a pool of acid"; } }
public override string DefaultName => "a pool of acid";
[Constructible]
public PoolOfAcid( TimeSpan duration, int minDamage, int maxDamage )

2
Scripts/Items/Misc/Prism of Light/CrystallineFragments.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class CrystallineFragments : Item
{
public override int LabelNumber{ get{ return 1073160; } } // Crystalline Fragments
public override int LabelNumber => 1073160; // Crystalline Fragments
[Constructible]
public CrystallineFragments() : base( 0x223B )

2
Scripts/Items/Misc/Prism of Light/IcyHeart.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class IcyHeart : Item
{
public override int LabelNumber{ get{ return 1073162; } } // Icy Heart
public override int LabelNumber => 1073162; // Icy Heart
[Constructible]
public IcyHeart() : base( 0x24B )

2
Scripts/Items/Misc/Prism of Light/ProtectorsEssence.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class ProtectorsEssence : Item
{
public override int LabelNumber{ get{ return 1073159; } } // Protector's Essence
public override int LabelNumber => 1073159; // Protector's Essence
[Constructible]
public ProtectorsEssence() : base( 0x23F )

2
Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class ShimmeringCrystals : Item
{
public override int LabelNumber{ get{ return 1075095; } } // Shimmering Crystals
public override int LabelNumber => 1075095; // Shimmering Crystals
public override bool ForceShowProperties => true;
private static readonly int[] m_ItemIDs = new int[]

10
Scripts/Items/Misc/PromotionalToken.cs
View file

@ -71,7 +71,7 @@ namespace Server.Items
int version = reader.ReadInt();
}
public override int LabelNumber { get { return 1070997; } } // A promotional token
public override int LabelNumber => 1070997; // A promotional token
private class PromotionalTokenGump : Gump
@ -129,12 +129,12 @@ namespace Server.Items
return null;
}
public override TextDefinition ItemGumpName{ get{ return 1070999; } }// <center>Soulstone Fragment</center>
public override TextDefinition ItemName { get { return 1071000; } }//soulstone fragment
public override TextDefinition ItemReceiveMessage{ get{ return 1070976; } } // A soulstone fragment has been created in your bank box.
public override TextDefinition ItemGumpName => 1070999;// <center>Soulstone Fragment</center>
public override TextDefinition ItemName => 1071000;//soulstone fragment
public override TextDefinition ItemReceiveMessage => 1070976; // A soulstone fragment has been created in your bank box.
[Constructible]
public SoulstoneFragmentToken() : base()
public SoulstoneFragmentToken()
{
}

6
Scripts/Items/Misc/SpecialBeardDye.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
{
public class SpecialBeardDye : Item
{
public override int LabelNumber{ get{ return 1041087; } } // Special Beard Dye
public override int LabelNumber => 1041087; // Special Beard Dye
[Constructible]
public SpecialBeardDye() : base( 0xE26 )
@ -19,7 +19,7 @@ namespace Server.Items
public SpecialBeardDye( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
@ -183,4 +183,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Misc/Static.cs
View file

@ -54,7 +54,7 @@ namespace Server.Items
set{ m_LabelNumber = value; InvalidateProperties(); }
}
public override int LabelNumber{ get{ return m_LabelNumber; } }
public override int LabelNumber => m_LabelNumber;
[Constructible]
public LocalizedStatic( int itemID ) : this( itemID, itemID < 0x4000 ? 1020000 + itemID : 1078872 + itemID )
@ -95,4 +95,4 @@ namespace Server.Items
}
}
}
}
}

21
Scripts/Items/Misc/Teleporter.cs
View file

@ -88,7 +88,7 @@ namespace Server.Items
set { m_CriminalCheck = value; InvalidateProperties(); }
}
public override int LabelNumber { get { return 1026095; } } // teleporter
public override int LabelNumber => 1026095; // teleporter
[Constructible]
public Teleporter()
@ -557,9 +557,8 @@ namespace Server.Items
public static void EventSink_Logout(LogoutEventArgs e)
{
Mobile from = e.Mobile;
TeleportingInfo info;
if (from == null || !m_Table.TryGetValue(from, out info))
if (from == null || !m_Table.TryGetValue(from, out TeleportingInfo info))
return;
info.Timer.Stop();
@ -636,9 +635,7 @@ namespace Server.Items
public override void StartTeleport(Mobile m)
{
TeleportingInfo info;
if (m_Table.TryGetValue(m, out info))
if (m_Table.TryGetValue( m, out TeleportingInfo info ))
{
if (info.Teleporter == this)
{
@ -717,8 +714,8 @@ namespace Server.Items
private WaitTeleporter m_Teleporter;
private Timer m_Timer;
public WaitTeleporter Teleporter { get { return m_Teleporter; } }
public Timer Timer { get { return m_Timer; } }
public WaitTeleporter Teleporter => m_Teleporter;
public Timer Timer => m_Timer;
public TeleportingInfo(WaitTeleporter tele, Timer t)
{
@ -766,9 +763,7 @@ namespace Server.Items
private void StartTimer(Mobile m, TimeSpan delay)
{
Timer t;
if (m_Teleporting.TryGetValue(m, out t))
if (m_Teleporting.TryGetValue( m, out Timer t ))
t.Stop();
m_Teleporting[m] = Timer.DelayCall<Mobile>(delay, StartTeleport, m);
@ -776,9 +771,7 @@ namespace Server.Items
public void StopTimer(Mobile m)
{
Timer t;
if (m_Teleporting.TryGetValue(m, out t))
if (m_Teleporting.TryGetValue( m, out Timer t ))
{
t.Stop();
m_Teleporting.Remove(m);

2
Scripts/Items/Misc/The Citadel/DragonFlameSectBadge.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class DragonFlameSectBadge : Item
{
public override int LabelNumber{ get{ return 1073141; } } // A Dragon Flame Sect Badge
public override int LabelNumber => 1073141; // A Dragon Flame Sect Badge
[Constructible]
public DragonFlameSectBadge() : base( 0x23E )

2
Scripts/Items/Misc/The Citadel/OrdersFromMinax.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class OrdersFromMinax : Item
{
public override int LabelNumber{ get{ return 1074639; } } // Orders from Minax
public override int LabelNumber => 1074639; // Orders from Minax
[Constructible]
public OrdersFromMinax() : base( 0x2279 )

2
Scripts/Items/Misc/The Citadel/SerpentFangSectBadge.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class SerpentFangSectBadge : Item
{
public override int LabelNumber{ get{ return 1073139; } } // A Serpent Fang Sect Badge
public override int LabelNumber => 1073139; // A Serpent Fang Sect Badge
[Constructible]
public SerpentFangSectBadge() : base( 0x23C )

2
Scripts/Items/Misc/The Citadel/TigerClawSectBadge.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class TigerClawSectBadge : Item
{
public override int LabelNumber{ get{ return 1073140; } } // A Tiger Claw Sect Badge
public override int LabelNumber => 1073140; // A Tiger Claw Sect Badge
[Constructible]
public TigerClawSectBadge() : base( 0x23D )

2
Scripts/Items/Misc/The Citadel/TravestysCollectionOfShells.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class TravestysCollectionOfShells : Item
{
public override int LabelNumber{ get{ return 1072090; } } // Travesty's Collection of Shells
public override int LabelNumber => 1072090; // Travesty's Collection of Shells
[Constructible]
public TravestysCollectionOfShells() : base( 0xFD3 )

2
Scripts/Items/Misc/The Citadel/TravestysFineTeakwoodTray.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class TravestysFineTeakwoodTray : Item
{
public override int LabelNumber{ get{ return 1075094; } } // Travesty's Fine Teakwood Tray
public override int LabelNumber => 1075094; // Travesty's Fine Teakwood Tray
[Constructible]
public TravestysFineTeakwoodTray() : base( Utility.Random( 0x991, 2 ) )

2
Scripts/Items/Misc/The Citadel/TravestysSushiPreparations.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class TravestysSushiPreparations : Item
{
public override int LabelNumber{ get{ return 1075093; } } // Travesty's Sushi Preparations
public override int LabelNumber => 1075093; // Travesty's Sushi Preparations
[Constructible]
public TravestysSushiPreparations() : base( Utility.Random( 0x1E15, 2 ) )

6
Scripts/Items/Misc/TrashBarrel.cs
View file

@ -7,9 +7,9 @@ namespace Server.Items
{
public class TrashBarrel : Container, IChopable
{
public override int LabelNumber{ get{ return 1041064; } } // a trash barrel
public override int LabelNumber => 1041064; // a trash barrel
public override int DefaultMaxWeight{ get{ return 0; } } // A value of 0 signals unlimited weight
public override int DefaultMaxWeight => 0; // A value of 0 signals unlimited weight
public override bool IsDecoContainer
{
@ -148,4 +148,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Misc/TrashChest.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
[FlippableAttribute( 0xE41, 0xE40 )]
public class TrashChest : Container
{
public override int DefaultMaxWeight{ get{ return 0; } } // A value of 0 signals unlimited weight
public override int DefaultMaxWeight => 0; // A value of 0 signals unlimited weight
public override bool IsDecoContainer
{
@ -58,4 +58,4 @@ namespace Server.Items
return true;
}
}
}
}

6
Scripts/Items/Misc/TribalBerry.cs
View file

@ -4,7 +4,7 @@ namespace Server.Items
{
public class TribalBerry : Item
{
public override int LabelNumber{ get{ return 1040001; } } // tribal berry
public override int LabelNumber => 1040001; // tribal berry
[Constructible]
public TribalBerry() : this( 1 )
@ -24,7 +24,7 @@ namespace Server.Items
{
}
public override void Serialize( GenericWriter writer )
{
@ -43,4 +43,4 @@ namespace Server.Items
Hue = 6;
}
}
}
}

4
Scripts/Items/Misc/TribalPaint.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
{
public class TribalPaint : Item
{
public override int LabelNumber{ get{ return 1040000; } } // savage kin paint
public override int LabelNumber => 1040000; // savage kin paint
[Constructible]
public TribalPaint() : base( 0x9EC )
@ -82,4 +82,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Items/Misc/Twisted Weald/HornOfTheDreadhorn.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
[Flippable(0x315C, 0x315D)]
public class HornOfTheDreadhorn : Item
{
public override int LabelNumber{ get{ return 1072089; } } // Horn of the Dread
public override int LabelNumber => 1072089; // Horn of the Dread
[Constructible]
public HornOfTheDreadhorn() : base( 0x315C )

2
Scripts/Items/Misc/Twisted Weald/MangledHeadOfDreadhorn.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
[Flippable(0x3156, 0x3157)]
public class MangledHeadOfDreadhorn : Item
{
public override int LabelNumber{ get{ return 1072088; } } // The Mangled Head of Dread Horn
public override int LabelNumber => 1072088; // The Mangled Head of Dread Horn
[Constructible]
public MangledHeadOfDreadhorn() : base( 0x3156 )

2
Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs
View file

@ -4,7 +4,7 @@ namespace Server.Items
{
public class TaintedMushroom : Item
{
public override int LabelNumber{ get{ return 1075088; } } // Dread Horn Tainted Mushroom
public override int LabelNumber => 1075088; // Dread Horn Tainted Mushroom
public override bool ForceShowProperties => true;
[Constructible]

2
Scripts/Items/Misc/WarningItem.cs
View file

@ -92,7 +92,7 @@ namespace Server.Items
}
public virtual bool OnlyToTriggerer{ get{ return false; } }
public virtual int NeighborRange { get { return 5; } }
public virtual int NeighborRange => 5;
public virtual void Broadcast( Mobile triggerer )
{

4
Scripts/Items/Misc/WindChimes.cs
View file

@ -137,7 +137,7 @@ namespace Server.Items
public class WindChimes : BaseWindChimes
{
public override int LabelNumber{ get{ return 1030290; } }
public override int LabelNumber => 1030290;
[Constructible]
public WindChimes() : base( 0x2832 )
@ -163,7 +163,7 @@ namespace Server.Items
public class FancyWindChimes : BaseWindChimes
{
public override int LabelNumber{ get{ return 1030291; } }
public override int LabelNumber => 1030291;
[Constructible]
public FancyWindChimes() : base( 0x2833 )