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

4
Scripts/Mobiles/Animals/Mounts/BaseMount.cs
View file

@ -12,7 +12,7 @@ namespace Server.Mobiles
private Item m_InternalItem;
private DateTime m_NextMountAbility;
public virtual TimeSpan MountAbilityDelay { get { return TimeSpan.Zero; } }
public virtual TimeSpan MountAbilityDelay => TimeSpan.Zero;
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NextMountAbility
@ -317,7 +317,7 @@ namespace Server.Mobiles
{
private BaseMount m_Mount;
public override double DefaultWeight { get { return 0; } }
public override double DefaultWeight => 0;
public MountItem( BaseMount mount, int itemID ) : base( itemID )
{

2
Scripts/Mobiles/Animals/Mounts/Beetle.cs
View file

@ -87,7 +87,7 @@ namespace Server.Mobiles
return 0x21D;
}
public override FoodType FavoriteFood{ get{ return FoodType.Meat; } }
public override FoodType FavoriteFood => FoodType.Meat;
public Beetle( Serial serial ) : base( serial )
{

8
Scripts/Mobiles/Animals/Mounts/DesertOstard.cs
View file

@ -42,9 +42,9 @@ namespace Server.Mobiles
MinTameSkill = 29.1;
}
public override int Meat{ get{ return 3; } }
public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } }
public override PackInstinct PackInstinct{ get{ return PackInstinct.Ostard; } }
public override int Meat => 3;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override PackInstinct PackInstinct => PackInstinct.Ostard;
public DesertOstard( Serial serial ) : base( serial )
{
@ -64,4 +64,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

36
Scripts/Mobiles/Animals/Mounts/Ethereals.cs
View file

@ -104,7 +104,7 @@ namespace Server.Mobiles
public override bool DisplayLootType => false;
public virtual int FollowerSlots { get { return 1; } }
public virtual int FollowerSlots => 1;
public void RemoveFollowers()
{
@ -287,7 +287,7 @@ namespace Server.Mobiles
}
}
public virtual int EtherealHue { get { return 0x4001; } }
public virtual int EtherealHue => 0x4001;
public void UnmountMe()
{
@ -375,7 +375,7 @@ namespace Server.Mobiles
return TimeSpan.Zero;
}
public override double CastDelayFastScalar { get { return 0; } }
public override double CastDelayFastScalar => 0;
public override TimeSpan CastDelayBase
{
@ -448,7 +448,7 @@ namespace Server.Mobiles
public class EtherealHorse : EtherealMount
{
public override int LabelNumber { get { return 1041298; } } // Ethereal Horse Statuette
public override int LabelNumber => 1041298; // Ethereal Horse Statuette
[Constructible]
public EtherealHorse()
@ -484,7 +484,7 @@ namespace Server.Mobiles
public class EtherealLlama : EtherealMount
{
public override int LabelNumber { get { return 1041300; } } // Ethereal Llama Statuette
public override int LabelNumber => 1041300; // Ethereal Llama Statuette
[Constructible]
public EtherealLlama()
@ -517,7 +517,7 @@ namespace Server.Mobiles
public class EtherealOstard : EtherealMount
{
public override int LabelNumber { get { return 1041299; } } // Ethereal Ostard Statuette
public override int LabelNumber => 1041299; // Ethereal Ostard Statuette
[Constructible]
public EtherealOstard()
@ -550,7 +550,7 @@ namespace Server.Mobiles
public class EtherealRidgeback : EtherealMount
{
public override int LabelNumber { get { return 1049747; } } // Ethereal Ridgeback Statuette
public override int LabelNumber => 1049747; // Ethereal Ridgeback Statuette
[Constructible]
public EtherealRidgeback()
@ -583,7 +583,7 @@ namespace Server.Mobiles
public class EtherealUnicorn : EtherealMount
{
public override int LabelNumber { get { return 1049745; } } // Ethereal Unicorn Statuette
public override int LabelNumber => 1049745; // Ethereal Unicorn Statuette
[Constructible]
public EtherealUnicorn()
@ -616,7 +616,7 @@ namespace Server.Mobiles
public class EtherealBeetle : EtherealMount
{
public override int LabelNumber { get { return 1049748; } } // Ethereal Beetle Statuette
public override int LabelNumber => 1049748; // Ethereal Beetle Statuette
[Constructible]
public EtherealBeetle()
@ -649,7 +649,7 @@ namespace Server.Mobiles
public class EtherealKirin : EtherealMount
{
public override int LabelNumber { get { return 1049746; } } // Ethereal Ki-Rin Statuette
public override int LabelNumber => 1049746; // Ethereal Ki-Rin Statuette
[Constructible]
public EtherealKirin()
@ -682,7 +682,7 @@ namespace Server.Mobiles
public class EtherealSwampDragon : EtherealMount
{
public override int LabelNumber { get { return 1049749; } } // Ethereal Swamp Dragon Statuette
public override int LabelNumber => 1049749; // Ethereal Swamp Dragon Statuette
[Constructible]
public EtherealSwampDragon()
@ -715,8 +715,8 @@ namespace Server.Mobiles
public class RideablePolarBear : EtherealMount
{
public override int LabelNumber { get { return 1076159; } } // Rideable Polar Bear
public override int EtherealHue { get { return 0; } }
public override int LabelNumber => 1076159; // Rideable Polar Bear
public override int EtherealHue => 0;
[Constructible]
public RideablePolarBear()
@ -746,7 +746,7 @@ namespace Server.Mobiles
public class EtherealCuSidhe : EtherealMount
{
public override int LabelNumber { get { return 1080386; } } // Ethereal Cu Sidhe Statuette
public override int LabelNumber => 1080386; // Ethereal Cu Sidhe Statuette
[Constructible]
public EtherealCuSidhe()
@ -776,7 +776,7 @@ namespace Server.Mobiles
public class EtherealHiryu : EtherealMount
{
public override int LabelNumber { get { return 1113813; } } // Ethereal Hiryu Statuette
public override int LabelNumber => 1113813; // Ethereal Hiryu Statuette
[Constructible]
public EtherealHiryu()
@ -806,7 +806,7 @@ namespace Server.Mobiles
public class EtherealReptalon : EtherealMount
{
public override int LabelNumber { get { return 1113812; } } // Ethereal Reptalon Statuette
public override int LabelNumber => 1113812; // Ethereal Reptalon Statuette
[Constructible]
public EtherealReptalon()
@ -836,7 +836,7 @@ namespace Server.Mobiles
public class ChargerOfTheFallen : EtherealMount
{
public override int LabelNumber { get { return 1074816; } } // Charger of the Fallen Statuette
public override int LabelNumber => 1074816; // Charger of the Fallen Statuette
[Constructible]
public ChargerOfTheFallen()
@ -844,7 +844,7 @@ namespace Server.Mobiles
{
}
public override int EtherealHue { get { return 0; } }
public override int EtherealHue => 0;
public ChargerOfTheFallen( Serial serial )
: base( serial )

4
Scripts/Mobiles/Animals/Mounts/FireSteed.cs
View file

@ -53,8 +53,8 @@ namespace Server.Mobiles
}
public override bool HasBreath => true; // fire breath enabled
public override FoodType FavoriteFood{ get{ return FoodType.Meat; } }
public override PackInstinct PackInstinct{ get{ return PackInstinct.Daemon | PackInstinct.Equine; } }
public override FoodType FavoriteFood => FoodType.Meat;
public override PackInstinct PackInstinct => PackInstinct.Daemon | PackInstinct.Equine;
public FireSteed( Serial serial ) : base( serial )
{

8
Scripts/Mobiles/Animals/Mounts/ForestOstard.cs
View file

@ -43,9 +43,9 @@ namespace Server.Mobiles
MinTameSkill = 29.1;
}
public override int Meat{ get{ return 3; } }
public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } }
public override PackInstinct PackInstinct{ get{ return PackInstinct.Ostard; } }
public override int Meat => 3;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public override PackInstinct PackInstinct => PackInstinct.Ostard;
public ForestOstard( Serial serial ) : base( serial )
{
@ -65,4 +65,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

8
Scripts/Mobiles/Animals/Mounts/FrenziedOstard.cs
View file

@ -46,9 +46,9 @@ namespace Server.Mobiles
MinTameSkill = 77.1;
}
public override int Meat{ get{ return 3; } }
public override FoodType FavoriteFood{ get{ return FoodType.Meat | FoodType.Fish | FoodType.Eggs | FoodType.FruitsAndVegies; } }
public override PackInstinct PackInstinct{ get{ return PackInstinct.Ostard; } }
public override int Meat => 3;
public override FoodType FavoriteFood => FoodType.Meat | FoodType.Fish | FoodType.Eggs | FoodType.FruitsAndVegies;
public override PackInstinct PackInstinct => PackInstinct.Ostard;
public FrenziedOstard( Serial serial ) : base( serial )
{
@ -68,4 +68,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Mobiles/Animals/Mounts/HellSteed.cs
View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
public class HellSteed : BaseMount
{
public override bool HasBreath => true;
public override int BreathChaosDamage { get { return 100; } }
public override int BreathChaosDamage => 100;
public override Poison PoisonImmune => Poison.Lethal;
[Constructible]

10
Scripts/Mobiles/Animals/Mounts/Hiryu.cs
View file

@ -8,7 +8,7 @@ namespace Server.Mobiles
[CorpseName( "a hiryu corpse" )]
public class Hiryu : BaseMount
{
public override double WeaponAbilityChance { get { return 0.07; } } /* 1 in 15 chance of using per landed hit */
public override double WeaponAbilityChance => 0.07; /* 1 in 15 chance of using per landed hit */
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
@ -146,10 +146,10 @@ namespace Server.Mobiles
AddLoot( LootPack.Gems, 4 );
}
public override int TreasureMapLevel { get { return 5; } }
public override int Meat { get { return 16; } }
public override int Hides { get { return 60; } }
public override FoodType FavoriteFood { get { return FoodType.Meat; } }
public override int TreasureMapLevel => 5;
public override int Meat => 16;
public override int Hides => 60;
public override FoodType FavoriteFood => FoodType.Meat;
public override bool CanAngerOnTame => true;
public override void OnGaveMeleeAttack( Mobile defender )

8
Scripts/Mobiles/Animals/Mounts/Horse.cs
View file

@ -54,9 +54,9 @@ namespace Server.Mobiles
MinTameSkill = 29.1;
}
public override int Meat{ get{ return 3; } }
public override int Hides{ get{ return 10; } }
public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } }
public override int Meat => 3;
public override int Hides => 10;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public Horse( Serial serial ) : base( serial )
{
@ -76,4 +76,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

10
Scripts/Mobiles/Animals/Mounts/Kirin.cs
View file

@ -13,7 +13,7 @@ namespace Server.Mobiles
public override bool InitialInnocent => true;
public override TimeSpan MountAbilityDelay { get { return TimeSpan.FromHours( 1.0 ); } }
public override TimeSpan MountAbilityDelay => TimeSpan.FromHours( 1.0 );
public override void OnDisallowedRider( Mobile m )
{
@ -104,10 +104,10 @@ namespace Server.Mobiles
get{ return OppositionGroup.FeyAndUndead; }
}
public override int Meat{ get{ return 3; } }
public override int Hides{ get{ return 10; } }
public override HideType HideType{ get{ return HideType.Horned; } }
public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } }
public override int Meat => 3;
public override int Hides => 10;
public override HideType HideType => HideType.Horned;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public Kirin( Serial serial ) : base( serial )
{

10
Scripts/Mobiles/Animals/Mounts/LesserHiryu.cs
View file

@ -8,7 +8,7 @@ namespace Server.Mobiles
[CorpseName( "a hiryu corpse" )]
public class LesserHiryu : BaseMount
{
public override double WeaponAbilityChance { get { return 0.07; } } /* 1 in 15 chance of using; 1 in 5 chance of success */
public override double WeaponAbilityChance => 0.07; /* 1 in 15 chance of using; 1 in 5 chance of success */
public override WeaponAbility GetWeaponAbility() => WeaponAbility.Dismount;
@ -146,10 +146,10 @@ namespace Server.Mobiles
return bushidoChance > tamingChance ? bushidoChance : tamingChance;
}
public override int TreasureMapLevel { get { return 3; } }
public override int Meat { get { return 16; } }
public override int Hides { get { return 60; } }
public override FoodType FavoriteFood { get { return FoodType.Meat; } }
public override int TreasureMapLevel => 3;
public override int Meat => 16;
public override int Hides => 60;
public override FoodType FavoriteFood => FoodType.Meat;
public override bool CanAngerOnTame => true;
public override void OnGaveMeleeAttack( Mobile defender )

8
Scripts/Mobiles/Animals/Mounts/Nightmare.cs
View file

@ -93,10 +93,10 @@ namespace Server.Mobiles
}
public override bool HasBreath => true; // fire breath enabled
public override int Meat{ get{ return 5; } }
public override int Hides{ get{ return 10; } }
public override HideType HideType{ get{ return HideType.Barbed; } }
public override FoodType FavoriteFood{ get{ return FoodType.Meat; } }
public override int Meat => 5;
public override int Hides => 10;
public override HideType HideType => HideType.Barbed;
public override FoodType FavoriteFood => FoodType.Meat;
public override bool CanAngerOnTame => true;
public Nightmare( Serial serial ) : base( serial )

8
Scripts/Mobiles/Animals/Mounts/RidableLlama.cs
View file

@ -45,9 +45,9 @@ namespace Server.Mobiles
MinTameSkill = 29.1;
}
public override int Meat{ get{ return 1; } }
public override int Hides{ get{ return 12; } }
public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } }
public override int Meat => 1;
public override int Hides => 12;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public RidableLlama( Serial serial ) : base( serial )
{
@ -67,4 +67,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

10
Scripts/Mobiles/Animals/Mounts/Ridgeback.cs
View file

@ -55,10 +55,10 @@ namespace Server.Mobiles
return 1.0;
}
public override int Meat{ get{ return 1; } }
public override int Hides{ get{ return 12; } }
public override HideType HideType{ get{ return HideType.Spined; } }
public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } }
public override int Meat => 1;
public override int Hides => 12;
public override HideType HideType => HideType.Spined;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public Ridgeback( Serial serial ) : base( serial )
{
@ -78,4 +78,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

10
Scripts/Mobiles/Animals/Mounts/SavageRidgeback.cs
View file

@ -55,10 +55,10 @@ namespace Server.Mobiles
return 1.0;
}
public override int Meat{ get{ return 1; } }
public override int Hides{ get{ return 12; } }
public override HideType HideType{ get{ return HideType.Spined; } }
public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } }
public override int Meat => 1;
public override int Hides => 12;
public override HideType HideType => HideType.Spined;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public SavageRidgeback( Serial serial ) : base( serial )
{
@ -78,4 +78,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Mobiles/Animals/Mounts/ScaledSwampDragon.cs
View file

@ -55,7 +55,7 @@ namespace Server.Mobiles
}
public override bool AutoDispel => !Controlled;
public override FoodType FavoriteFood{ get{ return FoodType.Meat; } }
public override FoodType FavoriteFood => FoodType.Meat;
public ScaledSwampDragon( Serial serial ) : base( serial )
{

10
Scripts/Mobiles/Animals/Mounts/SwampDragon.cs
View file

@ -154,11 +154,11 @@ namespace Server.Mobiles
public override bool ReacquireOnMovement => true;
public override bool AutoDispel => !Controlled;
public override FoodType FavoriteFood{ get{ return FoodType.Meat; } }
public override int Meat{ get{ return 19; } }
public override int Hides{ get{ return 20; } }
public override int Scales{ get{ return 5; } }
public override ScaleType ScaleType{ get{ return ScaleType.Green; } }
public override FoodType FavoriteFood => FoodType.Meat;
public override int Meat => 19;
public override int Hides => 20;
public override int Scales => 5;
public override ScaleType ScaleType => ScaleType.Green;
public override bool CanAngerOnTame => true;
public SwampDragon( Serial serial ) : base( serial )

10
Scripts/Mobiles/Animals/Mounts/Unicorn.cs
View file

@ -13,7 +13,7 @@ namespace Server.Mobiles
public override bool InitialInnocent => true;
public override TimeSpan MountAbilityDelay { get { return TimeSpan.FromHours( 1.0 ); } }
public override TimeSpan MountAbilityDelay => TimeSpan.FromHours( 1.0 );
public override void OnDisallowedRider( Mobile m )
{
@ -115,10 +115,10 @@ namespace Server.Mobiles
}
public override Poison PoisonImmune => Poison.Lethal;
public override int Meat{ get{ return 3; } }
public override int Hides{ get{ return 10; } }
public override HideType HideType{ get{ return HideType.Horned; } }
public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } }
public override int Meat => 3;
public override int Hides => 10;
public override HideType HideType => HideType.Horned;
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public Unicorn( Serial serial ) : base( serial )
{

4
Scripts/Mobiles/Animals/Mounts/War Horses/BaseWarHorse.cs
View file

@ -42,7 +42,7 @@ namespace Server.Mobiles
MinTameSkill = 29.1;
}
public override FoodType FavoriteFood{ get{ return FoodType.FruitsAndVegies | FoodType.GrainsAndHay; } }
public override FoodType FavoriteFood => FoodType.FruitsAndVegies | FoodType.GrainsAndHay;
public BaseWarHorse( Serial serial ) : base( serial )
{
@ -62,4 +62,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}