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

@ -94,11 +94,11 @@ namespace Server.Mobiles
public override bool CanHeal => true;
public override bool CanHealOwner => true;
public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies; } }
public override bool CanAngerOnTame{ get { return true; } }
public override FoodType FavoriteFood => FoodType.FruitsAndVegies;
public override bool CanAngerOnTame => true;
public override bool StatLossAfterTame => true;
public override int Hides{ get{ return 10; } }
public override int Meat{ get{ return 3; } }
public override int Hides => 10;
public override int Meat => 3;
public override WeaponAbility GetWeaponAbility() => WeaponAbility.BleedAttack;

View file

@ -41,8 +41,8 @@ namespace Server.Mobiles
m_CanTalk = true;
}
public override int Meat{ get{ return 1; } }
public override FoodType FavoriteFood{ get{ return FoodType.Fish; } }
public override int Meat => 1;
public override FoodType FavoriteFood => FoodType.Fish;
public Ferret( Serial serial ) : base( serial )
{

View file

@ -45,9 +45,9 @@ namespace Server.Mobiles
}
public override int Meat{ get{ return 4; } }
public override int Hides{ get{ return 32; } }
public override PackInstinct PackInstinct{ get{ return PackInstinct.Bear; } }
public override int Meat => 4;
public override int Hides => 32;
public override PackInstinct PackInstinct => PackInstinct.Bear;
public RagingGrizzlyBear( Serial serial ) : base( serial )
{

View file

@ -39,8 +39,8 @@ namespace Server.Mobiles
MinTameSkill = -21.3;
}
public override int Meat{ get{ return 1; } }
public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies; } }
public override int Meat => 1;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies;
public Squirrel( Serial serial ) : base( serial )
{

View file

@ -54,9 +54,7 @@ namespace Server.Mobiles
if ( Utility.RandomDouble() < 0.1 )
{
ExpireTimer timer;
if ( m_Table.TryGetValue( defender, out timer ) )
if (m_Table.TryGetValue( defender, out ExpireTimer timer ))
timer.DoExpire();
defender.FixedParticles( 0x3709, 10, 30, 5052, EffectLayer.LeftFoot );

View file

@ -75,7 +75,7 @@ namespace Server.Mobiles
*/
public override bool GivesMLMinorArtifact => true;
public override int TreasureMapLevel{ get{ return 5; } }
public override int TreasureMapLevel => 5;
public MasterJonath( Serial serial )
: base( serial )

View file

@ -69,7 +69,7 @@ namespace Server.Mobiles
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow;
public override bool GivesMLMinorArtifact => true;
public override int TreasureMapLevel{ get{ return 5; } }
public override int TreasureMapLevel => 5;
public MasterTheophilus( Serial serial )
: base( serial )

View file

@ -68,8 +68,8 @@ namespace Server.Mobiles
public override bool GivesMLMinorArtifact => true;
public override bool AlwaysMurderer => true;
public override bool HasBreath => true;
public override int BreathChaosDamage{ get { return 100; } }
public override int BreathFireDamage{ get{ return 0; } }
public override int BreathChaosDamage => 100;
public override int BreathFireDamage => 0;
public RedDeath( Serial serial )
: base( serial )

View file

@ -76,11 +76,11 @@ namespace Server.Mobiles
*/
}
public override Poison HitPoison { get { return Poison.Lethal; } }
public override Poison PoisonImmune { get { return Poison.Lethal; } }
public override Poison HitPoison => Poison.Lethal;
public override Poison PoisonImmune => Poison.Lethal;
public override bool GivesMLMinorArtifact => true;
public override int Hides { get { return 48; } }
public override int Meat { get { return 1; } }
public override int Hides => 48;
public override int Meat => 1;
public Coil( Serial serial )
: base( serial )

View file

@ -66,9 +66,9 @@ namespace Server.Mobiles
}
public override bool HasBreath => true;
public override int Hides { get { return 40; } }
public override int Meat { get { return 19; } }
public override int TreasureMapLevel { get { return 5; } }
public override int Hides => 40;
public override int Meat => 19;
public override int TreasureMapLevel => 5;
public Hydra( Serial serial )
: base( serial )

View file

@ -55,7 +55,7 @@ namespace Server.Mobiles
c.DropItem( new TaintedSeeds() );
}
public override Poison PoisonImmune { get { return Poison.Lethal; } }
public override Poison PoisonImmune => Poison.Lethal;
public Tangle( Serial serial )
: base( serial )

