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

18
Scripts/Items/Skill Items/Carpenter Items/TaxidermyKit.cs
View file

@ -9,7 +9,7 @@ namespace Server.Items
[FlippableAttribute( 0x1EBA, 0x1EBB )]
public class TaxidermyKit : Item
{
public override int LabelNumber{ get{ return 1041279; } } // a taxidermy kit
public override int LabelNumber => 1041279; // a taxidermy kit
[Constructible]
public TaxidermyKit() : base( 0x1EBA )
@ -78,10 +78,10 @@ namespace Server.Items
private int m_DeedNumber;
private int m_AddonNumber;
public Type CreatureType { get { return m_CreatureType; } }
public int NorthID { get { return m_NorthID; } }
public int DeedNumber { get { return m_DeedNumber; } }
public int AddonNumber { get { return m_AddonNumber; } }
public Type CreatureType => m_CreatureType;
public int NorthID => m_NorthID;
public int DeedNumber => m_DeedNumber;
public int AddonNumber => m_AddonNumber;
}
@ -174,7 +174,7 @@ namespace Server.Items
public class TrophyAddon : Item, IAddon
{
public override bool ForceShowProperties { get { return ObjectPropertyList.Enabled; } }
public override bool ForceShowProperties => ObjectPropertyList.Enabled;
private int m_WestID;
private int m_NorthID;
@ -202,7 +202,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int AnimalWeight{ get{ return m_AnimalWeight; } set{ m_AnimalWeight = value; InvalidateProperties(); } }
public override int LabelNumber{ get{ return m_AddonNumber; } }
public override int LabelNumber => m_AddonNumber;
[Constructible]
public TrophyAddon( Mobile from, int itemID, int westID, int northID, int deedNumber, int addonNumber ) : this( from, itemID, westID, northID, deedNumber, addonNumber, null, 0 )
@ -370,7 +370,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int AnimalWeight{ get{ return m_AnimalWeight; } set{ m_AnimalWeight = value; InvalidateProperties(); } }
public override int LabelNumber{ get{ return m_DeedNumber; } }
public override int LabelNumber => m_DeedNumber;
[Constructible]
public TrophyDeed( int westID, int northID, int deedNumber, int addonNumber ) : this( westID, northID, deedNumber, addonNumber, null, 0 )
@ -499,4 +499,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Skill Items/Fishing/Misc/MessageInABottle.cs
View file

@ -14,7 +14,7 @@ namespace Server.Items
return Utility.RandomMinMax( 1, 3 );
}
public override int LabelNumber{ get{ return 1041080; } } // a message in a bottle
public override int LabelNumber => 1041080; // a message in a bottle
private Map m_TargetMap;
private int m_Level;
@ -111,4 +111,4 @@ namespace Server.Items
}
}
}
}
}

6
Scripts/Items/Skill Items/Fishing/Misc/SpecialFishingNet.cs
View file

@ -9,7 +9,7 @@ namespace Server.Items
{
public class SpecialFishingNet : Item
{
public override int LabelNumber{ get{ return 1041079; } } // a special fishing net
public override int LabelNumber => 1041079; // a special fishing net
private bool m_InUse;
@ -364,7 +364,7 @@ namespace Server.Items
public class FabledFishingNet : SpecialFishingNet
{
public override int LabelNumber{ get{ return 1063451; } } // a fabled fishing net
public override int LabelNumber => 1063451; // a fabled fishing net
[Constructible]
public FabledFishingNet()
@ -406,4 +406,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

38
Scripts/Items/Skill Items/Harvest Tools/GargoylesPickaxe.cs
View file

@ -6,27 +6,27 @@ namespace Server.Items
{
public class GargoylesPickaxe : BaseAxe, IUsesRemaining
{
public override int LabelNumber{ get{ return 1041281; } } // a gargoyle's pickaxe
public override HarvestSystem HarvestSystem{ get{ return Mining.System; } }
public override int LabelNumber => 1041281; // a gargoyle's pickaxe
public override HarvestSystem HarvestSystem => Mining.System;
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
public override int AosStrengthReq{ get{ return 50; } }
public override int AosMinDamage{ get{ return 13; } }
public override int AosMaxDamage{ get{ return 15; } }
public override int AosSpeed{ get{ return 35; } }
public override float MlSpeed{ get{ return 3.00f; } }
public override int AosStrengthReq => 50;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 35;
public override float MlSpeed => 3.00f;
public override int OldStrengthReq{ get{ return 25; } }
public override int OldMinDamage{ get{ return 1; } }
public override int OldMaxDamage{ get{ return 15; } }
public override int OldSpeed{ get{ return 35; } }
public override int InitMinHits{ get{ return 31; } }
public override int InitMaxHits{ get{ return 60; } }
public override int OldStrengthReq => 25;
public override int OldMinDamage => 1;
public override int OldMaxDamage => 15;
public override int OldSpeed => 35;
public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash1H; } }
public override int InitMinHits => 31;
public override int InitMaxHits => 60;
public override WeaponAnimation DefAnimation => WeaponAnimation.Slash1H;
[Constructible]
public GargoylesPickaxe() : this( Utility.RandomMinMax( 101, 125 ))
@ -57,9 +57,9 @@ namespace Server.Items
base.Deserialize( reader );
int version = reader.ReadInt();
if ( Hue == 0x973 )
Hue = 0x0;
}
}
}
}

24
Scripts/Items/Skill Items/Harvest Tools/ProspectorsTool.cs
View file

