Upgrades code style - First batch (#22)

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

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;
}
}
}
}

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;
}
}
}
}

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;
}
}
}
}

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()

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;
}
}
}
}

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();
}
}
}
}

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();
}
}
}
}

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;
}

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 )

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 )

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 )

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 )

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();
}
}
}
}

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();
}
}
}
}

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();
}
}
}
}

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 )

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;

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();
}
}
}
}

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();
}
}
}
}

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();
}
}
}
}

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();
}
}
}
}

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();
}
}
}
}

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();
}
}
}
}

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 )

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 )

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();
}
}
}
}

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();
}
}
}
}

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();
}
}
}
}

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();
}
}
}
}

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();
}
}
}
}

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();
}
}
}
}

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();
}
}
}
}

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();
}
}
}
}

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 )

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;

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();
}
}
}
}