View file

@ -54,8 +54,8 @@ namespace Server.Mobiles
}
public override bool GivesMLMinorArtifact => true;
public override int Hides { get { return 48; } }
public override int Meat { get { return 1; } }
public override int Hides => 48;
public override int Meat => 1;
public Thrasher( Serial serial )
: base( serial )

View file

@ -61,7 +61,7 @@ namespace Server.Mobiles
AddLoot( LootPack.MlRich );
}
public override int Meat { get { return 1; } }
public override int Meat => 1;
public override void OnThink()
{

View file

@ -217,7 +217,7 @@ namespace Server.Mobiles
}
#endregion
public override int Meat { get { return 1; } }
public override int Meat => 1;
public Satyr( Serial serial ) : base( serial )
{

View file

@ -47,7 +47,7 @@ namespace Server.Mobiles
}
public override Poison PoisonImmune => Poison.Deadly;
public override int TreasureMapLevel{ get{ return 3; } }
public override int TreasureMapLevel => 3;
public override int GetDeathSound() { return 0x596; }
public override int GetAttackSound() { return 0x597; }

View file

@ -45,12 +45,12 @@ namespace Server.Mobiles
}
/* yes, this is OSI style */
public override double WeaponAbilityChance { get { return 0.75; } }
public override double HitPoisonChance { get { return 0.35; } }
public override Poison HitPoison { get { return ( Poison.Lethal ); } }
public override double WeaponAbilityChance => 0.75;
public override double HitPoisonChance => 0.35;
public override Poison HitPoison => ( Poison.Lethal );
public override bool HasManaOveride => true;
public override bool GivesMLMinorArtifact => true;
public override int TreasureMapLevel { get { return 5; } }
public override int TreasureMapLevel => 5;
public override void GenerateLoot()
{

View file

@ -63,7 +63,7 @@ namespace Server.Mobiles
}
public override bool GivesMLMinorArtifact => true;
public override int TreasureMapLevel{ get{ return 5; } }
public override int TreasureMapLevel => 5;
public override bool HasAura => true;
public Pyre( Serial serial )

View file

@ -61,13 +61,13 @@ namespace Server.Mobiles
public override bool ReacquireOnMovement => !Controlled;
public override bool HasBreath => true; // fire breath enabled
public override bool AutoDispel => !Controlled;
public override int TreasureMapLevel{ get{ return 5; } }
public override int Meat{ get{ return 19; } }
public override int Hides{ get{ return 30; } }
public override HideType HideType{ get{ return HideType.Barbed; } }
public override int Scales{ get{ return 7; } }
public override ScaleType ScaleType{ get{ return ( Body == 12 ? ScaleType.Yellow : ScaleType.Red ); } }
public override FoodType FavoriteFood{ get{ return FoodType.Meat; } }
public override int TreasureMapLevel => 5;
public override int Meat => 19;
public override int Hides => 30;
public override HideType HideType => HideType.Barbed;
public override int Scales => 7;
public override ScaleType ScaleType => ( Body == 12 ? ScaleType.Yellow : ScaleType.Red );
public override FoodType FavoriteFood => FoodType.Meat;
public override bool CanAngerOnTame => true;
public override bool CanFly => true;

View file

@ -8,7 +8,7 @@ namespace Server.Mobiles
[CorpseName( "a slimey corpse" )]
public class CorrosiveSlime : BaseCreature
{
public override string DefaultName { get { return "a corrosive slime"; } }
public override string DefaultName => "a corrosive slime";
[Constructible]
public CorrosiveSlime() : base( AIType.AI_Melee, FightMode.Closest, 10, 1, 0.2, 0.4 )
@ -53,10 +53,10 @@ namespace Server.Mobiles
AddLoot( LootPack.Gems );
}
public override Poison PoisonImmune { get { return Poison.Regular; } }
public override Poison HitPoison { get { return Poison.Regular; } }
public override FoodType FavoriteFood{ get{ return FoodType.Fish; } }
public override Poison PoisonImmune => Poison.Regular;
public override Poison HitPoison => Poison.Regular;
public override FoodType FavoriteFood => FoodType.Fish;
//TODO: Damage weapon via acid
public CorrosiveSlime( Serial serial ) : base( serial )

View file