@ -18,20 +18,20 @@ namespace Server.Items
public bool ShowUsesRemaining{ get{ return true; } set{} }
public override int LabelNumber{ get{ return 1049065; } } // prospector's tool
public override int LabelNumber => 1049065; // prospector's tool
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.CrushingBlow; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.ShadowStrike; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.CrushingBlow;
public override WeaponAbility SecondaryAbility => WeaponAbility.ShadowStrike;
public override int AosStrengthReq{ get{ return 40; } }
public override int AosMinDamage{ get{ return 13; } }
public override int AosMaxDamage{ get{ return 15; } }
public override int AosSpeed{ get{ return 33; } }
public override int AosStrengthReq => 40;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 33;
public override int OldStrengthReq{ get{ return 10; } }
public override int OldMinDamage{ get{ return 6; } }
public override int OldMaxDamage{ get{ return 8; } }
public override int OldSpeed{ get{ return 33; } }
public override int OldStrengthReq => 10;
public override int OldMinDamage => 6;
public override int OldMaxDamage => 8;
public override int OldSpeed => 33;
[Constructible]
public ProspectorsTool() : base( 0xFB4 )
@ -170,4 +170,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Skill Items/Harvest Tools/Shovel.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class Shovel : BaseHarvestTool
{
public override HarvestSystem HarvestSystem{ get{ return Mining.System; } }
public override HarvestSystem HarvestSystem => Mining.System;
[Constructible]
public Shovel() : this( 50 )
@ -37,4 +37,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

30
Scripts/Items/Skill Items/Harvest Tools/SturdyPickaxe.cs
View file

@ -6,24 +6,24 @@ namespace Server.Items
{
public class SturdyPickaxe : BaseAxe, IUsesRemaining
{
public override int LabelNumber{ get{ return 1045126; } } // sturdy pickaxe
public override HarvestSystem HarvestSystem{ get{ return Mining.System; } }
public override int LabelNumber => 1045126; // sturdy pickaxe
public override HarvestSystem HarvestSystem => Mining.System;
public override WeaponAbility PrimaryAbility{ get{ return WeaponAbility.DoubleStrike; } }
public override WeaponAbility SecondaryAbility{ get{ return WeaponAbility.Disarm; } }
public override WeaponAbility PrimaryAbility => WeaponAbility.DoubleStrike;
public override WeaponAbility SecondaryAbility => WeaponAbility.Disarm;
public override int AosStrengthReq{ get{ return 50; } }
public override int AosMinDamage{ get{ return 13; } }
public override int AosMaxDamage{ get{ return 15; } }
public override int AosSpeed{ get{ return 35; } }
public override float MlSpeed{ get{ return 3.00f; } }
public override int AosStrengthReq => 50;
public override int AosMinDamage => 13;
public override int AosMaxDamage => 15;
public override int AosSpeed => 35;
public override float MlSpeed => 3.00f;
public override int OldStrengthReq{ get{ return 25; } }
public override int OldMinDamage{ get{ return 1; } }
public override int OldMaxDamage{ get{ return 15; } }
public override int OldSpeed{ get{ return 35; } }
public override int OldStrengthReq => 25;
public override int OldMinDamage => 1;
public override int OldMaxDamage => 15;
public override int OldSpeed => 35;
public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash1H; } }
public override WeaponAnimation DefAnimation => WeaponAnimation.Slash1H;
[Constructible]
public SturdyPickaxe() : this( 180 )
@ -57,4 +57,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Harvest Tools/SturdyShovel.cs
View file

@ -6,8 +6,8 @@ namespace Server.Items
{
public class SturdyShovel : BaseHarvestTool
{
public override int LabelNumber{ get{ return 1045125; } } // sturdy shovel
public override HarvestSystem HarvestSystem{ get{ return Mining.System; } }
public override int LabelNumber => 1045125; // sturdy shovel
public override HarvestSystem HarvestSystem => Mining.System;
[Constructible]
public SturdyShovel() : this( 180 )
@ -39,4 +39,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Skill Items/Magical/BookOfBushido.cs
View file

@ -6,9 +6,9 @@ namespace Server.Items
{
public class BookOfBushido : Spellbook
{
public override SpellbookType SpellbookType{ get{ return SpellbookType.Samurai; } }
public override int BookOffset{ get{ return 400; } }
public override int BookCount{ get{ return 6; } }
public override SpellbookType SpellbookType => SpellbookType.Samurai;
public override int BookOffset => 400;
public override int BookCount => 6;
[Constructible]
public BookOfBushido() : this( (ulong)0x3F )
@ -42,4 +42,4 @@ namespace Server.Items
Layer = Layer.OneHanded;
}
}
}
}

8
Scripts/Items/Skill Items/Magical/BookOfChivalry.cs
View file

@ -6,9 +6,9 @@ namespace Server.Items
{
public class BookOfChivalry : Spellbook
{
public override SpellbookType SpellbookType{ get{ return SpellbookType.Paladin; } }
public override int BookOffset{ get{ return 200; } }
public override int BookCount{ get{ return 10; } }
public override SpellbookType SpellbookType => SpellbookType.Paladin;
public override int BookOffset => 200;
public override int BookCount => 10;
[Constructible]
public BookOfChivalry() : this( (ulong)0x3FF )
@ -42,4 +42,4 @@ namespace Server.Items
Layer = Layer.OneHanded;
}
}
}
}

8
Scripts/Items/Skill Items/Magical/BookOfNinjitsu.cs
View file

@ -6,9 +6,9 @@ namespace Server.Items
{
public class BookOfNinjitsu : Spellbook
{
public override SpellbookType SpellbookType{ get{ return SpellbookType.Ninja; } }
public override int BookOffset{ get{ return 500; } }
public override int BookCount{ get{ return 8; } }
public override SpellbookType SpellbookType => SpellbookType.Ninja;
public override int BookOffset => 500;
public override int BookCount => 8;
[Constructible]
@ -43,4 +43,4 @@ namespace Server.Items
Layer = Layer.OneHanded;
}
}
}
}

6
Scripts/Items/Skill Items/Magical/MysticSpellbook.cs
View file

@ -4,10 +4,10 @@ namespace Server.Items
{
public class MysticSpellbook : Spellbook
{
public override SpellbookType SpellbookType { get { return SpellbookType.Mystic; } }
public override SpellbookType SpellbookType => SpellbookType.Mystic;
public override int BookOffset { get { return 677; } }
public override int BookCount { get { return 16; } }
public override int BookOffset => 677;
public override int BookCount => 16;
[Constructible]
public MysticSpellbook()

8
Scripts/Items/Skill Items/Magical/NecromancerSpellbook.cs
View file

@ -6,9 +6,9 @@ namespace Server.Items
{
public class NecromancerSpellbook : Spellbook
{
public override SpellbookType SpellbookType{ get{ return SpellbookType.Necromancer; } }
public override int BookOffset{ get{ return 100; } }
public override int BookCount{ get{ return ((Core.SE) ? 17 : 16); } }
public override SpellbookType SpellbookType => SpellbookType.Necromancer;
public override int BookOffset => 100;
public override int BookCount => ((Core.SE) ? 17 : 16);
[Constructible]
public NecromancerSpellbook() : this( (ulong)0 )
@ -42,4 +42,4 @@ namespace Server.Items
Layer = Layer.OneHanded;
}
}
}
}