@ -47,13 +47,13 @@ namespace Server.Mobiles
public override WeaponAbility GetWeaponAbility() => WeaponAbility.ParalyzingBlow;
public override int TreasureMapLevel{ get{ return 5; } }
public override int Meat{ get{ return 5; } }
public override int Hides{ get{ return 10; } }
public override int TreasureMapLevel => 5;
public override int Meat => 5;
public override int Hides => 10;
public override bool CanBreath => true;
public override bool CanAngerOnTame{ get { return true; } }
public override bool CanAngerOnTame => true;
public override bool StatLossAfterTame => true;
public override FoodType FavoriteFood{ get{ return FoodType.Meat; } }
public override FoodType FavoriteFood => FoodType.Meat;
public override bool CanFly => true;
public Reptalon( Serial serial ) : base( serial )

View file

@ -52,7 +52,7 @@ namespace Server.Mobiles
public override WeaponAbility GetWeaponAbility() => WeaponAbility.CrushingBlow;
public override bool GivesMLMinorArtifact => true;
public override int TreasureMapLevel{ get{ return 4; } }
public override int TreasureMapLevel => 4;
public Lurg( Serial serial )
: base( serial )

View file

@ -71,7 +71,7 @@ namespace Server.Mobiles
public override bool GivesMLMinorArtifact => true;
public override Poison HitPoison => Poison.Deadly; // Becomes Lethal with Paragon bonus
public override int TreasureMapLevel{ get{ return 5; } }
public override int TreasureMapLevel => 5;
public Putrefier( Serial serial )
: base( serial )

View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
[CorpseName( "a corporeal brume corpse" )]
public class CorporealBrume : BaseCreature
{
public override string DefaultName { get { return "a corporeal brume"; } }
public override string DefaultName => "a corporeal brume";
[Constructible]
public CorporealBrume()
@ -48,13 +48,13 @@ namespace Server.Mobiles
}
// TODO: Verify area attack specifics
public override bool HasAura { get { return ( Combatant != null ); } }
public override TimeSpan AuraInterval { get { return TimeSpan.FromSeconds( 20 ); } }
public override int AuraRange { get { return 10; } }
public override bool HasAura => ( Combatant != null );
public override TimeSpan AuraInterval => TimeSpan.FromSeconds( 20 );
public override int AuraRange => 10;
public override int AuraBaseDamage { get { return Utility.RandomMinMax( 25, 35 ); } }
public override int AuraFireDamage { get { return 0; } }
public override int AuraColdDamage { get { return 100; } }
public override int AuraBaseDamage => Utility.RandomMinMax( 25, 35 );
public override int AuraFireDamage => 0;
public override int AuraColdDamage => 100;
public override void AuraEffect( Mobile m )
{
@ -81,4 +81,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
[CorpseName( "a crystal daemon corpse" )]
public class CrystalDaemon : BaseCreature
{
public override string DefaultName { get { return "a crystal daemon"; } }
public override string DefaultName => "a crystal daemon";
[Constructible]
public CrystalDaemon()

View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
[CorpseName( "a Crystal Lattice Seeker corpse" )]
public class CrystalLatticeSeeker : BaseCreature
{
public override string DefaultName { get { return "Crystal Lattice Seeker"; } }
public override string DefaultName => "Crystal Lattice Seeker";
[Constructible]
public CrystalLatticeSeeker()
@ -123,8 +123,8 @@ namespace Server.Mobiles
}
*/
public override int Feathers { get { return 100; } }
public override int TreasureMapLevel { get { return 5; } }
public override int Feathers => 100;
public override int TreasureMapLevel => 5;
public override int GetAttackSound() { return 0x2F6; }
public override int GetDeathSound() { return 0x2F7; }

View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
[CorpseName( "a crystal sea serpent corpse" )]
public class CrystalSeaSerpent : SeaSerpent
{
public override string DefaultName { get { return "a crystal sea serpent"; } }
public override string DefaultName => "a crystal sea serpent";
[Constructible]
public CrystalSeaSerpent()

View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
[CorpseName( "a crystal vortex corpse" )]
public class CrystalVortex : BaseCreature
{
public override string DefaultName { get { return "a crystal vortex"; } }
public override string DefaultName => "a crystal vortex";
[Constructible]
public CrystalVortex()

View file

@ -6,7 +6,7 @@ namespace Server.Mobiles
{
public class CrystalWisp : Wisp
{
public override string DefaultName { get { return "a crystal wisp"; } }
public override string DefaultName => "a crystal wisp";
[Constructible]
public CrystalWisp()

View file

@ -9,7 +9,7 @@ namespace Server.Mobiles
[CorpseName( "a Chiikkaha the Toothed corpse" )]
public class Chiikkaha : RatmanMage
{
public override string DefaultName { get { return "Chiikkaha the Toothed"; } }
public override string DefaultName => "Chiikkaha the Toothed";
[Constructible]
public Chiikkaha()

View file

@ -152,11 +152,11 @@ namespace Server.Mobiles
return 0x59c;
}
public override int Meat { get { return 2; } }
public override int Hides { get { return 10; } }
public override HideType HideType { get { return HideType.Regular; } }
public override int Meat => 2;
public override int Hides => 10;
public override HideType HideType => HideType.Regular;
public override Poison PoisonImmune => Poison.Regular;
public override int TreasureMapLevel{ get{ return 3; } }
public override int TreasureMapLevel => 3;
public override bool BardImmune => true;
public override bool Unprovokable => true;
public override bool Uncalmable => true;

View file

@ -11,13 +11,13 @@ namespace Server.Mobiles
[CorpseName("a corpse of Twaulo")]
public class Twaulo : BaseChampion
{
public override ChampionSkullType SkullType{ get{ return ChampionSkullType.Pain; } }
public override ChampionSkullType SkullType => ChampionSkullType.Pain;
public override Type[] UniqueList{ get{ return new Type[] { typeof( Quell ) }; } }
public override Type[] SharedList{ get{ return new Type[] { typeof( TheMostKnowledgePerson ), typeof( OblivionsNeedle ) }; } }
public override Type[] DecorativeList{ get{ return new Type[] { typeof( Pier ), typeof( MonsterStatuette ) }; } }
public override Type[] UniqueList => new Type[] { typeof( Quell ) };
public override Type[] SharedList => new Type[] { typeof( TheMostKnowledgePerson ), typeof( OblivionsNeedle ) };
public override Type[] DecorativeList => new Type[] { typeof( Pier ), typeof( MonsterStatuette ) };
public override MonsterStatuetteType[] StatueTypes{ get{ return new MonsterStatuetteType[] { MonsterStatuetteType.DreadHorn }; } }
public override MonsterStatuetteType[] StatueTypes => new MonsterStatuetteType[] { MonsterStatuetteType.DreadHorn };
public override string DefaultName => "Twaulo";
@ -78,10 +78,10 @@ namespace Server.Mobiles
public override bool Unprovokable => true;
public override Poison PoisonImmune => Poison.Regular;
public override int TreasureMapLevel{ get{ return 5; } }
public override int Meat { get { return 1; } }
public override int Hides { get { return 8; } }
public override HideType HideType { get { return HideType.Spined; } }
public override int TreasureMapLevel => 5;
public override int Meat => 1;
public override int Hides => 8;
public override HideType HideType => HideType.Spined;
public void SpawnPixies( Mobile target )
{

View file

@ -48,8 +48,8 @@ namespace Server.Mobiles
}
public override bool GivesMLMinorArtifact => true;
public override int Hides{ get{ return 28; } }
public override int Meat{ get{ return 4; } }
public override int Hides => 28;
public override int Meat => 4;
/*
// TODO: uncomment once added

View file

@ -8,7 +8,7 @@ namespace Server.Mobiles
public class Guile : Changeling
{
public override string DefaultName => "Guile";
public override int DefaultHue{ get{ return 0x3F; } }
public override int DefaultHue => 0x3F;
[Constructible]
public Guile()

View file

@ -8,7 +8,7 @@ namespace Server.Mobiles
public class Irk : Changeling
{
public override string DefaultName => "Irk";
public override int DefaultHue{ get{ return 0x489; } }
public override int DefaultHue => 0x489;
[Constructible]
public Irk()

View file

@ -8,7 +8,7 @@ namespace Server.Mobiles
public class Spite : Changeling
{
public override string DefaultName => "Spite";
public override int DefaultHue{ get{ return 0x21; } }
public override int DefaultHue => 0x21;
[Constructible]
public Spite()

View file

@ -111,7 +111,7 @@ namespace Server.Mobiles
public override bool CanFly => true;
public override bool GivesMLMinorArtifact => true;
public override int Feathers{ get{ return 72; } }
public override int Feathers => 72;
/*
// TODO: uncomment once added