6
Scripts/Items/Skill Items/Magical/Potions/Agility Potions/AgilityPotion.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class AgilityPotion : BaseAgilityPotion
{
public override int DexOffset{ get{ return 10; } }
public override TimeSpan Duration{ get{ return TimeSpan.FromMinutes( 2.0 ); } }
public override int DexOffset => 10;
public override TimeSpan Duration => TimeSpan.FromMinutes( 2.0 );
[Constructible]
public AgilityPotion() : base( PotionEffect.Agility )
@ -31,4 +31,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Magical/Potions/Agility Potions/GreaterAgilityPotion.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class GreaterAgilityPotion : BaseAgilityPotion
{
public override int DexOffset{ get{ return 20; } }
public override TimeSpan Duration{ get{ return TimeSpan.FromMinutes( 2.0 ); } }
public override int DexOffset => 20;
public override TimeSpan Duration => TimeSpan.FromMinutes( 2.0 );
[Constructible]
public GreaterAgilityPotion() : base( PotionEffect.AgilityGreater )
@ -31,4 +31,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs
View file

@ -58,7 +58,7 @@ namespace Server.Items
int ICommodity.DescriptionNumber { get { return LabelNumber; } }
bool ICommodity.IsDeedable { get { return (Core.ML); } }
public override int LabelNumber{ get{ return 1041314 + (int)m_PotionEffect; } }
public override int LabelNumber => 1041314 + (int)m_PotionEffect;
public BasePotion( int itemID, PotionEffect effect ) : base( itemID )
{
@ -84,7 +84,7 @@ namespace Server.Items
if ( handTwo is BaseRanged )
{
BaseRanged ranged = (BaseRanged) handTwo;
if ( ranged.Balanced )
return true;
}

6
Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/ConflagrationPotion.cs
View file

@ -5,10 +5,10 @@ namespace Server.Items
{
public class ConflagrationPotion : BaseConflagrationPotion
{
public override int MinDamage{ get{ return 2; } }
public override int MaxDamage{ get{ return 4; } }
public override int MinDamage => 2;
public override int MaxDamage => 4;
public override int LabelNumber{ get{ return 1072095; } } // a Conflagration potion
public override int LabelNumber => 1072095; // a Conflagration potion
[Constructible]
public ConflagrationPotion() : base( PotionEffect.Conflagration )

6
Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/GreaterConflagrationPotion.cs
View file

@ -5,10 +5,10 @@ namespace Server.Items
{
public class GreaterConflagrationPotion : BaseConflagrationPotion
{
public override int MinDamage{ get{ return 4; } }
public override int MaxDamage{ get{ return 8; } }
public override int MinDamage => 4;
public override int MaxDamage => 8;
public override int LabelNumber{ get{ return 1072098; } } // a Greater Conflagration potion
public override int LabelNumber => 1072098; // a Greater Conflagration potion
[Constructible]
public GreaterConflagrationPotion() : base( PotionEffect.ConflagrationGreater )

4
Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/ConfusionBlastPotion.cs
View file

@ -5,9 +5,9 @@ namespace Server.Items
{
public class ConfusionBlastPotion : BaseConfusionBlastPotion
{
public override int Radius{ get{ return 5; } }
public override int Radius => 5;
public override int LabelNumber{ get{ return 1072105; } } // a Confusion Blast potion
public override int LabelNumber => 1072105; // a Confusion Blast potion
[Constructible]
public ConfusionBlastPotion() : base( PotionEffect.ConfusionBlast )

4
Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/GreaterConfusionBlastPotion.cs
View file

@ -5,9 +5,9 @@ namespace Server.Items
{
public class GreaterConfusionBlastPotion : BaseConfusionBlastPotion
{
public override int Radius{ get{ return 7; } }
public override int Radius => 7;
public override int LabelNumber{ get{ return 1072108; } } // a Greater Confusion Blast potion
public override int LabelNumber => 1072108; // a Greater Confusion Blast potion
[Constructible]
public GreaterConfusionBlastPotion() : base( PotionEffect.ConfusionBlastGreater )

4
Scripts/Items/Skill Items/Magical/Potions/Cure Potions/CurePotion.cs
View file

@ -22,7 +22,7 @@ namespace Server.Items
new CureLevelInfo( Poison.Lethal, 0.25 )
};
public override CureLevelInfo[] LevelInfo{ get{ return Core.AOS ? m_AosLevelInfo : m_OldLevelInfo; } }
public override CureLevelInfo[] LevelInfo => Core.AOS ? m_AosLevelInfo : m_OldLevelInfo;
[Constructible]
public CurePotion() : base( PotionEffect.Cure )
@ -47,4 +47,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Magical/Potions/Cure Potions/GreaterCurePotion.cs
View file

@ -23,7 +23,7 @@ namespace Server.Items
new CureLevelInfo( Poison.Lethal, 0.75 )
};
public override CureLevelInfo[] LevelInfo{ get{ return Core.AOS ? m_AosLevelInfo : m_OldLevelInfo; } }
public override CureLevelInfo[] LevelInfo => Core.AOS ? m_AosLevelInfo : m_OldLevelInfo;
[Constructible]
public GreaterCurePotion() : base( PotionEffect.CureGreater )
@ -48,4 +48,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Magical/Potions/Cure Potions/LesserCurePotion.cs
View file

@ -19,7 +19,7 @@ namespace Server.Items
new CureLevelInfo( Poison.Greater, 0.25 )
};
public override CureLevelInfo[] LevelInfo{ get{ return Core.AOS ? m_AosLevelInfo : m_OldLevelInfo; } }
public override CureLevelInfo[] LevelInfo => Core.AOS ? m_AosLevelInfo : m_OldLevelInfo;
[Constructible]
public LesserCurePotion() : base( PotionEffect.CureLesser )
@ -44,4 +44,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

10
Scripts/Items/Skill Items/Magical/Potions/DarkglowPotion.cs
View file

@ -5,12 +5,12 @@ namespace Server.Items
{
public class DarkglowPotion : BasePoisonPotion
{
public override Poison Poison{ get{ return Poison.Greater; } } /* MUST be restored when prerequisites are done */
public override Poison Poison => Poison.Greater; /* MUST be restored when prerequisites are done */
public override double MinPoisoningSkill{ get{ return 95.0; } }
public override double MaxPoisoningSkill{ get{ return 100.0; } }
public override int LabelNumber{ get{ return 1072849; } } // Darkglow Poison
public override double MinPoisoningSkill => 95.0;
public override double MaxPoisoningSkill => 100.0;
public override int LabelNumber => 1072849; // Darkglow Poison
[Constructible]
public DarkglowPotion() : base( PotionEffect.Darkglow )

2
Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs
View file

@ -62,7 +62,7 @@ namespace Server.Items
private Timer m_Timer;
public List<Mobile> Users { get { return m_Users; } }
public List<Mobile> Users => m_Users;
private List<Mobile> m_Users;

6
Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/ExplosionPotion.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class ExplosionPotion : BaseExplosionPotion
{
public override int MinDamage { get { return 10; } }
public override int MaxDamage { get { return 20; } }
public override int MinDamage => 10;
public override int MaxDamage => 20;
[Constructible]
public ExplosionPotion() : base( PotionEffect.Explosion )
@ -31,4 +31,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/GreaterExplosionPotion.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class GreaterExplosionPotion : BaseExplosionPotion
{
public override int MinDamage { get { return Core.AOS ? 20 : 15; } }
public override int MaxDamage { get { return Core.AOS ? 40 : 30; } }
public override int MinDamage => Core.AOS ? 20 : 15;
public override int MaxDamage => Core.AOS ? 40 : 30;
[Constructible]
public GreaterExplosionPotion() : base( PotionEffect.ExplosionGreater )
@ -31,4 +31,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/LesserExplosionPotion.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class LesserExplosionPotion : BaseExplosionPotion
{
public override int MinDamage { get { return 5; } }
public override int MaxDamage { get { return 10; } }
public override int MinDamage => 5;
public override int MaxDamage => 10;
[Constructible]
public LesserExplosionPotion() : base( PotionEffect.ExplosionLesser )
@ -31,4 +31,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Skill Items/Magical/Potions/Heal Potions/GreaterHealPotion.cs
View file

@ -5,9 +5,9 @@ namespace Server.Items
{
public class GreaterHealPotion : BaseHealPotion
{
public override int MinHeal { get { return (Core.AOS ? 20 : 9); } }
public override int MaxHeal { get { return (Core.AOS ? 25 : 30); } }
public override double Delay{ get{ return 10.0; } }
public override int MinHeal => (Core.AOS ? 20 : 9);
public override int MaxHeal => (Core.AOS ? 25 : 30);
public override double Delay => 10.0;
[Constructible]
public GreaterHealPotion() : base( PotionEffect.HealGreater )
@ -32,4 +32,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Skill Items/Magical/Potions/Heal Potions/HealPotion.cs
View file

@ -5,9 +5,9 @@ namespace Server.Items
{
public class HealPotion : BaseHealPotion
{
public override int MinHeal { get { return (Core.AOS ? 13 : 6); } }
public override int MaxHeal { get { return (Core.AOS ? 16 : 20); } }
public override double Delay{ get{ return (Core.AOS ? 8.0 : 10.0); } }
public override int MinHeal => (Core.AOS ? 13 : 6);
public override int MaxHeal => (Core.AOS ? 16 : 20);
public override double Delay => (Core.AOS ? 8.0 : 10.0);
[Constructible]
public HealPotion() : base( PotionEffect.Heal )
@ -32,4 +32,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Skill Items/Magical/Potions/Heal Potions/LesserHealPotion.cs
View file

@ -5,9 +5,9 @@ namespace Server.Items
{
public class LesserHealPotion : BaseHealPotion
{
public override int MinHeal { get { return (Core.AOS ? 6 : 3); } }
public override int MaxHeal { get { return (Core.AOS ? 8 : 10); } }
public override double Delay{ get{ return (Core.AOS ? 3.0 : 10.0); } }
public override int MinHeal => (Core.AOS ? 6 : 3);
public override int MaxHeal => (Core.AOS ? 8 : 10);
public override double Delay => (Core.AOS ? 3.0 : 10.0);
[Constructible]
public LesserHealPotion() : base( PotionEffect.HealLesser )
@ -32,4 +32,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

34
Scripts/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs
View file

@ -5,8 +5,8 @@ using Server;
namespace Server.Items
{
public class InvisibilityPotion : BasePotion
{
public override int LabelNumber{ get{ return 1072941; } } // Potion of Invisibility
{
public override int LabelNumber => 1072941; // Potion of Invisibility
[Constructible]
public InvisibilityPotion() : base( 0xF0A, PotionEffect.Invisibility )
@ -17,7 +17,7 @@ namespace Server.Items
public InvisibilityPotion( Serial serial ) : base( serial )
{
}
public override void Drink( Mobile from )
{
if ( from.Hidden )
@ -25,51 +25,51 @@ namespace Server.Items
from.SendLocalizedMessage( 1073185 ); // You are already unseen.
return;
}
if ( HasTimer( from ) )
{
from.SendLocalizedMessage( 1073186 ); // An invisibility potion is already taking effect on your person.
return;
}
Consume();
m_Table[ from ] = Timer.DelayCall( TimeSpan.FromSeconds( 2 ), new TimerStateCallback( Hide_Callback ), from );
m_Table[ from ] = Timer.DelayCall( TimeSpan.FromSeconds( 2 ), new TimerStateCallback( Hide_Callback ), from );
PlayDrinkEffect( from );
}
private static void Hide_Callback( object obj )
{
if ( obj is Mobile )
Hide( (Mobile) obj );
}
public static void Hide( Mobile m )
{
Effects.SendLocationParticles( EffectItem.Create( new Point3D( m.X, m.Y, m.Z + 16 ), m.Map, EffectItem.DefaultDuration ), 0x376A, 10, 15, 5045 );
m.PlaySound( 0x3C4 );
m.Hidden = true;
BuffInfo.RemoveBuff( m, BuffIcon.HidingAndOrStealth );
BuffInfo.AddBuff( m, new BuffInfo( BuffIcon.Invisibility, 1075825 ) ); //Invisibility/Invisible
RemoveTimer( m );
Timer.DelayCall( TimeSpan.FromSeconds( 30 ), new TimerStateCallback( EndHide_Callback ), m );
}
private static void EndHide_Callback( object obj )
{
if ( obj is Mobile )
EndHide( (Mobile) obj );
}
public static void EndHide( Mobile m )
{
m.RevealingAction();
RemoveTimer( m );
}
private static Hashtable m_Table = new Hashtable();
public static bool HasTimer( Mobile m )
@ -87,11 +87,11 @@ namespace Server.Items
m_Table.Remove( m );
}
}
public static void Iterrupt( Mobile m )
{
m.SendLocalizedMessage( 1073187 ); // The invisibility effect is interrupted.
RemoveTimer( m );
RemoveTimer( m );
}
public override void Serialize( GenericWriter writer )

11
Scripts/Items/Skill Items/Magical/Potions/ParasiticPotion.cs
View file

@ -5,12 +5,13 @@ namespace Server.Items
{
public class ParasiticPotion : BasePoisonPotion
{
public override Poison Poison{ get{ return Poison.Greater; } } /* public override Poison Poison{ get{ return Poison.Darkglow; } } MUST be restored when prerequisites are done */
/* public override Poison Poison => Poison.Darkglow; MUST be restored when prerequisites are done */
public override Poison Poison => Poison.Greater;
public override double MinPoisoningSkill{ get{ return 95.0; } }
public override double MaxPoisoningSkill{ get{ return 100.0; } }
public override int LabelNumber{ get{ return 1072848; } } // Parasitic Poison
public override double MinPoisoningSkill => 95.0;
public override double MaxPoisoningSkill => 100.0;
public override int LabelNumber => 1072848; // Parasitic Poison
[Constructible]
public ParasiticPotion() : base( PotionEffect.Parasitic )

8
Scripts/Items/Skill Items/Magical/Potions/Poison Potions/DeadlyPoisonPotion.cs
View file

@ -5,10 +5,10 @@ namespace Server.Items
{
public class DeadlyPoisonPotion : BasePoisonPotion
{
public override Poison Poison{ get{ return Poison.Deadly; } }
public override Poison Poison => Poison.Deadly;
public override double MinPoisoningSkill{ get{ return 95.0; } }
public override double MaxPoisoningSkill{ get{ return 100.0; } }
public override double MinPoisoningSkill => 95.0;
public override double MaxPoisoningSkill => 100.0;
[Constructible]
public DeadlyPoisonPotion() : base( PotionEffect.PoisonDeadly )
@ -33,4 +33,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Skill Items/Magical/Potions/Poison Potions/GreaterPoisonPotion.cs
View file

@ -5,10 +5,10 @@ namespace Server.Items
{
public class GreaterPoisonPotion : BasePoisonPotion
{
public override Poison Poison{ get{ return Poison.Greater; } }
public override Poison Poison => Poison.Greater;
public override double MinPoisoningSkill{ get{ return 60.0; } }
public override double MaxPoisoningSkill{ get{ return 100.0; } }
public override double MinPoisoningSkill => 60.0;
public override double MaxPoisoningSkill => 100.0;
[Constructible]
public GreaterPoisonPotion() : base( PotionEffect.PoisonGreater )
@ -33,4 +33,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Skill Items/Magical/Potions/Poison Potions/LesserPoisonPotion.cs
View file

@ -5,10 +5,10 @@ namespace Server.Items
{
public class LesserPoisonPotion : BasePoisonPotion
{
public override Poison Poison{ get{ return Poison.Lesser; } }
public override Poison Poison => Poison.Lesser;
public override double MinPoisoningSkill{ get{ return 0.0; } }
public override double MaxPoisoningSkill{ get{ return 60.0; } }
public override double MinPoisoningSkill => 0.0;
public override double MaxPoisoningSkill => 60.0;
[Constructible]
public LesserPoisonPotion() : base( PotionEffect.PoisonLesser )
@ -33,4 +33,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Skill Items/Magical/Potions/Poison Potions/PoisonPotion.cs
View file

@ -5,10 +5,10 @@ namespace Server.Items
{
public class PoisonPotion : BasePoisonPotion
{
public override Poison Poison{ get{ return Poison.Regular; } }
public override Poison Poison => Poison.Regular;
public override double MinPoisoningSkill{ get{ return 30.0; } }
public override double MaxPoisoningSkill{ get{ return 70.0; } }
public override double MinPoisoningSkill => 30.0;
public override double MaxPoisoningSkill => 70.0;
[Constructible]
public PoisonPotion() : base( PotionEffect.Poison )
@ -33,4 +33,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/RefreshPotion.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class RefreshPotion : BaseRefreshPotion
{
public override double Refresh{ get{ return 0.25; } }
public override double Refresh => 0.25;
[Constructible]
public RefreshPotion() : base( PotionEffect.Refresh )
@ -30,4 +30,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Magical/Potions/Refresh Potions/TotalRefreshPotion.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class TotalRefreshPotion : BaseRefreshPotion
{
public override double Refresh{ get{ return 1.0; } }
public override double Refresh => 1.0;
[Constructible]
public TotalRefreshPotion() : base( PotionEffect.RefreshTotal )
@ -30,4 +30,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Magical/Potions/Strength Potions/GreaterStrengthPotion.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class GreaterStrengthPotion : BaseStrengthPotion
{
public override int StrOffset{ get{ return 20; } }
public override TimeSpan Duration{ get{ return TimeSpan.FromMinutes( 2.0 ); } }
public override int StrOffset => 20;
public override TimeSpan Duration => TimeSpan.FromMinutes( 2.0 );
[Constructible]
public GreaterStrengthPotion() : base( PotionEffect.StrengthGreater )
@ -31,4 +31,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Magical/Potions/Strength Potions/StrengthPotion.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class StrengthPotion : BaseStrengthPotion
{
public override int StrOffset{ get{ return 10; } }
public override TimeSpan Duration{ get{ return TimeSpan.FromMinutes( 2.0 ); } }
public override int StrOffset => 10;
public override TimeSpan Duration => TimeSpan.FromMinutes( 2.0 );
[Constructible]
public StrengthPotion() : base( PotionEffect.Strength )
@ -31,4 +31,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Items/Skill Items/Magical/Runebook.cs
View file

@ -108,7 +108,7 @@ namespace Server.Items
}
}
public override int LabelNumber{ get{ return 1041267; } } // runebook
public override int LabelNumber => 1041267; // runebook
[Constructible]
public Runebook( int maxCharges ) : base( Core.AOS ? 0x22C5 : 0xEFA )

4
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -221,9 +221,7 @@ namespace Server.Items
return null;
}
List<Spellbook> list = null;
m_Table.TryGetValue( from, out list );
m_Table.TryGetValue( from, out List<Spellbook> list );
bool searchAgain = false;

8
Scripts/Items/Skill Items/Magical/SpellweavingBook.cs
View file

@ -6,9 +6,9 @@ namespace Server.Items
{
public class SpellweavingBook : Spellbook
{
public override SpellbookType SpellbookType{ get{ return SpellbookType.Arcanist; } }
public override int BookOffset{ get{ return 600; } }
public override int BookCount{ get{ return 16; } }
public override SpellbookType SpellbookType => SpellbookType.Arcanist;
public override int BookOffset => 600;
public override int BookCount => 16;
[Constructible]
public SpellweavingBook() : this( (ulong)0 )
@ -41,4 +41,4 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
}
}
}
}

11
Scripts/Items/Skill Items/Misc/Bandage.cs
View file

@ -11,7 +11,7 @@ namespace Server.Items
{
public class Bandage : Item, IDyable
{
public static int Range = ( Core.AOS ? 2 : 1 );
public static int Range = ( Core.AOS ? 2 : 1 );
public override double DefaultWeight
{
@ -204,8 +204,7 @@ namespace Server.Items
public static BandageContext GetContext( Mobile healer )
{
BandageContext bc = null;
m_Table.TryGetValue( healer, out bc );
m_Table.TryGetValue( healer, out BandageContext bc );
return bc;
}
@ -514,7 +513,7 @@ namespace Server.Items
else if ( Core.AOS )
{
if (dex < 204)
{
{
seconds = 3.2-(Math.Sin((double)dex/130)*2.5) + resDelay;
}
else
@ -538,7 +537,7 @@ namespace Server.Items
if ( context != null )
context.StopHeal();
seconds *= 1000;
context = new BandageContext( healer, patient, TimeSpan.FromMilliseconds( seconds ) );
m_Table[healer] = context;
@ -553,4 +552,4 @@ namespace Server.Items
return null;
}
}
}
}

2
Scripts/Items/Skill Items/Misc/FireHorn.cs
View file

@ -9,7 +9,7 @@ namespace Server.Items
{
public class FireHorn : Item
{
public override int LabelNumber{ get{ return 1060456; } } // fire horn
public override int LabelNumber => 1060456; // fire horn
[Constructible]
public FireHorn() : base( 0xFC7 )

4
Scripts/Items/Skill Items/Misc/RecipeScroll.cs
View file

@ -8,7 +8,7 @@ namespace Server.Items
{
public class RecipeScroll : Item
{
public override int LabelNumber { get { return 1074560; } } // recipe scroll
public override int LabelNumber => 1074560; // recipe scroll
private int m_RecipeID;
@ -91,7 +91,7 @@ namespace Server.Items
{
pm.SendLocalizedMessage( 1073427 ); // You already know this recipe.
}
}
}

8
Scripts/Items/Skill Items/Misc/RepairDeed.cs
View file

@ -16,11 +16,11 @@ namespace Server.Items
private TextDefinition m_NotNearbyMessage, m_Name;
public TextDefinition NotNearbyMessage{ get { return m_NotNearbyMessage; } }
public TextDefinition Name { get { return m_Name; } }
public TextDefinition Name => m_Name;
public CraftSystem System { get { return m_System; } }
public Type[] NearbyTypes { get { return m_NearbyTypes; } }
public CraftSystem System => m_System;
public Type[] NearbyTypes => m_NearbyTypes;
public RepairSkillInfo( CraftSystem system, Type[] nearbyTypes, TextDefinition notNearbyMessage, TextDefinition name )
{
@ -35,7 +35,7 @@ namespace Server.Items
{
}
public static RepairSkillInfo[] Table { get { return m_Table; } }
public static RepairSkillInfo[] Table => m_Table;
private static RepairSkillInfo[] m_Table = new RepairSkillInfo[]
{
new RepairSkillInfo( DefBlacksmithy.CraftSystem, typeof( Blacksmith ), 1047013, 1023015 ),

18
Scripts/Items/Skill Items/Ninjitsu/Fukiya.cs
View file

@ -11,18 +11,18 @@ namespace Server.Items
[FlippableAttribute( 0x27AA, 0x27F5 )]
public class Fukiya : Item, INinjaWeapon
{
public virtual int WrongAmmoMessage { get { return 1063329; } } //You can only load fukiya darts
public virtual int NoFreeHandMessage { get { return 1063327; } } //You must have a free hand to use a fukiya.
public virtual int EmptyWeaponMessage { get { return 1063325; } } //You have no fukiya darts!
public virtual int RecentlyUsedMessage { get { return 1063326; } } //You are already using that fukiya.
public virtual int FullWeaponMessage { get { return 1063330; } } //You can only load fukiya darts
public virtual int WrongAmmoMessage => 1063329; //You can only load fukiya darts
public virtual int NoFreeHandMessage => 1063327; //You must have a free hand to use a fukiya.
public virtual int EmptyWeaponMessage => 1063325; //You have no fukiya darts!
public virtual int RecentlyUsedMessage => 1063326; //You are already using that fukiya.
public virtual int FullWeaponMessage => 1063330; //You can only load fukiya darts
public virtual int WeaponMinRange { get { return 0; } }
public virtual int WeaponMaxRange { get { return 6; } }
public virtual int WeaponMinRange => 0;
public virtual int WeaponMaxRange => 6;
public virtual int WeaponDamage { get { return Utility.RandomMinMax(4, 6); } }
public Type AmmoType{ get { return typeof(FukiyaDarts); } }
public Type AmmoType => typeof(FukiyaDarts);
private int m_UsesRemaining;
private Poison m_Poison;
@ -131,4 +131,4 @@ namespace Server.Items
}
}
}
}
}

20
Scripts/Items/Skill Items/Ninjitsu/LeatherNinjaBelt.cs
View file

@ -11,20 +11,20 @@ namespace Server.Items
[FlippableAttribute( 0x2790, 0x27DB )]
public class LeatherNinjaBelt : BaseWaist, IDyable, INinjaWeapon
{
public override CraftResource DefaultResource{ get{ return CraftResource.RegularLeather; } }
public override CraftResource DefaultResource => CraftResource.RegularLeather;
public virtual int WrongAmmoMessage { get { return 1063301; } } //You can only place shuriken in a ninja belt.
public virtual int NoFreeHandMessage { get { return 1063299; } } //You must have a free hand to throw shuriken.
public virtual int EmptyWeaponMessage { get { return 1063297; } } //You have no shuriken in your ninja belt!
public virtual int RecentlyUsedMessage { get { return 1063298; } } //You cannot throw another shuriken yet.
public virtual int FullWeaponMessage { get { return 1063302; } } //You cannot add any more shuriken.
public virtual int WrongAmmoMessage => 1063301; //You can only place shuriken in a ninja belt.
public virtual int NoFreeHandMessage => 1063299; //You must have a free hand to throw shuriken.
public virtual int EmptyWeaponMessage => 1063297; //You have no shuriken in your ninja belt!
public virtual int RecentlyUsedMessage => 1063298; //You cannot throw another shuriken yet.
public virtual int FullWeaponMessage => 1063302; //You cannot add any more shuriken.
public virtual int WeaponMinRange { get { return 2; } }
public virtual int WeaponMaxRange { get { return 10; } }
public virtual int WeaponMinRange => 2;
public virtual int WeaponMaxRange => 10;
public virtual int WeaponDamage { get { return Utility.RandomMinMax(3, 5); } }
public virtual Type AmmoType { get { return typeof(Shuriken); } }
public virtual Type AmmoType => typeof(Shuriken);
private int m_UsesRemaining;
private Poison m_Poison;
@ -144,4 +144,4 @@ namespace Server.Items
}
}
}
}
}

4
Scripts/Items/Skill Items/Specialized/Sand.cs
View file

@ -9,7 +9,7 @@ namespace Server.Items
int ICommodity.DescriptionNumber { get { return LabelNumber; } }
bool ICommodity.IsDeedable { get { return true; } }
public override int LabelNumber{ get{ return 1044626; } } // sand
public override int LabelNumber => 1044626; // sand
[Constructible]
public Sand() : this( 1 )
@ -44,4 +44,4 @@ namespace Server.Items
this.Name = null;
}
}
}
}

12
Scripts/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs
View file

@ -51,7 +51,7 @@ namespace Server.Items
base.Serialize( writer );
writer.Write( (int) 1 ); // version
writer.Write( (int)m_SecureLevel );
writer.Write( (bool) m_Redyable );
writer.Write( (int) m_DyedHue );
@ -109,7 +109,7 @@ namespace Server.Items
}
}
}
[CommandProperty( AccessLevel.GameMaster )]
public SecureLevel Level
{
@ -123,13 +123,13 @@ namespace Server.Items
}
}
[Constructible]
[Constructible]
public DyeTub() : base( 0xFAB )
{
Weight = 10.0;
m_Redyable = true;
}
public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list )
{
base.GetContextMenuEntries( from, list );
@ -141,7 +141,7 @@ namespace Server.Items
}
// Three metallic tubs now.
public virtual bool MetallicHues{ get { return false; } }
public virtual bool MetallicHues => false;
// Select the clothing to dye.
public virtual int TargetMessage{ get{ return 500859; } }
@ -290,4 +290,4 @@ namespace Server.Items
}
}
}
}
}

6
Scripts/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs
View file

@ -6,9 +6,9 @@ namespace Server.Items
{
public override bool AllowDyables => false;
public override bool AllowFurniture => true;
public override int TargetMessage{ get{ return 501019; } } // Select the furniture to dye.
public override int FailMessage{ get{ return 501021; } } // That is not a piece of furniture.
public override int LabelNumber{ get{ return 1041246; } } // Furniture Dye Tub
public override int TargetMessage => 501019; // Select the furniture to dye.
public override int FailMessage => 501021; // That is not a piece of furniture.
public override int LabelNumber => 1041246; // Furniture Dye Tub
private bool m_IsRewardItem;

8
Scripts/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs
View file

@ -6,10 +6,10 @@ namespace Server.Items
{
public override bool AllowDyables => false;
public override bool AllowLeather => true;
public override int TargetMessage{ get{ return 1042416; } } // Select the leather item to dye.
public override int FailMessage{ get{ return 1042418; } } // You can only dye leather with this tub.
public override int LabelNumber{ get{ return 1041284; } } // Leather Dye Tub
public override CustomHuePicker CustomHuePicker { get { return CustomHuePicker.LeatherDyeTub; } }
public override int TargetMessage => 1042416; // Select the leather item to dye.
public override int FailMessage => 1042418; // You can only dye leather with this tub.
public override int LabelNumber => 1041284; // Leather Dye Tub
public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub;
private bool m_IsRewardItem;

2
Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs
View file

@ -4,7 +4,7 @@ namespace Server.Items
{
public class MetallicClothDyetub : DyeTub
{
public override int LabelNumber { get { return 1152920; } } // Metallic Cloth ...
public override int LabelNumber => 1152920; // Metallic Cloth ...
public override bool MetallicHues => true;

4
Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs
View file

@ -4,9 +4,9 @@ namespace Server.Items
{
public class MetallicLeatherDyeTub : LeatherDyeTub
{
public override CustomHuePicker CustomHuePicker{ get{ return null; } }
public override CustomHuePicker CustomHuePicker => null;
public override int LabelNumber { get { return 1153495; } } // Metallic Leather ...
public override int LabelNumber => 1153495; // Metallic Leather ...
public override bool MetallicHues => true;

4
Scripts/Items/Skill Items/Tailor Items/Dyetubs/RewardBlackDyeTub.cs
View file

@ -4,7 +4,7 @@ namespace Server.Items
{
public class RewardBlackDyeTub : DyeTub, Engines.VeteranRewards.IRewardItem
{
public override int LabelNumber{ get{ return 1006008; } } // Black Dye Tub
public override int LabelNumber => 1006008; // Black Dye Tub
private bool m_IsRewardItem;
@ -68,4 +68,4 @@ namespace Server.Items
}
}
}
}
}

8
Scripts/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs
View file

@ -6,10 +6,10 @@ namespace Server.Items
{
public override bool AllowDyables => false;
public override bool AllowRunebooks => true;
public override int TargetMessage{ get{ return 1049774; } } // Target the runebook or runestone to dye
public override int FailMessage{ get{ return 1049775; } } // You can only dye runestones or runebooks with this tub.
public override int LabelNumber{ get{ return 1049740; } } // Runebook Dye Tub
public override CustomHuePicker CustomHuePicker{ get{ return CustomHuePicker.LeatherDyeTub; } }
public override int TargetMessage => 1049774; // Target the runebook or runestone to dye
public override int FailMessage => 1049775; // You can only dye runestones or runebooks with this tub.
public override int LabelNumber => 1049740; // Runebook Dye Tub
public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub;
private bool m_IsRewardItem;

6
Scripts/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs
View file

@ -5,8 +5,8 @@ namespace Server.Items
{
public class SpecialDyeTub : DyeTub, IRewardItem
{
public override CustomHuePicker CustomHuePicker{ get{ return CustomHuePicker.SpecialDyeTub; } }
public override int LabelNumber{ get{ return 1041285; } } // Special Dye Tub
public override CustomHuePicker CustomHuePicker => CustomHuePicker.SpecialDyeTub;
public override int LabelNumber => 1041285; // Special Dye Tub
private bool m_IsRewardItem;
@ -68,4 +68,4 @@ namespace Server.Items
}
}
}
}
}

8
Scripts/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs
View file

@ -6,10 +6,10 @@ namespace Server.Items
{
public override bool AllowDyables => false;
public override bool AllowStatuettes => true;
public override int TargetMessage{ get{ return 1049777; } } // Target the statuette to dye
public override int FailMessage{ get{ return 1049778; } } // You can only dye veteran reward statuettes with this tub.
public override int LabelNumber{ get{ return 1049741; } } // Reward Statuette Dye Tub
public override CustomHuePicker CustomHuePicker{ get{ return CustomHuePicker.LeatherDyeTub; } }
public override int TargetMessage => 1049777; // Target the statuette to dye
public override int FailMessage => 1049778; // You can only dye veteran reward statuettes with this tub.
public override int LabelNumber => 1049741; // Reward Statuette Dye Tub
public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub;
private bool m_IsRewardItem;

2
Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items /* High seas, loot from merchant ship's hold, also a "unc
{
public class WhiteClothDyeTub : DyeTub
{
public override int LabelNumber { get { return 1149984; } } // White Cloth Dye Tub
public override int LabelNumber => 1149984; // White Cloth Dye Tub
public override bool Redyable => false;

2
Scripts/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
{
public class WhiteLeatherDyeTub : LeatherDyeTub /* OSI UO 13th anniv gift, from redeemable gift tickets */
{
public override int LabelNumber { get { return 1149900; } } // White Leather Dye Tub
public override int LabelNumber => 1149900; // White Leather Dye Tub
public override bool Redyable => false;

42
Scripts/Items/Skill Items/Thief/DisguiseKit.cs
View file

@ -14,7 +14,7 @@ namespace Server.Items
{
public class DisguiseKit : Item
{
public override int LabelNumber{ get{ return 1041078; } } // a disguise kit
public override int LabelNumber => 1041078; // a disguise kit
[Constructible]
public DisguiseKit() : base( 0xE05 )
@ -225,7 +225,7 @@ namespace Server.Items
m_From.SendGump( new DisguiseGump( m_From, m_Kit, hair, true ) );
DisguiseTimers.RemoveTimer( m_From );
DisguiseTimers.CreateTimer( m_From, TimeSpan.FromHours( 2.0 ) );
DisguiseTimers.StartTimer( m_From );
}
@ -275,18 +275,18 @@ namespace Server.Items
}
}
}
public class DisguiseTimers
{
public static void Initialize()
{
new DisguisePersistance();
}
private class InternalTimer : Timer
{
private Mobile m_Player;
public InternalTimer( Mobile m, TimeSpan delay ) : base( delay )
{
m_Player = m;
@ -299,23 +299,22 @@ namespace Server.Items
if ( m_Player is PlayerMobile )
((PlayerMobile)m_Player).SetHairMods( -1, -1 );
DisguiseTimers.RemoveTimer( m_Player );
}
}
public static void CreateTimer( Mobile m, TimeSpan delay )
{
if ( m != null )
if ( !m_Timers.ContainsKey( m ) )
m_Timers[m] = new InternalTimer( m, delay );
}
public static void StartTimer( Mobile m )
{
Timer t = null;
m_Timers.TryGetValue(m, out t);
m_Timers.TryGetValue( m, out Timer t );
if ( t != null )
t.Start();
}
@ -327,8 +326,7 @@ namespace Server.Items
public static bool StopTimer( Mobile m )
{
Timer t = null;
m_Timers.TryGetValue(m, out t);
m_Timers.TryGetValue( m, out Timer t );
if ( t != null )
{
@ -342,34 +340,32 @@ namespace Server.Items
return ( t != null );
}
public static bool RemoveTimer( Mobile m )
{
Timer t = null;
m_Timers.TryGetValue(m, out t);
m_Timers.TryGetValue( m, out Timer t );
if ( t != null )
{
t.Stop();
m_Timers.Remove( m );
}
return ( t != null );
}
public static TimeSpan TimeRemaining( Mobile m )
{
Timer t = null;
m_Timers.TryGetValue(m, out t);
m_Timers.TryGetValue( m, out Timer t );
if ( t != null )
{
return t.Next - DateTime.UtcNow;
}
return TimeSpan.Zero;
}
private static Dictionary<Mobile, Timer> m_Timers = new Dictionary<Mobile, Timer>();
public static Dictionary<Mobile, Timer> Timers
@ -377,4 +373,4 @@ namespace Server.Items
get { return m_Timers; }
}
}
}
}

4
Scripts/Items/Skill Items/Tools/BaseTool.cs
View file

@ -39,7 +39,7 @@ namespace Server.Items
set { m_UsesRemaining = value; InvalidateProperties(); }
}
public virtual bool BreakOnDepletion { get { return true; } }
public virtual bool BreakOnDepletion => true;
public void ScaleUses()
{
@ -196,4 +196,4 @@ namespace Server.Items
#endregion
}
}
}

6
Scripts/Items/Skill Items/Tools/Blowpipe.cs
View file

@ -7,9 +7,9 @@ namespace Server.Items
[FlippableAttribute( 0xE8A, 0xE89 )]
public class Blowpipe : BaseTool
{
public override CraftSystem CraftSystem { get { return DefGlassblowing.CraftSystem; } }
public override CraftSystem CraftSystem => DefGlassblowing.CraftSystem;
public override int LabelNumber{ get{ return 1044608; } } // blow pipe
public override int LabelNumber => 1044608; // blow pipe
[Constructible]
public Blowpipe() : base( 0xE8A )
@ -46,4 +46,4 @@ namespace Server.Items
Weight = 4.0;
}
}
}
}

4
Scripts/Items/Skill Items/Tools/DovetailSaw.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x1028, 0x1029 )]
public class DovetailSaw : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } }
public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
[Constructible]
public DovetailSaw() : base( 0x1028 )
@ -42,4 +42,4 @@ namespace Server.Items
Weight = 2.0;
}
}
}
}

4
Scripts/Items/Skill Items/Tools/DrawKnife.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class DrawKnife : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } }
public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
[Constructible]
public DrawKnife() : base( 0x10E4 )
@ -38,4 +38,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tools/FletcherTools.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[FlippableAttribute( 0x1022, 0x1023 )]
public class FletcherTools : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefBowFletching.CraftSystem; } }
public override CraftSystem CraftSystem => DefBowFletching.CraftSystem;
[Constructible]
public FletcherTools() : base( 0x1022 )
@ -42,4 +42,4 @@ namespace Server.Items
Weight = 2.0;
}
}
}
}

4
Scripts/Items/Skill Items/Tools/FlourSifter.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class FlourSifter : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCooking.CraftSystem; } }
public override CraftSystem CraftSystem => DefCooking.CraftSystem;
[Constructible]
public FlourSifter() : base( 0x103E )
@ -38,4 +38,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tools/Froe.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class Froe : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } }
public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
[Constructible]
public Froe() : base( 0x10E5 )
@ -38,4 +38,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tools/Hammer.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class Hammer : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } }
public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
[Constructible]
public Hammer() : base( 0x102A )
@ -38,4 +38,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tools/Inshave.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class Inshave : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } }
public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
[Constructible]
public Inshave() : base( 0x10E6 )
@ -38,4 +38,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tools/JointingPlane.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x1030, 0x1031 )]
public class JointingPlane : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } }
public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
[Constructible]
public JointingPlane() : base( 0x1030 )
@ -42,4 +42,4 @@ namespace Server.Items
Weight = 2.0;
}
}
}
}

4
Scripts/Items/Skill Items/Tools/MalletAndChisel.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class MalletAndChisel : BaseTool
{
public override CraftSystem CraftSystem { get { return DefMasonry.CraftSystem; } }
public override CraftSystem CraftSystem => DefMasonry.CraftSystem;
[Constructible]
public MalletAndChisel() : base( 0x12B3 )
@ -38,4 +38,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Tools/MapmakersPen.cs
View file

@ -7,9 +7,9 @@ namespace Server.Items
[FlippableAttribute( 0x0FBF, 0x0FC0 )]
public class MapmakersPen : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCartography.CraftSystem; } }
public override CraftSystem CraftSystem => DefCartography.CraftSystem;
public override int LabelNumber{ get{ return 1044167; } } // mapmaker's pen
public override int LabelNumber => 1044167; // mapmaker's pen
[Constructible]
public MapmakersPen() : base( 0x0FBF )
@ -44,4 +44,4 @@ namespace Server.Items
Weight = 1.0;
}
}
}
}

4
Scripts/Items/Skill Items/Tools/MortarPestle.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class MortarPestle : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefAlchemy.CraftSystem; } }
public override CraftSystem CraftSystem => DefAlchemy.CraftSystem;
[Constructible]
public MortarPestle() : base( 0xE9B )
@ -38,4 +38,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tools/MouldingPlane.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x102C, 0x102D )]
public class MouldingPlane : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } }
public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
[Constructible]
public MouldingPlane() : base( 0x102C )
@ -39,4 +39,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tools/Nails.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x102E, 0x102F )]
public class Nails : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } }
public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
[Constructible]
public Nails() : base( 0x102E )
@ -39,4 +39,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tools/RollingPin.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class RollingPin : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCooking.CraftSystem; } }
public override CraftSystem CraftSystem => DefCooking.CraftSystem;
[Constructible]
public RollingPin() : base( 0x1043 )
@ -38,4 +38,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Items/Skill Items/Tools/RunicDovetailSaw.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class RunicDovetailSaw : BaseRunicTool
{
public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } }
public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
public override int LabelNumber
{
@ -16,11 +16,11 @@ namespace Server.Items
if ( index >= 1 && index <= 6 )
return 1072633 + index;
return 1024137; // dovetail saw
}
}
[Constructible]
public RunicDovetailSaw( CraftResource resource ) : base( resource, 0x1028 )
{
@ -53,4 +53,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Tools/RunicFletcherTool.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class RunicFletcherTool : BaseRunicTool
{
public override CraftSystem CraftSystem{ get{ return DefBowFletching.CraftSystem; } }
public override CraftSystem CraftSystem => DefBowFletching.CraftSystem;
public override int LabelNumber
{
@ -16,11 +16,11 @@ namespace Server.Items
if ( index >= 1 && index <= 6 )
return 1072627 + index;
return 1044559; // Fletcher's Tools
}
}
[Constructible]
public RunicFletcherTool( CraftResource resource ) : base( resource, 0x1022 )
{

4
Scripts/Items/Skill Items/Tools/RunicHammer.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[FlippableAttribute( 0x13E4, 0x13E3 )]
public class RunicHammer : BaseRunicTool
{
public override CraftSystem CraftSystem{ get{ return DefBlacksmithy.CraftSystem; } }
public override CraftSystem CraftSystem => DefBlacksmithy.CraftSystem;
public override int LabelNumber
{
@ -76,4 +76,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tools/RunicSewingKit.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class RunicSewingKit : BaseRunicTool
{
public override CraftSystem CraftSystem{ get{ return DefTailoring.CraftSystem; } }
public override CraftSystem CraftSystem => DefTailoring.CraftSystem;
public override void AddNameProperty( ObjectPropertyList list )
{
@ -77,4 +77,4 @@ namespace Server.Items
ItemID = 0xF9D;
}
}
}
}

4
Scripts/Items/Skill Items/Tools/Saw.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[FlippableAttribute( 0x1034, 0x1035 )]
public class Saw : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } }
public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
[Constructible]
public Saw() : base( 0x1034 )
@ -39,4 +39,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tools/Scorp.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class Scorp : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } }
public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
[Constructible]
public Scorp() : base( 0x10E7 )
@ -38,4 +38,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Tools/ScribesPen.cs
View file

@ -7,9 +7,9 @@ namespace Server.Items
[FlippableAttribute( 0x0FBF, 0x0FC0 )]
public class ScribesPen : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefInscription.CraftSystem; } }
public override CraftSystem CraftSystem => DefInscription.CraftSystem;
public override int LabelNumber{ get{ return 1044168; } } // scribe's pen
public override int LabelNumber => 1044168; // scribe's pen
[Constructible]
public ScribesPen() : base( 0x0FBF )
@ -44,4 +44,4 @@ namespace Server.Items
Weight = 1.0;
}
}
}
}

4
Scripts/Items/Skill Items/Tools/SewingKit.cs
View file

@ -6,7 +6,7 @@ namespace Server.Items
{
public class SewingKit : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefTailoring.CraftSystem; } }
public override CraftSystem CraftSystem => DefTailoring.CraftSystem;
[Constructible]
public SewingKit() : base( 0xF9D )
@ -38,4 +38,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Tools/Skillet.cs
View file

@ -6,9 +6,9 @@ namespace Server.Items
{
public class Skillet : BaseTool
{
public override int LabelNumber{ get{ return 1044567; } } // skillet
public override int LabelNumber => 1044567; // skillet
public override CraftSystem CraftSystem{ get{ return DefCooking.CraftSystem; } }
public override CraftSystem CraftSystem => DefCooking.CraftSystem;
[Constructible]
public Skillet() : base( 0x97F )
@ -40,4 +40,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Items/Skill Items/Tools/SledgeHammer.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[FlippableAttribute( 0xFB5, 0xFB4 )]
public class SledgeHammer : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefBlacksmithy.CraftSystem; } }
public override CraftSystem CraftSystem => DefBlacksmithy.CraftSystem;
[Constructible]
public SledgeHammer() : base( 0xFB5 )

4
Scripts/Items/Skill Items/Tools/SmithHammer.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[FlippableAttribute( 0x13E3, 0x13E4 )]
public class SmithHammer : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefBlacksmithy.CraftSystem; } }
public override CraftSystem CraftSystem => DefBlacksmithy.CraftSystem;
[Constructible]
public SmithHammer() : base( 0x13E3 )
@ -41,4 +41,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tools/SmoothingPlane.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x1032, 0x1033 )]
public class SmoothingPlane : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefCarpentry.CraftSystem; } }
public override CraftSystem CraftSystem => DefCarpentry.CraftSystem;
[Constructible]
public SmoothingPlane() : base( 0x1032 )
@ -39,4 +39,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Items/Skill Items/Tools/TinkerTools.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[Flippable( 0x1EB8, 0x1EB9 )]
public class TinkerTools : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefTinkering.CraftSystem; } }
public override CraftSystem CraftSystem => DefTinkering.CraftSystem;
[Constructible]
public TinkerTools() : base( 0x1EB8 )
@ -42,7 +42,7 @@ namespace Server.Items
public class TinkersTools : BaseTool
{
public override CraftSystem CraftSystem { get { return DefTinkering.CraftSystem; } }
public override CraftSystem CraftSystem => DefTinkering.CraftSystem;
[Constructible]
public TinkersTools()
@ -77,4 +77,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Items/Skill Items/Tools/Tongs.cs
View file

@ -7,7 +7,7 @@ namespace Server.Items
[FlippableAttribute( 0xfbb, 0xfbc )]
public class Tongs : BaseTool
{
public override CraftSystem CraftSystem{ get{ return DefBlacksmithy.CraftSystem; } }
public override CraftSystem CraftSystem => DefBlacksmithy.CraftSystem;
[Constructible]
public Tongs() : base( 0xFBB )
@ -39,4 +39,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}